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

resolve merge conflicts of 167f6cc to nyc-mr1-dev-plus-aosp

Browse Source 
Change-Id: Ida721b92e461811fdca7bc556de0f56cb348fcbc
This commit is contained in:
Jason Monk
2016-06-08 15:28:48 -04:00
parent 9667149282 167f6cc87c
commit 84f544a2ae
23 changed files with 282 additions and 277 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/xml/device_info_settings.xml
View File

@@ -38,7 +38,7 @@
android:summary="@string/device_status_summary">
<intent android:action="android.intent.action.MAIN"
android:targetPackage="com.android.settings"
android:targetClass="com.android.settings.deviceinfo.Status" />
android:targetClass="com.android.settings.Settings$StatusActivity" />
</PreferenceScreen>
<!-- Manual -->

4
res/xml/device_info_status.xml
View File

@@ -33,13 +33,13 @@
android:title="@string/sim_status_title"
android:persistent="false">
<intent android:targetPackage="com.android.settings"
android:targetClass="com.android.settings.deviceinfo.SimStatus" />
android:targetClass="com.android.settings.Settings$SimStatusActivity" />
</PreferenceScreen>
<PreferenceScreen android:key="imei_info"
android:title="@string/imei_information_title"
android:persistent="false">
<intent android:targetPackage="com.android.settings"
android:targetClass="com.android.settings.deviceinfo.ImeiInformation" />
android:targetClass="com.android.settings.Settings$ImeiInformationActivity" />
</PreferenceScreen>
<com.android.settings.CopyablePreference android:key="wifi_ip_address"
android:enabled="false"

2
res/xml/security_settings_misc.xml
View File

@@ -28,7 +28,7 @@
<intent android:action="android.intent.action.MAIN"
android:targetPackage="com.android.settings"
android:targetClass="com.android.settings.IccLockSettings"/>
android:targetClass="com.android.settings.Settings$IccLockSettingsActivity"/>
</Preference>

2
res/xml/testing_settings.xml
View File

@@ -37,7 +37,7 @@
<intent
android:action="android.intent.action.MAIN"
android:targetPackage="com.android.settings"
android:targetClass="com.android.settings.wifi.WifiInfo" />
android:targetClass="com.android.settings.Settings$WifiInfoActivity" />
</PreferenceScreen>
<!--

2
res/xml/testing_wifi_settings.xml
View File

@@ -23,7 +23,7 @@ android:key="parent">
<intent
android:action="android.intent.action.MAIN"
android:targetPackage="com.android.settings"
android:targetClass="com.android.settings.wifi.WifiAPITest" />
android:targetClass="com.android.settings.Settings$WifiAPITestActivity" />
</Preference>
<Preference