PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Make the support loader activity display UI." into oc-dr1-dev

Browse Source 
am: 4ab6f77f98

Change-Id: I06dea000a9bc74314905f49843262e79a6c240dd
This commit is contained in:
Daniel Nishi
2017-07-21 01:47:17 +00:00
committed by android-build-merger
parent 91468e309c 4ab6f77f98
commit 0eae770acc
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
AndroidManifest.xml
View File

@@ -3131,7 +3131,7 @@
<activity android:name=".support.SupportDashboardActivity" <activity android:name=".support.SupportDashboardActivity"
android:label="@string/page_tab_title_support" android:label="@string/page_tab_title_support"
android:icon="@drawable/ic_help" android:icon="@drawable/ic_help"
android:theme="@android:style/Theme.NoDisplay" android:theme="@android:style/Theme.DeviceDefault.Light.Panel"
android:enabled="@bool/config_support_enabled"> android:enabled="@bool/config_support_enabled">
<intent-filter android:priority="-2"> <intent-filter android:priority="-2">
<action android:name="com.android.settings.action.SETTINGS"/> <action android:name="com.android.settings.action.SETTINGS"/>

2
src/com/android/settings/support/SupportDashboardActivity.java
View File

@@ -47,8 +47,8 @@ public class SupportDashboardActivity extends Activity implements Indexable {
supportFeatureProvider.startSupportV2(this); supportFeatureProvider.startSupportV2(this);
} else { } else {
startActivity(new Intent(this, LegacySupportActivity.class)); startActivity(new Intent(this, LegacySupportActivity.class));
finish();
} }
finish();
} }
/** /**