Show 'up arrow' in About phone->Status menu.
Bug: 27970152
Status should be a Submenu to have up arrow. Also cleaned up
AndroidManifest for this fragment as it doesn't need to run in a
separate process.
Change-Id: I0610314b3baa3d5f1f70d255b4657c805c534373
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 29a7495..6b79f19 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1746,11 +1746,9 @@
<activity android:name=".EncryptionInterstitial"
android:theme="@style/SetupWizardTheme.Light" />
- <!-- Runs in the phone process since it needs access to the Phone object -->
<activity android:name=".Settings$StatusActivity"
android:label="@string/device_status_activity_title"
- android:theme="@style/Theme.SubSettingsDialogWhenLarge"
- android:process="com.android.phone">
+ android:theme="@style/Theme.SubSettingsDialogWhenLarge">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.DEFAULT" />
diff --git a/res/xml/device_info_settings.xml b/res/xml/device_info_settings.xml
index 74f873b..3d57fc1 100644
--- a/res/xml/device_info_settings.xml
+++ b/res/xml/device_info_settings.xml
@@ -35,10 +35,8 @@
<!-- Device status - launches activity -->
<PreferenceScreen android:key="status_info"
android:title="@string/device_status"
- android:summary="@string/device_status_summary">
- <intent android:action="android.intent.action.MAIN"
- android:targetPackage="com.android.settings"
- android:targetClass="com.android.settings.Settings$StatusActivity" />
+ android:summary="@string/device_status_summary"
+ android:fragment="com.android.settings.deviceinfo.Status">
</PreferenceScreen>
<!-- Manual -->