<application android:label="@string/settings_label"
android:icon="@mipmap/ic_launcher_settings"
android:taskAffinity=""
- android:theme="@android:style/Theme.Holo"
+ android:theme="@style/Theme.Settings"
android:hardwareAccelerated="true"
android:requiredForAllUsers="true"
android:supportsRtl="true">
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
- android:paddingStart="@*android:dimen/preference_fragment_padding_side"
- android:paddingEnd="@*android:dimen/preference_fragment_padding_side"
- style="?android:attr/tabWidgetStyle" />
-
+ style="?android:attr/tabWidgetStyle"
+ android:paddingStart="@dimen/settings_side_margin"
+ android:paddingEnd="@dimen/settings_side_margin"
+ />
</HorizontalScrollView>
<ImageView
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginStart="@*android:dimen/preference_fragment_padding_side"
- android:layout_marginEnd="@*android:dimen/preference_fragment_padding_side"
+ android:layout_marginStart="@dimen/settings_side_margin"
+ android:layout_marginEnd="@dimen/settings_side_margin"
android:scaleType="fitXY"
android:src="?android:attr/listDivider" />
android:layout_height="0dip"
android:layout_weight="1"
android:clipToPadding="false"
- android:scrollbarStyle="@*android:integer/preference_fragment_scrollbarStyle" />
+ android:scrollbarStyle="outsideOverlay" />
<TextView android:id="@+id/sync_settings_error_info"
android:layout_width="match_parent"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:clipToPadding="false"
- android:scrollbarStyle="@*android:integer/preference_fragment_scrollbarStyle">
+ android:scrollbarStyle="@integer/preference_scrollbar_style">
<LinearLayout
android:id="@+id/all_details"
<!-- give an empty content area to make tabhost happy -->
<FrameLayout
+ style="@style/PreferenceFragmentListSinglePane"
android:id="@android:id/tabcontent"
android:layout_width="0dip"
android:layout_height="0dip" />
<ListView
android:id="@android:id/list"
+ style="@style/PreferenceFragmentListSinglePane"
android:layout_width="match_parent"
android:layout_height="0dip"
android:layout_weight="1"
- android:scrollbarStyle="@*android:integer/preference_fragment_scrollbarStyle"
android:clipChildren="false"
android:clipToPadding="false"
android:smoothScrollbar="false" />
android:layout_width="match_parent"
android:layout_height="match_parent"
android:clipToPadding="false"
- android:scrollbarStyle="@*android:integer/preference_fragment_scrollbarStyle">
+ android:scrollbarStyle="@integer/preference_scrollbar_style">
<LinearLayout
android:id="@+id/all_details"
android:layout_height="0dip"
android:layout_weight="1"
android:clipToPadding="false"
- android:scrollbarStyle="@*android:integer/preference_fragment_scrollbarStyle" />
+ android:scrollbarStyle="@integer/preference_scrollbar_style" />
<TextView android:id="@+id/sync_settings_error_info"
android:layout_width="match_parent"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:clipToPadding="false"
- android:scrollbarStyle="@*android:integer/preference_fragment_scrollbarStyle" />
+ android:scrollbarStyle="@integer/preference_scrollbar_style" />
<TextView android:id="@android:id/empty"
android:layout_width="match_parent"
android:layout_height="match_parent"
</FrameLayout>
<view class="com.android.settings.applications.LinearColorBar"
android:id="@+id/storage_color_bar"
+ android:layout_marginStart="@dimen/settings_side_margin"
+ android:layout_marginEnd="@dimen/settings_side_margin"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="-5dp"
android:clipChildren="false"
android:clipToPadding="false"
android:paddingTop="30dp"
- android:paddingStart="4dp"
- android:paddingEnd="4dp"
- android:paddingBottom="1dp"
- android:layout_marginStart="@*android:dimen/preference_fragment_padding_side"
- android:layout_marginEnd="@*android:dimen/preference_fragment_padding_side">
+ android:paddingBottom="1dp">
<TextView android:id="@+id/usedStorageText"
android:layout_width="0px"
android:layout_height="wrap_content"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:layout_marginStart="@*android:dimen/preference_fragment_padding_side"
- android:layout_marginEnd="@*android:dimen/preference_fragment_padding_side"
android:visibility="gone"
android:gravity="center">
android:layout_height="wrap_content"
android:layout_gravity="top"
android:textAppearance="@style/TextAppearance.PagerTabs"
- android:paddingLeft="@dimen/pager_tabs_padding"
- android:paddingRight="@dimen/pager_tabs_padding">
+ android:padding="0dp">
</android.support.v4.view.PagerTabStrip>
</android.support.v4.view.ViewPager>
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:layout_marginStart="@*android:dimen/preference_fragment_padding_side"
- android:layout_marginEnd="@*android:dimen/preference_fragment_padding_side"
android:visibility="gone"
android:gravity="center">
android:layout_width="match_parent"
android:layout_height="match_parent"
android:clipToPadding="false"
- android:scrollbarStyle="@*android:integer/preference_fragment_scrollbarStyle">
+ android:scrollbarStyle="@integer/preference_scrollbar_style">
<LinearLayout
android:id="@+id/all_details"
android:id="@+android:id/title"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:padding="@*android:dimen/preference_fragment_padding_side"
android:gravity="center" />
</LinearLayout>
android:layout_height="0px"
android:layout_weight="1">
<ListView android:id="@android:id/list"
+ style="@style/PreferenceFragmentListSinglePane"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:paddingStart="@*android:dimen/preference_fragment_padding_side"
- android:paddingEnd="@*android:dimen/preference_fragment_padding_side"
android:drawSelectorOnTop="false"
android:scrollbarStyle="outsideOverlay"
android:fastScrollEnabled="true" />
</FrameLayout>
<view class="com.android.settings.applications.LinearColorBar"
android:id="@+id/color_bar"
+ android:layout_marginStart="@dimen/settings_side_margin"
+ android:layout_marginEnd="@dimen/settings_side_margin"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="-5dp"
android:paddingTop="30dp"
android:paddingStart="4dp"
android:paddingEnd="4dp"
- android:paddingBottom="1dp"
- android:layout_marginStart="@*android:dimen/preference_fragment_padding_side"
- android:layout_marginEnd="@*android:dimen/preference_fragment_padding_side">
+ android:paddingBottom="1dp">
<TextView android:id="@+id/foregroundText"
android:layout_width="0px"
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:clipToPadding="false"
- android:scrollbarStyle="@*android:integer/preference_fragment_scrollbarStyle">
+ android:scrollbarStyle="@integer/preference_scrollbar_style">
<LinearLayout
android:id="@+id/all_details"
android:id="@+id/title_area"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginStart="@*android:dimen/preference_fragment_padding_side"
- android:layout_marginEnd="@*android:dimen/preference_fragment_padding_side"
+ android:layout_marginStart="@dimen/settings_side_margin"
+ android:layout_marginEnd="@dimen/settings_side_margin"
android:minHeight="?android:attr/listPreferredItemHeight"
android:paddingStart="?android:attr/listPreferredItemPaddingStart"
android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
android:orientation="vertical"
android:focusable="true"
android:clickable="true"
- android:paddingStart="@*android:dimen/preference_fragment_padding_side"
- android:paddingEnd="@*android:dimen/preference_fragment_padding_side" >
+ android:paddingStart="@dimen/settings_side_margin"
+ android:paddingEnd="@dimen/settings_side_margin" >
<LinearLayout
android:layout_width="match_parent"
<style name="KeyguardAppWidgetItem">
<item name="android:textSize">16sp</item>
</style>
+
</resources>
--- /dev/null
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2012 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.
+-->
+
+<resources>
+ <dimen name="settings_side_margin">150dp</dimen>
+</resources>
-->
<resources>
- <dimen name="pager_tabs_padding">@*android:dimen/preference_fragment_padding_side</dimen>
+ <dimen name="pager_tabs_padding">0dp</dimen>
<dimen name="appwidget_preview_height">80dip</dimen>
<integer name="keyguard_appwidget_picker_cols">2</integer>
<dimen name="keyguard_appwidget_picker_width">720dip</dimen>
+ <dimen name="settings_side_margin">32dp</dimen>
</resources>
<dimen name="captioning_preview_height">200dp</dimen>
+ <dimen name="settings_side_margin">@*android:dimen/preference_fragment_padding_side</dimen>
</resources>
<item name="@*android:preferencePanelStyle">@*android:style/PreferencePanel.Dialog</item>
</style>
+ <style name="PreferenceHeaderPanelSinglePane">
+ <item name="android:layout_marginStart">0dp</item>
+ <item name="android:layout_marginEnd">0dp</item>
+ <item name="android:background">@null</item>
+ </style>
+
+ <style name="PreferencePanelSinglePane" parent="@*android:style/PreferencePanel">
+ <item name="android:layout_marginStart">0dp</item>
+ <item name="android:layout_marginEnd">0dp</item>
+ <item name="android:paddingStart">0dp</item>
+ <item name="android:paddingEnd">0dp</item>
+ <item name="android:background">@null</item>
+ <item name="android:scrollbarStyle">outsideOverlay</item>
+ </style>
+
+ <style name="PreferenceHeaderListSinglePane" parent="@*android:style/PreferenceHeaderList">
+ <item name="android:paddingStart">@dimen/settings_side_margin</item>
+ <item name="android:paddingEnd">@dimen/settings_side_margin</item>
+ <item name="android:paddingTop">0dp</item>
+ <item name="android:paddingBottom">0dp</item>
+ <item name="android:layout_marginStart">0dp</item>
+ <item name="android:layout_marginEnd">0dp</item>
+ <item name="android:layout_marginTop">0dp</item>
+ <item name="android:layout_marginBottom">0dp</item>
+ <item name="android:scrollbarStyle">outsideOverlay</item>
+ </style>
+
+ <style name="PreferenceFragmentListSinglePane" parent="@*android:style/PreferenceFragmentList">
+ <item name="android:paddingStart">@dimen/settings_side_margin</item>
+ <item name="android:paddingEnd">@dimen/settings_side_margin</item>
+ <item name="android:layout_marginStart">0dp</item>
+ <item name="android:layout_marginEnd">0dp</item>
+ <item name="android:scrollbarStyle">outsideOverlay</item>
+ </style>
+
<!-- We'd like to have this as 16dip hight including paddingTop/paddingBottom to
be consistent with ProgressBar -->
<style name="TopDivider">
<style name="KeyguardAppWidgetItem">
<item name="android:textSize">18sp</item>
</style>
+
+ <!-- Scrollbar style OUTSIDE_OVERLAY -->
+ <integer name="preference_scrollbar_style">33554432</integer>
</resources>
<style name="Theme.WifiDialog" parent="@*android:style/Theme.Holo.Dialog.Alert">
<item name="android:windowSoftInputMode">adjustResize</item>
</style>
+
+ <style name="Theme.Settings" parent="@android:style/Theme.Holo">
+ <item name="@*android:preferenceHeaderPanelStyle">@style/PreferenceHeaderPanelSinglePane</item>
+ <item name="@*android:preferencePanelStyle">@style/PreferencePanelSinglePane</item>
+ <item name="@*android:preferenceListStyle">@style/PreferenceHeaderListSinglePane</item>
+ <item name="@*android:preferenceFragmentListStyle">@style/PreferenceFragmentListSinglePane</item>
+ <item name="@*android:preferenceFragmentPaddingSide">@dimen/settings_side_margin</item>
+ </style>
</resources>
// on parent container for inset.
final boolean shouldInset = mListView.getScrollBarStyle()
== View.SCROLLBARS_OUTSIDE_OVERLAY;
- if (shouldInset) {
- mInsetSide = view.getResources().getDimensionPixelOffset(
- com.android.internal.R.dimen.preference_fragment_padding_side);
- } else {
- mInsetSide = 0;
- }
+ mInsetSide = 0;
// adjust padding around tabwidget as needed
- prepareCustomPreferencesList(container, view, mListView, true);
+ prepareCustomPreferencesList(container, view, mListView, false);
mTabHost.setup();
mTabHost.setOnTabChangedListener(mTabListener);
}
}
+ @Override
+ public boolean onIsMultiPane() {
+ return false;
+ }
+
private static final String[] ENTRY_FRAGMENTS = {
WirelessSettings.class.getName(),
WifiSettings.class.getName(),
((PreferenceFrameLayout.LayoutParams) child.getLayoutParams()).removeBorders = true;
final Resources res = list.getResources();
- final int paddingSide = res.getDimensionPixelSize(
- com.android.internal.R.dimen.preference_fragment_padding_side);
+ final int paddingSide = res.getDimensionPixelSize(R.dimen.settings_side_margin);
final int paddingBottom = res.getDimensionPixelSize(
com.android.internal.R.dimen.preference_fragment_padding_bottom);