Skip to content

Commit

Permalink
fix wrong recent changes
Browse files Browse the repository at this point in the history
  • Loading branch information
friedger committed Feb 13, 2019
1 parent dab359b commit e412fdc
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 3 deletions.
3 changes: 2 additions & 1 deletion DistributionDemoAbout/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@
android:resource="@xml/about" />

<activity android:name=".DistributionAboutDemoActivity"
android:label="@string/app_name">
android:label="@string/app_name"
android:theme="@style/Theme.AppCompat">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
Expand Down
2 changes: 1 addition & 1 deletion DistributionLibrary/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -27,5 +27,5 @@ android {
}

dependencies {
implementation 'com.android.support:design:28.0.0'
api 'com.android.support:design:28.0.0'
}
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,11 @@ public void onCreate(Bundle icicle) {

mText1.setText(title);
mText2.setText(message);
mText.setText(readTextFromRawResource(R.raw.oi_distribution_recent_changes, true));
int id = getResources().getIdentifier("recent_changes", "raw", getApplicationContext().getPackageName());
if (id == 0) {
id = R.raw.oi_distribution_recent_changes;
}
mText.setText(readTextFromRawResource(id, true));

mAgree.setText(R.string.oi_distribution_newversion_continue);
mDisagree.setVisibility(View.GONE);
Expand Down

0 comments on commit e412fdc

Please sign in to comment.