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

Commit bc8f2d9b authored by Danny Baumann's avatar Danny Baumann Committed by Gerrit Code Review
Browse files

Kill off a few MSIM tab hosts. 

Change-Id: Ib6ec06e5d772b5d1ebd2d8af6f89b8fc6ea2c55d
parent f460b1fb

AndroidManifest.xml

+0 −23
Original line number Diff line number Diff line
@@ -1246,18 +1246,6 @@ 


        <activity android:name=".EncryptionInterstitial"/>



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

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

                android:label="@string/device_status_activity_title"

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

                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"
@@ -1943,17 +1931,6 @@ 
                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:label="@string/screensaver_settings_title"

                android:taskAffinity="">

res/layout/icc_lock_tabs.xml

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

<!-- Copyright (C) 2014 The Android Open Source Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

     You may obtain a copy of the License at



          http://www.apache.org/licenses/LICENSE-2.0



     Unless required by applicable law or agreed to in writing, software

     distributed under the License is distributed on an "AS IS" BASIS,

     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

     See the License for the specific language governing permissions and

     limitations under the License.

-->



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

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

    android:layout_width="match_parent"

    android:layout_height="match_parent">



    <LinearLayout

        android:id="@+id/tabs_container"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:orientation="vertical">



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

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:scrollbars="none"

            android:fillViewport="true">



            <TabWidget

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

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:orientation="horizontal"

                style="?android:attr/tabWidgetStyle" />



        </HorizontalScrollView>



        <!-- give an empty content area to make tabhost happy -->

        <FrameLayout

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

            android:layout_width="0dip"

            android:layout_height="0dip" />



        <ListView

            android:id="@android:id/list"

            android:layout_width="match_parent"

            android:layout_height="0dip"

            android:layout_weight="1"

            android:clipChildren="false"

            android:clipToPadding="false"

            android:smoothScrollbar="false" />



    </LinearLayout>



</TabHost>

res/layout/select_subscription.xml

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

<!-- Copyright (c) 2011-2014, 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>

res/layout/sim_information.xml

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

<!-- Copyright (C) 2014 The Android Open Source Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

     You may obtain a copy of the License at



          http://www.apache.org/licenses/LICENSE-2.0



     Unless required by applicable law or agreed to in writing, software

     distributed under the License is distributed on an "AS IS" BASIS,

     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

     See the License for the specific language governing permissions and

     limitations under the License.

-->



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

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

    android:layout_width="match_parent"

    android:layout_height="match_parent">



    <LinearLayout

        android:id="@+id/tabs_container"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:orientation="vertical">



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

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:scrollbars="none"

            android:fillViewport="true">



            <TabWidget

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

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:orientation="horizontal"

                style="?android:attr/tabWidgetStyle" />



        </HorizontalScrollView>



        <!-- give an empty content area to make tabhost happy -->

        <FrameLayout

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

            android:layout_width="0dip"

            android:layout_height="0dip" />



        <ListView

            android:id="@android:id/list"

            android:layout_width="match_parent"

            android:layout_height="0dip"

            android:layout_weight="1"

            android:clipChildren="false"

            android:clipToPadding="false"

            android:smoothScrollbar="false" />



    </LinearLayout>



</TabHost>

res/values/cm_strings.xml

+6 −3
Original line number Diff line number Diff line
@@ -790,9 +790,7 @@ 
    <!-- SIM card lock settings screen, toast displayed on PIN1 disable: -->

    <string name="sim_pin_disabled">PIN1 disabled</string>



    <string name="subs_settings">SIM card status</string>



    <!-- string resources for SD card, USB OTG & UICC features -->

    <!-- string resources for USB OTG & UICC features -->

    <string name="storage_usb">USB storage</string>

    <string name="storage_uicc">UICC storage</string>

    <string name="sdcard_eject" product="default">Unmount SD card</string>
@@ -1237,4 +1235,9 @@ 
    <string name="lock_to_cyanogen_master_clear_warning">Device Protection is enabled. Please disable to continue resetting your device.</string>



    <string name="bluetooth_pan_profile_summary_use_for_error">Connection error; is Bluetooth tethering enabled on this device?</string>



    <!-- MSIM SIM status -->

    <string name="sim_card_status_title">SIM %d status</string>

    <string name="sim_card_lock_settings_title">SIM %d lock settings</string>

    <string name="sim_card_summary_empty">SIM not inserted</string>

</resources>