Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aaaa236c authored by Jason Monk's avatar Jason Monk
Browse files

resolve merge conflicts of 7f7092c7 to nyc-mr1-dev 

Change-Id: I27b058bd0cbbc2e253337cc56a1a032df96046de
parents d4e31320 7f7092c7

AndroidManifest.xml

+31 −15
Original line number Diff line number Diff line
@@ -328,7 +328,7 @@ 
                android:value="true" />

        </activity>



        <activity android:name=".wifi.WifiInfo"

        <activity android:name=".Settings$WifiInfoActivity"

                android:theme="@style/Theme.SubSettingsDialogWhenLarge"

                android:taskAffinity="com.android.settings"

                android:parentActivityName="Settings$WifiSettingsActivity">
@@ -337,6 +337,8 @@ 
                <category android:name="android.intent.category.DEVELOPMENT_PREFERENCE" />

                <category android:name="android.intent.category.DEFAULT" />

            </intent-filter>

            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"

                       android:value="com.android.settings.wifi.WifiInfo" />

        </activity>



        <activity android:name=".wifi.WifiConfigInfo"
@@ -350,13 +352,15 @@ 
            </intent-filter>

        </activity>



        <activity android:name=".wifi.WifiAPITest"

        <activity android:name=".Settings$WifiAPITestActivity"

                android:theme="@style/Theme.SubSettingsDialogWhenLarge">

            <intent-filter>

                <action android:name="android.intent.action.MAIN"/>

                <category android:name="android.intent.category.DEVELOPMENT_PREFERENCE" />

                <category android:name="android.intent.category.DEFAULT" />

            </intent-filter>

            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"

                       android:value="com.android.settings.wifi.WifiAPITest" />

        </activity>



        <activity android:name=".wifi.WifiStatusTest"
@@ -1445,7 +1449,7 @@ 
            </intent-filter>

        </activity-alias>



        <activity android:name="IccLockSettings"

        <activity android:name="Settings$IccLockSettingsActivity"

                android:label="@string/sim_lock_settings"

                android:theme="@style/Theme.SubSettingsDialogWhenLarge"

                android:process="com.android.phone">
@@ -1454,6 +1458,8 @@ 
                <category android:name="android.intent.category.DEFAULT" />

                <category android:name="android.intent.category.VOICE_LAUNCH" />

            </intent-filter>

            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"

                android:value="com.android.settings.IccLockSettings" />

        </activity>



        <activity android:name="Settings$AccessibilitySettingsActivity"
@@ -1736,7 +1742,7 @@ 
        <activity android:name=".EncryptionInterstitial"/>



        <!-- Runs in the phone process since it needs access to the Phone object -->

        <activity android:name=".deviceinfo.Status"

        <activity android:name=".Settings$StatusActivity"

                android:label="@string/device_status_activity_title"

                android:theme="@style/Theme.SubSettingsDialogWhenLarge"

                android:process="com.android.phone">
@@ -1745,10 +1751,12 @@ 
                <category android:name="android.intent.category.DEFAULT" />

                <category android:name="android.intent.category.VOICE_LAUNCH" />

            </intent-filter>

            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"

                android:value="com.android.settings.deviceinfo.Status" />

        </activity>



        <!-- Runs in the phone process since it needs access to the Phone object -->

        <activity android:name=".deviceinfo.SimStatus"

        <activity android:name=".Settings$SimStatusActivity"

                android:label="@string/sim_status_title"

                android:theme="@style/Theme.SubSettingsDialogWhenLarge"

                android:process="com.android.phone">
@@ -1757,10 +1765,12 @@ 
                <category android:name="android.intent.category.DEFAULT" />

                <category android:name="android.intent.category.VOICE_LAUNCH" />

            </intent-filter>

            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"

                android:value="com.android.settings.deviceinfo.SimStatus" />

        </activity>



        <!-- Runs in the phone process since it needs access to the Phone object -->

        <activity android:name=".deviceinfo.ImeiInformation"

        <activity android:name=".Settings$ImeiInformationActivity"

                android:label="@string/imei_information_title"

                android:theme="@style/Theme.SubSettingsDialogWhenLarge"

                android:process="com.android.phone">
@@ -1769,6 +1779,8 @@ 
                <category android:name="android.intent.category.DEFAULT" />

                <category android:name="android.intent.category.VOICE_LAUNCH" />

            </intent-filter>

            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"

                android:value="com.android.settings.deviceinfo.ImeiInformation" />

        </activity>



        <activity android:name="Settings$StorageSettingsActivity"
@@ -1873,7 +1885,7 @@ 
                android:exported="true"

                android:permission="android.permission.MOUNT_UNMOUNT_FILESYSTEMS" />



        <activity android:name="ApnEditor"

        <activity android:name="Settings$ApnEditorActivity"

                android:label="@string/apn_edit">

            <intent-filter>

                <action android:name="android.intent.action.VIEW" />
