diff options
author | Brint E. Kriebel <bekit@cyngn.com> | 2014-08-25 11:23:39 -0700 |
---|---|---|
committer | Brint E. Kriebel <bekit@cyngn.com> | 2014-08-25 11:23:39 -0700 |
commit | c780ac1d535c3233b1d69471030759ed4f5e5a32 (patch) | |
tree | a355d1667125feb473208e23858099b3050cab90 /res/layout/settings_pane.xml | |
parent | 43ae18f573bfa2234ac6e148806bd6c07b2d68fe (diff) | |
parent | 46b0ef9a1a9aaba3c7ff764b2314ba0986dc9fc3 (diff) | |
download | android_packages_apps_Trebuchet-c780ac1d535c3233b1d69471030759ed4f5e5a32.tar.gz android_packages_apps_Trebuchet-c780ac1d535c3233b1d69471030759ed4f5e5a32.tar.bz2 android_packages_apps_Trebuchet-c780ac1d535c3233b1d69471030759ed4f5e5a32.zip |
Merge branch 'cm-11.0' into stable/cm-11.0
Change-Id: Ic9b8a3947f66de030093181e8586c606dcdc0699
Diffstat (limited to 'res/layout/settings_pane.xml')
-rw-r--r-- | res/layout/settings_pane.xml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/res/layout/settings_pane.xml b/res/layout/settings_pane.xml index 495d0997d..d3f3fdbd5 100644 --- a/res/layout/settings_pane.xml +++ b/res/layout/settings_pane.xml @@ -1,15 +1,15 @@ <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="vertical" android:layout_width="match_parent" + android:background="@color/settings_bg_color" android:layout_height="match_parent" > <LinearLayout + android:id="@+id/settings_container" android:layout_width="match_parent" android:layout_height="match_parent" android:layout_gravity="center_horizontal|bottom" - android:background="@color/settings_bg_color" - android:orientation="vertical" - android:paddingBottom="@dimen/overview_panel_bottom_padding" > + android:orientation="vertical" > <LinearLayout android:id="@+id/settings_pane_header" |