diff options
| author | David van Tonder <david.vantonder@gmail.com> | 2013-04-20 05:37:18 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@cyanogenmod.org> | 2013-04-20 05:37:19 -0700 |
| commit | 584edec4bf6cb1f2474416f35ccc14347d078261 (patch) | |
| tree | a36c30c1f460e981ef7f06b49f9f1b026bb88bd7 /res/layout | |
| parent | e73c802881db66a8cd6280dff241f21560452ad2 (diff) | |
| parent | 90864abc085e205dba5d47a07faa5318f86d5591 (diff) | |
| download | packages_apps_settings-584edec4bf6cb1f2474416f35ccc14347d078261.zip packages_apps_settings-584edec4bf6cb1f2474416f35ccc14347d078261.tar.gz packages_apps_settings-584edec4bf6cb1f2474416f35ccc14347d078261.tar.bz2 | |
Merge "Led Settings : Hex input for colorpicker" into cm-10.1
Diffstat (limited to 'res/layout')
| -rw-r--r-- | res/layout/dialog_light_settings.xml | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/res/layout/dialog_light_settings.xml b/res/layout/dialog_light_settings.xml index aa78c39..c8c4224 100644 --- a/res/layout/dialog_light_settings.xml +++ b/res/layout/dialog_light_settings.xml @@ -37,24 +37,17 @@ android:layout_marginTop="4dp" android:orientation="horizontal" > - <com.android.settings.notificationlight.ColorPanelView - android:id="@+id/old_color_panel" + <EditText + android:id="@+id/hex_color_input" android:layout_width="0px" + android:maxLength="6" + android:digits="0123456789ABCDEFabcdef" + android:inputType="textNoSuggestions" android:layout_height="match_parent" android:layout_weight="0.5" /> - <TextView - android:layout_width="wrap_content" - android:layout_height="match_parent" - android:layout_marginStart="10dp" - android:layout_marginEnd="10dp" - android:gravity="center" - android:text="@string/picker_arrow" - android:textColor="#ffffff" - android:textSize="20sp" /> - <com.android.settings.notificationlight.ColorPanelView - android:id="@+id/new_color_panel" + android:id="@+id/color_panel" android:layout_width="0px" android:layout_height="match_parent" android:layout_weight="0.5" /> |