diff options
author | kaiyiz <kaiyiz@codeaurora.org> | 2014-06-30 14:57:50 +0800 |
---|---|---|
committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2014-06-30 00:00:00 -0700 |
commit | 984bdc41f00570e0630ab64ad3eba147f41e56ac (patch) | |
tree | b8ee7fe50bcd04e9c154d3e0064116d928abeb5c | |
parent | 03dbeabed74dce7485bcb3f4807fe4105e96830a (diff) | |
download | android_packages_apps_Snap-984bdc41f00570e0630ab64ad3eba147f41e56ac.tar.gz android_packages_apps_Snap-984bdc41f00570e0630ab64ad3eba147f41e56ac.tar.bz2 android_packages_apps_Snap-984bdc41f00570e0630ab64ad3eba147f41e56ac.zip |
Camera2: fix more settings menu use the same icon
There is only one icon fit this menu.
Add new icons for this menu item and use them in videomenu and photomenu.
CRs-Fixed: 634284
Change-Id: I277bd01910fd27508e50b5b1793e9e5f58e0c70f
-rw-r--r-- | res/drawable-xhdpi/ic_settings_holo_light_01.png | bin | 0 -> 3847 bytes | |||
-rw-r--r-- | res/drawable-xhdpi/ic_settings_holo_light_02.png | bin | 0 -> 4200 bytes | |||
-rw-r--r-- | res/drawable-xhdpi/ic_settings_holo_light_03.png | bin | 0 -> 4324 bytes | |||
-rw-r--r-- | src/com/android/camera/PhotoMenu.java | 6 | ||||
-rw-r--r-- | src/com/android/camera/VideoMenu.java | 4 |
5 files changed, 5 insertions, 5 deletions
diff --git a/res/drawable-xhdpi/ic_settings_holo_light_01.png b/res/drawable-xhdpi/ic_settings_holo_light_01.png Binary files differnew file mode 100644 index 000000000..8080af7f7 --- /dev/null +++ b/res/drawable-xhdpi/ic_settings_holo_light_01.png diff --git a/res/drawable-xhdpi/ic_settings_holo_light_02.png b/res/drawable-xhdpi/ic_settings_holo_light_02.png Binary files differnew file mode 100644 index 000000000..31c2562df --- /dev/null +++ b/res/drawable-xhdpi/ic_settings_holo_light_02.png diff --git a/res/drawable-xhdpi/ic_settings_holo_light_03.png b/res/drawable-xhdpi/ic_settings_holo_light_03.png Binary files differnew file mode 100644 index 000000000..5597177ee --- /dev/null +++ b/res/drawable-xhdpi/ic_settings_holo_light_03.png diff --git a/src/com/android/camera/PhotoMenu.java b/src/com/android/camera/PhotoMenu.java index e8da60c9e..64be5d7cb 100644 --- a/src/com/android/camera/PhotoMenu.java +++ b/src/com/android/camera/PhotoMenu.java @@ -133,7 +133,7 @@ public class PhotoMenu extends PieController CameraSettings.KEY_AE_BRACKET_HDR }; - PieItem item1 = makeItem(R.drawable.ic_settings_holo_light); + PieItem item1 = makeItem(R.drawable.ic_settings_holo_light_01); item1.setLabel(mActivity.getResources().getString(R.string.camera_menu_more_label)); item1.setOnClickListener(new OnClickListener() { @Override @@ -148,7 +148,7 @@ public class PhotoMenu extends PieController }); mRenderer.addItem(item1); - PieItem item2 = makeItem(R.drawable.ic_settings_holo_light); + PieItem item2 = makeItem(R.drawable.ic_settings_holo_light_02); item2.setLabel(mActivity.getResources().getString(R.string.camera_menu_more_label)); item2.setOnClickListener(new OnClickListener() { @Override @@ -163,7 +163,7 @@ public class PhotoMenu extends PieController }); mRenderer.addItem(item2); - PieItem item3= makeItem(R.drawable.ic_settings_holo_light); + PieItem item3= makeItem(R.drawable.ic_settings_holo_light_03); item3.setLabel(mActivity.getResources().getString(R.string.camera_menu_more_label)); item3.setOnClickListener(new OnClickListener() { @Override diff --git a/src/com/android/camera/VideoMenu.java b/src/com/android/camera/VideoMenu.java index 440c70c46..2ee2f211d 100644 --- a/src/com/android/camera/VideoMenu.java +++ b/src/com/android/camera/VideoMenu.java @@ -85,7 +85,7 @@ public class VideoMenu extends PieController CameraSettings.KEY_VIDEOCAMERA_FLASH_MODE, }; - PieItem item1 = makeItem(R.drawable.ic_settings_holo_light); + PieItem item1 = makeItem(R.drawable.ic_settings_holo_light_01); item1.setLabel(mActivity.getResources().getString(R.string.camera_menu_more_label)); item1.setOnClickListener(new OnClickListener() { @Override @@ -100,7 +100,7 @@ public class VideoMenu extends PieController }); mRenderer.addItem(item1); - PieItem item2 = makeItem(R.drawable.ic_settings_holo_light); + PieItem item2 = makeItem(R.drawable.ic_settings_holo_light_02); item2.setLabel(mActivity.getResources().getString(R.string.camera_menu_more_label)); item2.setOnClickListener(new OnClickListener() { @Override |