diff options
| author | Brint E. Kriebel <bekit@cyngn.com> | 2014-11-18 13:54:29 -0800 |
|---|---|---|
| committer | Brint E. Kriebel <bekit@cyngn.com> | 2014-11-18 13:54:29 -0800 |
| commit | 7fdd952a334fdf77402daebdee9d3ef65495a323 (patch) | |
| tree | e744616a103d6192d9479bd56a945473ec2d9149 /res/layout/color_picker_pref_item.xml | |
| parent | f9806b5b17e33cf150d05d6e681be7be24db76a0 (diff) | |
| parent | 0ca39c11901f7d1dc8ad4377cdc65a329baea00d (diff) | |
| download | android_packages_wallpapers_PhotoPhase-7fdd952a334fdf77402daebdee9d3ef65495a323.tar.gz android_packages_wallpapers_PhotoPhase-7fdd952a334fdf77402daebdee9d3ef65495a323.tar.bz2 android_packages_wallpapers_PhotoPhase-7fdd952a334fdf77402daebdee9d3ef65495a323.zip | |
Merge branch 'cm-11.0' into stable/cm-11.0cm-11.0-XNPH05Q-tomato-9828f8e9ccstable/cm-11.0-XNF8Yshipping/cm-11.0
Diffstat (limited to 'res/layout/color_picker_pref_item.xml')
| -rw-r--r-- | res/layout/color_picker_pref_item.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/res/layout/color_picker_pref_item.xml b/res/layout/color_picker_pref_item.xml index f299d0e..65f51b7 100644 --- a/res/layout/color_picker_pref_item.xml +++ b/res/layout/color_picker_pref_item.xml @@ -19,7 +19,7 @@ android:layout_height="32dp" android:background="@android:color/darker_gray"> <afzkl.development.mColorPicker.views.ColorPanelView - android:id="@+android:id/color_picker" + android:id="@+id/color_picker" android:layout_width="match_parent" android:layout_height="match_parent" android:layout_margin="1dp" |