@@ -1887,14 +1899,15 @@ 
                <category android:name="android.intent.category.DEFAULT" />

                <data android:mimeType="vnd.android.cursor.dir/telephony-carrier" />

            </intent-filter>

            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"

                       android:value="com.android.settings.ApnEditor" />

        </activity>



        <activity android:name="Settings$DevelopmentSettingsActivity"

                android:label="@string/development_settings_title"

                android:icon="@drawable/ic_settings_development"

                android:taskAffinity="com.android.settings"

                android:parentActivityName="Settings"

                android:enabled="false">

                android:parentActivityName="Settings">

            <intent-filter android:priority="1">

                <action android:name="android.settings.APPLICATION_DEVELOPMENT_SETTINGS" />

                <action android:name="com.android.settings.APPLICATION_DEVELOPMENT_SETTINGS" />
@@ -2151,11 +2164,13 @@ 
            </intent-filter>

        </activity>



        <activity android:name="TestingSettings" android:label="@string/testing">

        <activity android:name="Settings$TestingSettingsActivity" android:label="@string/testing">

            <intent-filter>

                <action android:name="android.intent.action.MAIN" />

                <category android:name="android.intent.category.DEFAULT" />

            </intent-filter>

            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"

                android:value="com.android.settings.TestingSettings" />

        </activity>



        <receiver android:name="TestingSettingsBroadcastReceiver">
@@ -2316,10 +2331,13 @@ 
                android:value="true" />

        </activity>



        <activity android:name="com.android.settings.accounts.ChooseAccountActivity"

        <activity android:name="Settings$ChooseAccountActivity"

            android:label="@string/header_add_an_account"

            android:configChanges="orientation|keyboardHidden|screenSize"

            android:theme="@style/Theme.SubSettingsDialogWhenLarge"/>

            android:theme="@style/Theme.SubSettingsDialogWhenLarge">

            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"

                       android:value="com.android.settings.accounts.ChooseAccountActivity" />

        </activity>



        <activity android:name=".CryptKeeper"

                  androidprv:systemUserOnly="true"
@@ -2439,8 +2457,7 @@ 
        <activity android:name="Settings$PaymentSettingsActivity"

                android:label="@string/nfc_payment_settings_title"

                android:icon="@drawable/ic_settings_nfc_payment"

                android:taskAffinity=""

                android:enabled="false">

                android:taskAffinity="">

            <intent-filter android:priority="1">

                <action android:name="android.settings.NFC_PAYMENT_SETTINGS" />

                <category android:name="android.intent.category.DEFAULT" />
@@ -2725,7 +2742,6 @@ 
        <activity android:name="Settings$SimSettingsActivity"

                android:label="@string/sim_settings_title"

                android:icon="@drawable/ic_settings_sim"

                android:enabled="false"

                android:taskAffinity="">

            <intent-filter android:priority="1">

                <action android:name="com.android.settings.sim.SIM_SUB_INFO_SETTINGS" />

res/layout/icc_lock_tabs.xml

+1 −1
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ 
            android:layout_height="0dip" />



        <FrameLayout

            android:id="@+id/main_content"

            android:id="@+id/prefs_container"

            android:layout_width="match_parent"

            android:layout_height="0dip"

            android:layout_weight="1"

res/values/strings.xml

+3 −3
Original line number Diff line number Diff line
@@ -7253,13 +7253,13 @@ 
    <string name="ethernet">Ethernet</string>









    <!-- Format string for amount of cellular data used [CHAR LIMIT=30] -->









    <string name="cell_data_template"><xliff:g name="units" example="GB">%1$s</xliff:g> cellular data</string>









    <string name="cell_data_template"><xliff:g id="number" example="128">^1</xliff:g><small><small> <xliff:g id="unit" example="KB">^2</xliff:g></small></small><small><small> cellular data</small></small></string>

















    <!-- Format string for amount of wifi data used [CHAR LIMIT=30] -->









    <string name="wifi_data_template"><xliff:g name="units" example="GB">%1$s</xliff:g> Wi-Fi data</string>









    <string name="wifi_data_template"><xliff:g id="number" example="128">^1</xliff:g><small><small> <xliff:g id="unit" example="KB">^2</xliff:g></small></small><small><small> Wi-Fi data</small></small></string>

















    <!-- Format string for amount of ethernet data used [CHAR LIMIT=30] -->









    <string name="ethernet_data_template"><xliff:g name="units" example="GB">%1$s</xliff:g> ethernet data</string>









    <string name="ethernet_data_template"><xliff:g id="number" example="128">^1</xliff:g><small><small> <xliff:g id="unit" example="KB">^2</xliff:g></small></small><small><small> ethernet data</small></small></string>

















    <!-- Format for a summary describing the amount of data before the user is warned [CHAR LIMIT=NONE] -->









    <string name="cell_warning_only"><xliff:g name="amount" example="1 GB">%1$s</xliff:g> Data warning</string>

























res/xml/device_info_settings.xml



+1
−1






























Original line number
Diff line number
Diff line







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
































res/xml/device_info_status.xml



+2
−2






























Original line number
Diff line number
Diff line







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