summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorSanket Padawe <sanketpadawe@google.com>2015-07-14 14:21:43 -0700
committerSanket Padawe <sanketpadawe@google.com>2015-07-14 14:21:43 -0700
commitdc49309cefed9519611b183ae2c616e6f0110738 (patch)
treee6f15a265c4facc135d1e4a920a536704aa0cd3c /core
parentc1541571ff501ba7f58ab9f066828e6620aaa90c (diff)
downloadframeworks_base-dc49309cefed9519611b183ae2c616e6f0110738.zip
frameworks_base-dc49309cefed9519611b183ae2c616e6f0110738.tar.gz
frameworks_base-dc49309cefed9519611b183ae2c616e6f0110738.tar.bz2
Add new API for handling DB query per subId.
+ Add new API for handling DB query and Resources object per subscription. + Add constants for column name of DB storing subscription info. + Add a common settings file for multi-tab Bug: 22360525 Change-Id: Icf6d35bdbe31618e2a95df450aee12b99d3aea7a
Diffstat (limited to 'core')
-rw-r--r--core/res/res/layout/common_tab_settings.xml60
-rwxr-xr-xcore/res/res/values/symbols.xml1
2 files changed, 61 insertions, 0 deletions
diff --git a/core/res/res/layout/common_tab_settings.xml b/core/res/res/layout/common_tab_settings.xml
new file mode 100644
index 0000000..d2a4acc
--- /dev/null
+++ b/core/res/res/layout/common_tab_settings.xml
@@ -0,0 +1,60 @@
+<?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>
diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml
index fcdaba2..51f9650 100755
--- a/core/res/res/values/symbols.xml
+++ b/core/res/res/values/symbols.xml
@@ -1367,6 +1367,7 @@
<java-symbol type="layout" name="restrictions_pin_setup" />
<java-symbol type="layout" name="immersive_mode_cling" />
<java-symbol type="layout" name="user_switching_dialog" />
+ <java-symbol type="layout" name="common_tab_settings" />
<java-symbol type="anim" name="slide_in_child_bottom" />
<java-symbol type="anim" name="slide_in_right" />