diff options
author | Wu-cheng Li <wuchengli@google.com> | 2011-08-18 03:09:12 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-08-18 03:09:12 -0700 |
commit | 362928c00ad4ecc0466c353d942c6d6c7cc5f5ee (patch) | |
tree | a24821871d29235d0da7e16aa68ff0bf751e2c07 /res | |
parent | f39a97a63528bd194344e5724c2cc46f43c725e6 (diff) | |
parent | 46521167db54dcc88e5bf6dc82798fa912a5a66a (diff) | |
download | LegacyCamera-362928c00ad4ecc0466c353d942c6d6c7cc5f5ee.zip LegacyCamera-362928c00ad4ecc0466c353d942c6d6c7cc5f5ee.tar.gz LegacyCamera-362928c00ad4ecc0466c353d942c6d6c7cc5f5ee.tar.bz2 |
Merge "Update white-balance and remove old setting icon."
Diffstat (limited to 'res')
43 files changed, 10 insertions, 10 deletions
diff --git a/res/drawable-hdpi/ic_menuselect_wb_auto.png b/res/drawable-hdpi/ic_menuselect_wb_auto.png Binary files differdeleted file mode 100644 index 3b30e36..0000000 --- a/res/drawable-hdpi/ic_menuselect_wb_auto.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_menuselect_wb_cloudy.png b/res/drawable-hdpi/ic_menuselect_wb_cloudy.png Binary files differdeleted file mode 100644 index ccd7948..0000000 --- a/res/drawable-hdpi/ic_menuselect_wb_cloudy.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_menuselect_wb_daylight.png b/res/drawable-hdpi/ic_menuselect_wb_daylight.png Binary files differdeleted file mode 100644 index 815280b..0000000 --- a/res/drawable-hdpi/ic_menuselect_wb_daylight.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_menuselect_wb_fluorescent.png b/res/drawable-hdpi/ic_menuselect_wb_fluorescent.png Binary files differdeleted file mode 100644 index 886af77..0000000 --- a/res/drawable-hdpi/ic_menuselect_wb_fluorescent.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_menuselect_wb_incandescent.png b/res/drawable-hdpi/ic_menuselect_wb_incandescent.png Binary files differdeleted file mode 100644 index 0b95bec..0000000 --- a/res/drawable-hdpi/ic_menuselect_wb_incandescent.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_viewfinder_settings.png b/res/drawable-hdpi/ic_viewfinder_settings.png Binary files differdeleted file mode 100644 index 1a53019..0000000 --- a/res/drawable-hdpi/ic_viewfinder_settings.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_viewfinder_wb_auto.png b/res/drawable-hdpi/ic_viewfinder_wb_auto.png Binary files differdeleted file mode 100644 index cf24be4..0000000 --- a/res/drawable-hdpi/ic_viewfinder_wb_auto.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_viewfinder_wb_cloudy.png b/res/drawable-hdpi/ic_viewfinder_wb_cloudy.png Binary files differdeleted file mode 100644 index fd6f2e1..0000000 --- a/res/drawable-hdpi/ic_viewfinder_wb_cloudy.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_viewfinder_wb_daylight.png b/res/drawable-hdpi/ic_viewfinder_wb_daylight.png Binary files differdeleted file mode 100644 index e9706c3..0000000 --- a/res/drawable-hdpi/ic_viewfinder_wb_daylight.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_viewfinder_wb_fluorescent.png b/res/drawable-hdpi/ic_viewfinder_wb_fluorescent.png Binary files differdeleted file mode 100644 index 49b9ea6..0000000 --- a/res/drawable-hdpi/ic_viewfinder_wb_fluorescent.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_viewfinder_wb_incandescent.png b/res/drawable-hdpi/ic_viewfinder_wb_incandescent.png Binary files differdeleted file mode 100644 index 026bf14..0000000 --- a/res/drawable-hdpi/ic_viewfinder_wb_incandescent.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_white_balance_auto_holo_light.png b/res/drawable-hdpi/ic_white_balance_auto_holo_light.png Binary files differnew file mode 100644 index 0000000..ea488ee --- /dev/null +++ b/res/drawable-hdpi/ic_white_balance_auto_holo_light.png diff --git a/res/drawable-hdpi/ic_white_balance_cloudy_holo_light.png b/res/drawable-hdpi/ic_white_balance_cloudy_holo_light.png Binary files differnew file mode 100644 index 0000000..e25559e --- /dev/null +++ b/res/drawable-hdpi/ic_white_balance_cloudy_holo_light.png diff --git a/res/drawable-hdpi/ic_white_balance_fluorescent_holo_light.png b/res/drawable-hdpi/ic_white_balance_fluorescent_holo_light.png Binary files differnew file mode 100644 index 0000000..de50a08 --- /dev/null +++ b/res/drawable-hdpi/ic_white_balance_fluorescent_holo_light.png diff --git a/res/drawable-hdpi/ic_white_balance_incandescent_holo_light.png b/res/drawable-hdpi/ic_white_balance_incandescent_holo_light.png Binary files differnew file mode 100644 index 0000000..2f49c33 --- /dev/null +++ b/res/drawable-hdpi/ic_white_balance_incandescent_holo_light.png diff --git a/res/drawable-hdpi/ic_white_balance_sunlight_holo_light.png b/res/drawable-hdpi/ic_white_balance_sunlight_holo_light.png Binary files differnew file mode 100644 index 0000000..47a1f1a --- /dev/null +++ b/res/drawable-hdpi/ic_white_balance_sunlight_holo_light.png diff --git a/res/drawable-mdpi/ic_menuselect_wb_auto.png b/res/drawable-mdpi/ic_menuselect_wb_auto.png Binary files differdeleted file mode 100644 index 2a05a53..0000000 --- a/res/drawable-mdpi/ic_menuselect_wb_auto.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_menuselect_wb_cloudy.png b/res/drawable-mdpi/ic_menuselect_wb_cloudy.png Binary files differdeleted file mode 100644 index 2baf25e..0000000 --- a/res/drawable-mdpi/ic_menuselect_wb_cloudy.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_menuselect_wb_daylight.png b/res/drawable-mdpi/ic_menuselect_wb_daylight.png Binary files differdeleted file mode 100644 index 4f27f2b..0000000 --- a/res/drawable-mdpi/ic_menuselect_wb_daylight.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_menuselect_wb_fluorescent.png b/res/drawable-mdpi/ic_menuselect_wb_fluorescent.png Binary files differdeleted file mode 100644 index 8ed26a1..0000000 --- a/res/drawable-mdpi/ic_menuselect_wb_fluorescent.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_menuselect_wb_incandescent.png b/res/drawable-mdpi/ic_menuselect_wb_incandescent.png Binary files differdeleted file mode 100644 index d20734d..0000000 --- a/res/drawable-mdpi/ic_menuselect_wb_incandescent.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_viewfinder_settings.png b/res/drawable-mdpi/ic_viewfinder_settings.png Binary files differdeleted file mode 100644 index 49b6ec9..0000000 --- a/res/drawable-mdpi/ic_viewfinder_settings.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_viewfinder_wb_auto.png b/res/drawable-mdpi/ic_viewfinder_wb_auto.png Binary files differdeleted file mode 100644 index 2cfceef..0000000 --- a/res/drawable-mdpi/ic_viewfinder_wb_auto.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_viewfinder_wb_cloudy.png b/res/drawable-mdpi/ic_viewfinder_wb_cloudy.png Binary files differdeleted file mode 100644 index 5f5e3d5..0000000 --- a/res/drawable-mdpi/ic_viewfinder_wb_cloudy.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_viewfinder_wb_daylight.png b/res/drawable-mdpi/ic_viewfinder_wb_daylight.png Binary files differdeleted file mode 100644 index f5ea586..0000000 --- a/res/drawable-mdpi/ic_viewfinder_wb_daylight.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_viewfinder_wb_fluorescent.png b/res/drawable-mdpi/ic_viewfinder_wb_fluorescent.png Binary files differdeleted file mode 100644 index b71b74a..0000000 --- a/res/drawable-mdpi/ic_viewfinder_wb_fluorescent.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_viewfinder_wb_incandescent.png b/res/drawable-mdpi/ic_viewfinder_wb_incandescent.png Binary files differdeleted file mode 100644 index 64364ba..0000000 --- a/res/drawable-mdpi/ic_viewfinder_wb_incandescent.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_white_balance_auto_holo_light.png b/res/drawable-mdpi/ic_white_balance_auto_holo_light.png Binary files differnew file mode 100644 index 0000000..309cc5d --- /dev/null +++ b/res/drawable-mdpi/ic_white_balance_auto_holo_light.png diff --git a/res/drawable-mdpi/ic_white_balance_cloudy_holo_light.png b/res/drawable-mdpi/ic_white_balance_cloudy_holo_light.png Binary files differnew file mode 100644 index 0000000..a8b2397 --- /dev/null +++ b/res/drawable-mdpi/ic_white_balance_cloudy_holo_light.png diff --git a/res/drawable-mdpi/ic_white_balance_fluorescent_holo_light.png b/res/drawable-mdpi/ic_white_balance_fluorescent_holo_light.png Binary files differnew file mode 100644 index 0000000..69e5458 --- /dev/null +++ b/res/drawable-mdpi/ic_white_balance_fluorescent_holo_light.png diff --git a/res/drawable-mdpi/ic_white_balance_incandescent_holo_light.png b/res/drawable-mdpi/ic_white_balance_incandescent_holo_light.png Binary files differnew file mode 100644 index 0000000..628779e --- /dev/null +++ b/res/drawable-mdpi/ic_white_balance_incandescent_holo_light.png diff --git a/res/drawable-mdpi/ic_white_balance_sunlight_holo_light.png b/res/drawable-mdpi/ic_white_balance_sunlight_holo_light.png Binary files differnew file mode 100644 index 0000000..b28206c --- /dev/null +++ b/res/drawable-mdpi/ic_white_balance_sunlight_holo_light.png diff --git a/res/drawable-w1024dp-mdpi/ic_viewfinder_settings.png b/res/drawable-w1024dp-mdpi/ic_viewfinder_settings.png Binary files differdeleted file mode 100644 index 3093ed7..0000000 --- a/res/drawable-w1024dp-mdpi/ic_viewfinder_settings.png +++ /dev/null diff --git a/res/drawable-w1024dp-mdpi/ic_viewfinder_wb_auto.png b/res/drawable-w1024dp-mdpi/ic_viewfinder_wb_auto.png Binary files differdeleted file mode 100644 index cf8ddb4..0000000 --- a/res/drawable-w1024dp-mdpi/ic_viewfinder_wb_auto.png +++ /dev/null diff --git a/res/drawable-w1024dp-mdpi/ic_viewfinder_wb_daylight.png b/res/drawable-w1024dp-mdpi/ic_viewfinder_wb_daylight.png Binary files differdeleted file mode 100644 index 6472b09..0000000 --- a/res/drawable-w1024dp-mdpi/ic_viewfinder_wb_daylight.png +++ /dev/null diff --git a/res/drawable-w1024dp-mdpi/ic_viewfinder_wb_fluorescent.png b/res/drawable-w1024dp-mdpi/ic_viewfinder_wb_fluorescent.png Binary files differdeleted file mode 100644 index 509f436..0000000 --- a/res/drawable-w1024dp-mdpi/ic_viewfinder_wb_fluorescent.png +++ /dev/null diff --git a/res/drawable-w1024dp-mdpi/ic_viewfinder_wb_incandescent.png b/res/drawable-w1024dp-mdpi/ic_viewfinder_wb_incandescent.png Binary files differdeleted file mode 100644 index 1ef4d2e..0000000 --- a/res/drawable-w1024dp-mdpi/ic_viewfinder_wb_incandescent.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_white_balance_auto_holo_light.png b/res/drawable-xhdpi/ic_white_balance_auto_holo_light.png Binary files differnew file mode 100644 index 0000000..0b98197 --- /dev/null +++ b/res/drawable-xhdpi/ic_white_balance_auto_holo_light.png diff --git a/res/drawable-xhdpi/ic_white_balance_cloudy_holo_light.png b/res/drawable-xhdpi/ic_white_balance_cloudy_holo_light.png Binary files differnew file mode 100644 index 0000000..bf0c8fb --- /dev/null +++ b/res/drawable-xhdpi/ic_white_balance_cloudy_holo_light.png diff --git a/res/drawable-xhdpi/ic_white_balance_fluorescent_holo_light.png b/res/drawable-xhdpi/ic_white_balance_fluorescent_holo_light.png Binary files differnew file mode 100644 index 0000000..253552e --- /dev/null +++ b/res/drawable-xhdpi/ic_white_balance_fluorescent_holo_light.png diff --git a/res/drawable-xhdpi/ic_white_balance_incandescent_holo_light.png b/res/drawable-xhdpi/ic_white_balance_incandescent_holo_light.png Binary files differnew file mode 100644 index 0000000..1e1750e --- /dev/null +++ b/res/drawable-xhdpi/ic_white_balance_incandescent_holo_light.png diff --git a/res/drawable-xhdpi/ic_white_balance_sunlight_holo_light.png b/res/drawable-xhdpi/ic_white_balance_sunlight_holo_light.png Binary files differnew file mode 100644 index 0000000..a3b7d1f --- /dev/null +++ b/res/drawable-xhdpi/ic_white_balance_sunlight_holo_light.png diff --git a/res/values/arrays.xml b/res/values/arrays.xml index 97afc9e..2cd0edd 100644 --- a/res/values/arrays.xml +++ b/res/values/arrays.xml @@ -194,19 +194,19 @@ </string-array> <array name="whitebalance_icons" translatable="false"> - <item>@drawable/ic_menuselect_wb_auto</item> - <item>@drawable/ic_menuselect_wb_incandescent</item> - <item>@drawable/ic_menuselect_wb_daylight</item> - <item>@drawable/ic_menuselect_wb_fluorescent</item> - <item>@drawable/ic_menuselect_wb_cloudy</item> + <item>@drawable/ic_white_balance_auto_holo_light</item> + <item>@drawable/ic_white_balance_incandescent_holo_light</item> + <item>@drawable/ic_white_balance_sunlight_holo_light</item> + <item>@drawable/ic_white_balance_fluorescent_holo_light</item> + <item>@drawable/ic_white_balance_cloudy_holo_light</item> </array> <array name="whitebalance_largeicons" translatable="false"> - <item>@drawable/ic_viewfinder_wb_auto</item> - <item>@drawable/ic_viewfinder_wb_incandescent</item> - <item>@drawable/ic_viewfinder_wb_daylight</item> - <item>@drawable/ic_viewfinder_wb_fluorescent</item> - <item>@drawable/ic_viewfinder_wb_cloudy</item> + <item>@drawable/ic_white_balance_auto_holo_light</item> + <item>@drawable/ic_white_balance_incandescent_holo_light</item> + <item>@drawable/ic_white_balance_sunlight_holo_light</item> + <item>@drawable/ic_white_balance_fluorescent_holo_light</item> + <item>@drawable/ic_white_balance_cloudy_holo_light</item> </array> <!-- Camera Preferences Scene Mode dialog box entries --> |