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

resolve merge conflicts of 9968f7a to nyc-mr1-dev-plus-aosp

Browse Source 
Change-Id: Ic9a3884cc8bd08eea22d7d83660419ac84555e83
This commit is contained in:
Fan Zhang
2016-07-06 13:28:19 -07:00
parent afa4fff821 9968f7a752
commit 4a1d2c793d
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,13 +1746,11 @@
<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:taskAffinity="com.android.settings"
android:parentActivityName="Settings$DeviceInfoSettingsActivity"
android:process="com.android.phone">
android:parentActivityName="Settings$DeviceInfoSettingsActivity">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.DEFAULT" />

6
res/xml/device_info_settings.xml
View File

@@ -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 -->