summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera/ModePicker.java
diff options
context:
space:
mode:
authorChih-Chung Chang <chihchung@google.com>2011-10-31 18:50:52 +0800
committerChih-Chung Chang <chihchung@google.com>2011-11-03 15:23:03 +0800
commitda705aa1c8cbaaba105d9bc7799aef95c416a459 (patch)
treebc01f30294462780bfd4b4437b862881b295ece3 /src/com/android/camera/ModePicker.java
parent1f56f129d65729705326f4d6852d760e6a5cacf5 (diff)
downloadLegacyCamera-da705aa1c8cbaaba105d9bc7799aef95c416a459.zip
LegacyCamera-da705aa1c8cbaaba105d9bc7799aef95c416a459.tar.gz
LegacyCamera-da705aa1c8cbaaba105d9bc7799aef95c416a459.tar.bz2
Fix 5521540: UI Tweaks.
- draw fan-shaped semi-transparent area on the indicator wheel. - change selected indicator color - remove video mode black border - set activity background to black - update assets - don't gray out unselected modes in mode picker (tablet) - set ok/cancel icons to 32dp, font to 12sp bold Change-Id: Iedc43dca29d1943965caf2d36cce176d8e509547
Diffstat (limited to 'src/com/android/camera/ModePicker.java')
-rw-r--r--src/com/android/camera/ModePicker.java9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/com/android/camera/ModePicker.java b/src/com/android/camera/ModePicker.java
index ccde71d..b79baa5 100644
--- a/src/com/android/camera/ModePicker.java
+++ b/src/com/android/camera/ModePicker.java
@@ -223,10 +223,13 @@ public class ModePicker extends RelativeLayout implements View.OnClickListener,
}
private void updateModeState() {
- // Grey-out the unselected icons.
- for (int i = 0; i < MODE_NUM; ++i) {
- highlightView(mModeSelectionIcon[i], (i == mCurrentMode));
+ // Grey-out the unselected icons for Phone UI.
+ if (mCurrentModeFrame != null) {
+ for (int i = 0; i < MODE_NUM; ++i) {
+ highlightView(mModeSelectionIcon[i], (i == mCurrentMode));
+ }
}
+
// Update the current mode icons on the Phone UI. The selected mode
// should be in the center of the current mode icon bar.
if (mCurrentModeFrame != null) {