Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Move "About Phone" to bottom of Settings main IA, above "Tips & Support"" into pi-dev

Browse Source 
am: 96d829be9a

Change-Id: I93b59d6f62c713bb49f1088ea3911b9b9313894e
This commit is contained in:
Edgar Wang
2018-11-12 17:39:43 -08:00
committed by android-build-merger
parent 502ad46dc1 96d829be9a
commit 03aca9f0f9
5 changed files with 96 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
AndroidManifest.xml
View File

@@ -995,7 +995,7 @@
<activity android:name=".Settings$MyDeviceInfoActivity"
android:label="@string/about_settings"
android:icon="@drawable/ic_settings_about"
android:icon="@drawable/ic_homepage_about"
android:taskAffinity="com.android.settings"
android:parentActivityName="Settings">
<intent-filter android:priority="1">
@@ -1008,11 +1008,11 @@
<category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.VOICE_LAUNCH" />
</intent-filter>
<intent-filter android:priority="270">
<intent-filter android:priority="-2">
<action android:name="com.android.settings.action.SETTINGS" />
</intent-filter>
<meta-data android:name="com.android.settings.category"
android:value="com.android.settings.category.ia.system" />
android:value="com.android.settings.category.ia.homepage" />
<meta-data android:name="com.android.settings.title"
android:resource="@string/about_settings" />
<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
@@ -3169,7 +3169,7 @@
android:icon="@drawable/ic_homepage_support"
android:theme="@android:style/Theme.DeviceDefault.Light.Panel"
android:enabled="@bool/config_support_enabled">
<intent-filter android:priority="-2">
<intent-filter android:priority="-3">
<action android:name="com.android.settings.action.SETTINGS"/>
</intent-filter>
<intent-filter>