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

Commit 0721703d authored by Matt Garnes's avatar Matt Garnes
Browse files

Merge CAF branch 'LA.BR.1.2.1_rb2.12' into caf/cm-12.0. 

Conflicts:
	res/values-zh-rCN/strings.xml
	res/values/cm_strings.xml
	src/com/android/settings/profiles/SetupActionsFragment.java

Change-Id: I305d6195adaa95d3f2872556a08d82d1ede19b65
parents a73c6203 d1031672

AndroidManifest.xml

+6 −6
Original line number Diff line number Diff line
@@ -331,6 +331,12 @@ 
                       android:value="com.android.settings.ApnSettings" />

        </activity>



        <activity android:name=".SubSettings$BluetoothSubSettings"

                android:taskAffinity="com.android.settings"

                android:configChanges="orientation|keyboardHidden|screenSize"

                android:parentActivityName="Settings">

        </activity>



        <activity android:name="Settings$BluetoothSettingsActivity"

                android:label="@string/bluetooth_settings_title"

                android:configChanges="orientation|keyboardHidden|screenSize"
@@ -729,7 +735,6 @@ 


        <activity android:name="Settings$ManageApplicationsActivity"

                android:label="@string/applications_settings"

                android:configChanges="orientation|keyboardHidden|screenSize"

                android:taskAffinity="">

            <intent-filter>

                <action android:name="android.intent.action.MAIN" />
@@ -2187,11 +2192,6 @@ 
                android:resource="@id/sim_settings" />

        </activity>



        <!-- Sim Configuration in Tab Layout -->

        <activity android:name=".sim.SimConfiguration"

                android:label="@string/sim_settings_title">

        </activity>



        <!-- Multi Sim Sound Setting Preference -->

        <activity android:name=".sim.MultiSimSoundSettings"

                android:label="@string/sim_settings_title">

res/drawable-hdpi/ic_settings_timerswitch.png

0 → 100644
+1.53 KiB
Loading image diff...

res/drawable-hdpi/ic_sim_icon_primary.png

deleted100755 → 0
−1.73 KiB
Loading image diff...