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

Merge "Show 'up arrow' in About phone->Status menu." into nyc-mr1-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2016-07-06 20:09:43 +00:00
committed by Android (Google) Code Review
parent bae81b4a6f 47e2b976a0
commit 9968f7a752
2 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
AndroidManifest.xml
View File

@@ -1746,11 +1746,9 @@
<activity android:name=".EncryptionInterstitial" <activity android:name=".EncryptionInterstitial"
android:theme="@style/SetupWizardTheme.Light" /> android:theme="@style/SetupWizardTheme.Light" />
<!-- Runs in the phone process since it needs access to the Phone object -->
<activity android:name=".Settings$StatusActivity" <activity android:name=".Settings$StatusActivity"
android:label="@string/device_status_activity_title" android:label="@string/device_status_activity_title"
android:theme="@style/Theme.SubSettingsDialogWhenLarge" android:theme="@style/Theme.SubSettingsDialogWhenLarge">
android:process="com.android.phone">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN" /> <action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.DEFAULT" /> <category android:name="android.intent.category.DEFAULT" />

6
res/xml/device_info_settings.xml
View File

@@ -35,10 +35,8 @@
<!-- Device status - launches activity --> <!-- Device status - launches activity -->
<PreferenceScreen android:key="status_info" <PreferenceScreen android:key="status_info"
android:title="@string/device_status" android:title="@string/device_status"
android:summary="@string/device_status_summary"> android:summary="@string/device_status_summary"
<intent android:action="android.intent.action.MAIN" android:fragment="com.android.settings.deviceinfo.Status">
android:targetPackage="com.android.settings"
android:targetClass="com.android.settings.Settings$StatusActivity" />
</PreferenceScreen> </PreferenceScreen>
<!-- Manual --> <!-- Manual -->