PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Single pane for 10" Settings

Browse Source 
Change-Id: I960e4be3cfb19ffec4100f8766742d6fb17dda4a
This commit is contained in:
Amith Yamasani
2013-08-05 10:07:23 -07:00
parent 8a181dd0d1
commit 56f51a8927
25 changed files with 105 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
AndroidManifest.xml
View File

@@ -70,7 +70,7 @@
<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">

8
res/layout-sw720dp/tab_widget.xml
View File

@@ -25,8 +25,8 @@
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>

6
res/layout/account_sync_screen.xml
View File

@@ -27,8 +27,8 @@
<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" />
@@ -38,7 +38,7 @@
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"

2
res/layout/app_ops_details.xml
View File

@@ -21,7 +21,7 @@
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"

3
res/layout/data_usage_summary.xml
View File

@@ -29,16 +29,17 @@
<!-- 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" />

2
res/layout/installed_app_details.xml
View File

@@ -21,7 +21,7 @@
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"

2
res/layout/manage_accounts_screen.xml
View File

@@ -28,7 +28,7 @@
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"

12
res/layout/manage_applications_apps.xml
View File

@@ -31,7 +31,7 @@
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"
@@ -41,6 +41,8 @@
</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"
@@ -48,11 +50,7 @@
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"
@@ -88,8 +86,6 @@
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">

3
res/layout/manage_applications_content.xml
View File

@@ -35,8 +35,7 @@
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>

2
res/layout/manage_applications_running.xml
View File

@@ -27,8 +27,6 @@
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">

2
res/layout/power_usage_details.xml
View File

@@ -19,7 +19,7 @@
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"

1
res/layout/preference_empty_list.xml
View File

@@ -24,7 +24,6 @@
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>

9
res/layout/running_processes_view.xml
View File

@@ -24,10 +24,9 @@
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" />
@@ -40,6 +39,8 @@
</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"
@@ -49,9 +50,7 @@
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"

2
res/layout/running_service_details.xml
View File

@@ -21,7 +21,7 @@
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"

4
res/layout/title.xml
View File

@@ -23,8 +23,8 @@
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"

4
res/layout/user_info_header.xml
View File

@@ -22,8 +22,8 @@
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"

1
res/values-sw600dp/styles.xml
View File

@@ -68,4 +68,5 @@
<style name="KeyguardAppWidgetItem">
<item name="android:textSize">16sp</item>
</style>
</resources>

19
res/values-sw720dp-land/dimens.xml Normal file
View File

@@ -0,0 +1,19 @@
<?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>

3
res/values-sw720dp/dimens.xml
View File

@@ -15,8 +15,9 @@
-->
<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>

1
res/values/dimens.xml
View File

@@ -71,4 +71,5 @@
<dimen name="captioning_preview_height">200dp</dimen>
<dimen name="settings_side_margin">@*android:dimen/preference_fragment_padding_side</dimen>
</resources>

38
res/values/styles.xml
View File

@@ -87,6 +87,41 @@
<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">
@@ -203,4 +238,7 @@
<style name="KeyguardAppWidgetItem">
<item name="android:textSize">18sp</item>
</style>
<!-- Scrollbar style OUTSIDE_OVERLAY -->
<integer name="preference_scrollbar_style">33554432</integer>
</resources>

8
res/values/themes.xml
View File

@@ -19,4 +19,12 @@
<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>

9
src/com/android/settings/DataUsageSummary.java
View File

@@ -312,15 +312,10 @@ public class DataUsageSummary extends Fragment {
// 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);

5
src/com/android/settings/Settings.java
View File

@@ -286,6 +286,11 @@ public class Settings extends PreferenceActivity
}
}
@Override
public boolean onIsMultiPane() {
return false;
}
private static final String[] ENTRY_FRAGMENTS = {
WirelessSettings.class.getName(),
WifiSettings.class.getName(),

3
src/com/android/settings/Utils.java
View File

@@ -448,8 +448,7 @@ public class Utils {
((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);