diff options
| author | Fabrice Di Meglio <fdimeglio@google.com> | 2014-07-15 16:02:09 -0700 |
|---|---|---|
| committer | Fabrice Di Meglio <fdimeglio@google.com> | 2014-07-15 18:52:37 -0700 |
| commit | 1b18665dbc49663f290859ce9cdf3237b8a30b7c (patch) | |
| tree | 4d17463e4643cf50424cee2af2e42bf4975c6c2c /res/layout/switch_bar.xml | |
| parent | 62a8aa7ac90ad28e8f524011480b8b379d0bb50a (diff) | |
| download | packages_apps_Settings-1b18665dbc49663f290859ce9cdf3237b8a30b7c.zip packages_apps_Settings-1b18665dbc49663f290859ce9cdf3237b8a30b7c.tar.gz packages_apps_Settings-1b18665dbc49663f290859ce9cdf3237b8a30b7c.tar.bz2 | |
Fix bug #16319697 ACTION_DEVICE_INFO_SETTINGS intent causes Settings app to crash
- fix the way we are passing switchBarMarginStart / switchBarMarginEnd
Change-Id: Ic6e67643be10877a74ae68075460fa5fd4cc5da1
Diffstat (limited to 'res/layout/switch_bar.xml')
| -rw-r--r-- | res/layout/switch_bar.xml | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/res/layout/switch_bar.xml b/res/layout/switch_bar.xml index be24ff1..6b37e4c 100644 --- a/res/layout/switch_bar.xml +++ b/res/layout/switch_bar.xml @@ -23,7 +23,6 @@ android:layout_height="wrap_content" android:layout_width="0dp" android:layout_weight="1" - android:layout_marginStart="?attr/switchBarMarginStart" android:layout_gravity="center_vertical" android:textAppearance="@style/TextAppearance.Switch" android:textAlignment="viewStart" /> @@ -32,7 +31,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center_vertical" - android:layout_marginEnd="?attr/switchBarMarginEnd" android:background="@null" /> + </merge> |