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

Commit c06f9b67 authored by Sanket Padawe's avatar Sanket Padawe
Browse files

Use common xml file for multi-tab settings.

Bug: 22360525
Change-Id: Id4d971e0afcd9ecd43005a0a5056ad03a32b704f
parent 7ba46433
Loading
Loading
Loading
Loading

res/layout/sim_information.xml

deleted100644 → 0
+0 −60
Original line number Original line 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>
+1 −1
Original line number Original line Diff line number Diff line
@@ -149,7 +149,7 @@ public class SimStatus extends InstrumentedPreferenceActivity {
            mSir = mSelectableSubInfos.size() > 0 ? mSelectableSubInfos.get(0) : null;
            mSir = mSelectableSubInfos.size() > 0 ? mSelectableSubInfos.get(0) : null;


            if (mSelectableSubInfos.size() > 1) {
            if (mSelectableSubInfos.size() > 1) {
                setContentView(R.layout.sim_information);
                setContentView(com.android.internal.R.layout.common_tab_settings);


                mTabHost = (TabHost) findViewById(android.R.id.tabhost);
                mTabHost = (TabHost) findViewById(android.R.id.tabhost);
                mTabWidget = (TabWidget) findViewById(android.R.id.tabs);
                mTabWidget = (TabWidget) findViewById(android.R.id.tabs);