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

Commit 40957ac1 authored by Steve Kondik's avatar Steve Kondik
Browse files

Merge branch 'kk_2.7_rb1.9' of git://codeaurora.org/platform/packages/apps/Settings into cm-11.0 

Change-Id: I6406ca9f045705490739a895e9b52458e739a521
parents e1217a02 ccd4285b

Android.mk

+1 −1
Original line number Diff line number Diff line 
LOCAL_PATH:= $(call my-dir)

include $(CLEAR_VARS)



LOCAL_JAVA_LIBRARIES := bouncycastle conscrypt telephony-common

LOCAL_JAVA_LIBRARIES := bouncycastle conscrypt telephony-common telephony-msim

LOCAL_STATIC_JAVA_LIBRARIES := android-support-v4 android-support-v13 jsr305 libGoogleAnalyticsV2



LOCAL_MODULE_TAGS := optional

AndroidManifest.xml

+51 −0
Original line number Diff line number Diff line
@@ -160,6 +160,7 @@ 


        <activity android:name=".SubSettings"

                android:taskAffinity="com.android.settings"

                android:configChanges="orientation|keyboardHidden|screenSize"

                android:parentActivityName="Settings">

        </activity>
@@ -345,6 +346,7 @@ 


        <activity android:name="Settings$BluetoothSettingsActivity"

                android:uiOptions="splitActionBarWhenNarrow"

                android:configChanges="orientation|keyboardHidden|screenSize"

                android:label="@string/bluetooth_settings_title"

                android:taskAffinity=""

                android:excludeFromRecents="true">
@@ -689,6 +691,20 @@ 
                android:resource="@id/display_settings" />

        </activity-alias>



        <!-- Multi Sim (Subscription) Settings -->

        <activity android:name="MultiSimSettings"

                android:label="@string/multi_sim_settings_title"

                android:process="com.android.phone"

                android:clearTaskOnLaunch="true">

           <intent-filter>

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

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

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

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

                <category android:name="com.android.settings.SHORTCUT" />

            </intent-filter>

        </activity>



        <activity android:name="Settings$DeviceInfoSettingsActivity"

                android:theme="@android:style/Theme.Holo.DialogWhenLarge"

                android:label="@string/device_info_settings"
@@ -1135,6 +1151,30 @@ 
            android:name=".cmstats.ReportingService">

        </service>



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

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

                android:label="@string/device_status_activity_title"

                android:theme="@android:style/Theme.Holo.DialogWhenLarge"

                android:process="com.android.phone">

            <intent-filter>

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

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

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

            </intent-filter>

        </activity>



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

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

                android:label="@string/device_status_activity_title"

                android:theme="@android:style/Theme.Holo.DialogWhenLarge"

                android:process="com.android.phone">

            <intent-filter>

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

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

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

            </intent-filter>

        </activity>



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

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

                android:label="@string/device_status_activity_title"
@@ -1776,6 +1816,17 @@ 
                android:resource="@id/wireless_settings" />

        </activity>



        <!-- Select Subscription (SUB1 or SUB2) Screen -->

        <activity android:name=".SelectSubscription"

                android:label="@string/subs_settings"

                android:process="com.android.phone"

                android:clearTaskOnLaunch="true">

            <intent-filter>

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

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

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

            </intent-filter>

        </activity>

        <activity android:name="Settings$DreamSettingsActivity"

                android:uiOptions="splitActionBarWhenNarrow"

                android:label="@string/screensaver_settings_title"

res/drawable-hdpi/ic_settings_sim.png

0 → 100644
+1002 B
Loading image diff...

res/drawable-mdpi/ic_settings_sim.png

0 → 100644
+1002 B
Loading image diff...

res/layout/select_subscription.xml

0 → 100644
+49 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (c) 2011-2013, The Linux Foundation. All rights reserved.



     Redistribution and use in source and binary forms, with or without

     modification, are permitted provided that the following conditions are

     met:

         * Redistributions of source code must retain the above copyright

           notice, this list of conditions and the following disclaimer.

         * Redistributions in binary form must reproduce the above

           copyright notice, this list of conditions and the following

           disclaimer in the documentation and/or other materials provided

           with the distribution.

         * Neither the name of The Linux Foundation, Inc. nor the names of its

           contributors may be used to endorse or promote products derived

           from this software without specific prior written permission.



     THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED

     WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF

     MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT

     ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS

     BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR

     CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF

     SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR

     BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,

     WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE

     OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN

     IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

-->

<TabHost xmlns:android="http://schemas.android.com/apk/res/android"

    android:id="@android:id/tabhost"

    android:layout_width="fill_parent"

    android:layout_height="fill_parent">



    <LinearLayout

        android:orientation="vertical"

        android:layout_width="fill_parent"

        android:layout_height="fill_parent"

        android:padding="5dp">

        <TabWidget

            android:id="@android:id/tabs"

            android:layout_width="fill_parent"

            android:layout_height="wrap_content"/>

        <FrameLayout

            android:id="@android:id/tabcontent"

            android:layout_width="fill_parent"

            android:layout_height="fill_parent"

            android:padding="5dp"/>

    </LinearLayout>

</TabHost>