diff options
| author | Fabrice Di Meglio <fdimeglio@google.com> | 2014-07-18 23:59:32 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-07-18 18:24:25 +0000 |
| commit | 84dfc0b5d64f9a7224e524794783080fc1b0419e (patch) | |
| tree | e5fac2a4ccd39e74b72580368f56d1a12ee519aa /res/layout | |
| parent | 8d7be7b738cce9facdd8832aa845ceb79c19ffc6 (diff) | |
| parent | d40dd45c18a55d574d65b3a0ac16b59d76027049 (diff) | |
| download | packages_apps_Settings-84dfc0b5d64f9a7224e524794783080fc1b0419e.zip packages_apps_Settings-84dfc0b5d64f9a7224e524794783080fc1b0419e.tar.gz packages_apps_Settings-84dfc0b5d64f9a7224e524794783080fc1b0419e.tar.bz2 | |
Merge "Fix overdraw and do some layout optimizations" into lmp-dev
Diffstat (limited to 'res/layout')
| -rw-r--r-- | res/layout/preference_list_fragment.xml | 4 | ||||
| -rw-r--r-- | res/layout/settings_main_dashboard.xml | 25 | ||||
| -rw-r--r-- | res/layout/settings_main_prefs.xml (renamed from res/layout/settings_main.xml) | 6 |
3 files changed, 30 insertions, 5 deletions
diff --git a/res/layout/preference_list_fragment.xml b/res/layout/preference_list_fragment.xml index a97415e..8391641 100644 --- a/res/layout/preference_list_fragment.xml +++ b/res/layout/preference_list_fragment.xml @@ -36,8 +36,6 @@ android:scrollbarStyle="@*android:integer/preference_fragment_scrollbarStyle" android:clipToPadding="false" android:drawSelectorOnTop="false" - android:cacheColorHint="@android:color/white" - android:background="@drawable/preference_list_fragment_background" android:elevation="@dimen/dashboard_category_elevation" android:scrollbarAlwaysDrawVerticalTrack="true" /> @@ -82,6 +80,8 @@ android:text="@*android:string/next_button_label" /> </LinearLayout> + </RelativeLayout> + </LinearLayout> diff --git a/res/layout/settings_main_dashboard.xml b/res/layout/settings_main_dashboard.xml new file mode 100644 index 0000000..56f2737 --- /dev/null +++ b/res/layout/settings_main_dashboard.xml @@ -0,0 +1,25 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** Copyright 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. +*/ +--> + +<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/main_content" + android:layout_height="match_parent" + android:layout_width="match_parent" + android:background="@color/dashboard_background_color" + /> diff --git a/res/layout/settings_main.xml b/res/layout/settings_main_prefs.xml index 56737a1..53fd918 100644 --- a/res/layout/settings_main.xml +++ b/res/layout/settings_main_prefs.xml @@ -20,8 +20,7 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="vertical" android:layout_height="match_parent" - android:layout_width="match_parent" - android:background="?attr/dashboardBackgroundColor"> + android:layout_width="match_parent"> <LinearLayout android:orientation="vertical" @@ -37,9 +36,10 @@ /> <FrameLayout - android:id="@+id/prefs" + android:id="@+id/main_content" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="?attr/preferenceBackgroundColor" /> </LinearLayout> |