diff options
20 files changed, 24 insertions, 67 deletions
diff --git a/res/drawable-v19/photopage_bottom_button_background.xml b/res/drawable-v19/photopage_bottom_button_background.xml deleted file mode 100644 index 78571dafe..000000000 --- a/res/drawable-v19/photopage_bottom_button_background.xml +++ /dev/null @@ -1,5 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<selector xmlns:android="http://schemas.android.com/apk/res/android"> - <item android:drawable="@drawable/list_pressed_holo_light" android:state_pressed="true"/> - <item android:drawable="@color/button_dark_transparent_background" android:state_selected="false"/> -</selector> diff --git a/res/drawable-v21/shutter_button_background_camera.xml b/res/drawable-v21/shutter_button_background_camera.xml index 34bc2c2bf..39e3c37c3 100644 --- a/res/drawable-v21/shutter_button_background_camera.xml +++ b/res/drawable-v21/shutter_button_background_camera.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> <ripple xmlns:android="http://schemas.android.com/apk/res/android" android:color="@color/camera_mode_color"> - <item android:drawable="@color/bottombar_unpressed" /> + <item android:drawable="@color/camera_gray_background" /> </ripple>
\ No newline at end of file diff --git a/res/drawable-v21/shutter_button_background_panorama.xml b/res/drawable-v21/shutter_button_background_panorama.xml index 17d228570..b67bce047 100644 --- a/res/drawable-v21/shutter_button_background_panorama.xml +++ b/res/drawable-v21/shutter_button_background_panorama.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> <ripple xmlns:android="http://schemas.android.com/apk/res/android" android:color="@color/panorama_mode_color"> - <item android:drawable="@color/bottombar_unpressed" /> + <item android:drawable="@color/camera_gray_background" /> </ripple>
\ No newline at end of file diff --git a/res/drawable-v21/shutter_button_background_photosphere.xml b/res/drawable-v21/shutter_button_background_photosphere.xml index fbe942ddb..c006fe48c 100644 --- a/res/drawable-v21/shutter_button_background_photosphere.xml +++ b/res/drawable-v21/shutter_button_background_photosphere.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> <ripple xmlns:android="http://schemas.android.com/apk/res/android" android:color="@color/photosphere_mode_color"> - <item android:drawable="@color/bottombar_unpressed" /> + <item android:drawable="@color/camera_gray_background" /> </ripple>
\ No newline at end of file diff --git a/res/drawable-v21/shutter_button_background_refocus.xml b/res/drawable-v21/shutter_button_background_refocus.xml index 158797c58..8259926cf 100644 --- a/res/drawable-v21/shutter_button_background_refocus.xml +++ b/res/drawable-v21/shutter_button_background_refocus.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> <ripple xmlns:android="http://schemas.android.com/apk/res/android" android:color="@color/refocus_mode_color"> - <item android:drawable="@color/bottombar_unpressed" /> + <item android:drawable="@color/camera_gray_background" /> </ripple>
\ No newline at end of file diff --git a/res/drawable/cover.xml b/res/drawable/cover.xml index f340b2866..63d30920c 100644 --- a/res/drawable/cover.xml +++ b/res/drawable/cover.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <layer-list xmlns:android="http://schemas.android.com/apk/res/android" > <item> - <color android:color="@color/mode_cover_default_color"/> + <color android:color="@color/camera_gray_background"/> </item> <item> <bitmap android:src="@drawable/ic_camera_blanket" android:gravity="center" /> diff --git a/res/drawable/photopage_bottom_button_background.xml b/res/drawable/photopage_bottom_button_background.xml deleted file mode 100644 index 0c772ad21..000000000 --- a/res/drawable/photopage_bottom_button_background.xml +++ /dev/null @@ -1,5 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<selector xmlns:android="http://schemas.android.com/apk/res/android"> - <item android:drawable="@android:color/holo_blue_light" android:state_pressed="true"/> - <item android:drawable="@color/button_dark_transparent_background" android:state_selected="false"/> -</selector> diff --git a/res/drawable/shutter_button_background_refocus.xml b/res/drawable/shutter_button_background_refocus.xml index 8db6dadb9..e81e9db1b 100644 --- a/res/drawable/shutter_button_background_refocus.xml +++ b/res/drawable/shutter_button_background_refocus.xml @@ -1,4 +1,4 @@ <?xml version="1.0" encoding="utf-8"?> <layer-list xmlns:android="http://schemas.android.com/apk/res/android"> - <item android:drawable="@color/bottombar_unpressed" /> + <item android:drawable="@color/camera_gray_background" /> </layer-list> diff --git a/res/drawable/shutter_button_background_still.xml b/res/drawable/shutter_button_background_still.xml index 8db6dadb9..e81e9db1b 100644 --- a/res/drawable/shutter_button_background_still.xml +++ b/res/drawable/shutter_button_background_still.xml @@ -1,4 +1,4 @@ <?xml version="1.0" encoding="utf-8"?> <layer-list xmlns:android="http://schemas.android.com/apk/res/android"> - <item android:drawable="@color/bottombar_unpressed" /> + <item android:drawable="@color/camera_gray_background" /> </layer-list> diff --git a/res/layout-land-v21/retake_done_cancel_layout.xml b/res/layout-land-v21/retake_done_cancel_layout.xml index 9e1f7bcff..f688ab215 100644 --- a/res/layout-land-v21/retake_done_cancel_layout.xml +++ b/res/layout-land-v21/retake_done_cancel_layout.xml @@ -25,7 +25,7 @@ android:orientation="vertical" android:gravity="center" android:visibility="invisible" - android:background="@color/bottombar_unpressed" > + android:background="@color/camera_gray_background" > <ImageButton android:id="@+id/cancel_button" android:layout_width="wrap_content" diff --git a/res/layout-land/retake_done_cancel_layout.xml b/res/layout-land/retake_done_cancel_layout.xml index b343f60e0..97039b5ff 100644 --- a/res/layout-land/retake_done_cancel_layout.xml +++ b/res/layout-land/retake_done_cancel_layout.xml @@ -25,7 +25,7 @@ android:orientation="vertical" android:gravity="center" android:visibility="invisible" - android:background="@color/bottombar_unpressed" > + android:background="@color/camera_gray_background" > <ImageButton android:id="@+id/cancel_button" android:layout_width="wrap_content" diff --git a/res/layout-port-v21/retake_done_cancel_layout.xml b/res/layout-port-v21/retake_done_cancel_layout.xml index 545d14db3..5220aa0d5 100644 --- a/res/layout-port-v21/retake_done_cancel_layout.xml +++ b/res/layout-port-v21/retake_done_cancel_layout.xml @@ -25,7 +25,7 @@ android:orientation="horizontal" android:gravity="center" android:visibility="invisible" - android:background="@color/bottombar_unpressed" > + android:background="@color/camera_gray_background" > <ImageButton android:id="@+id/retake_button" android:layout_width="wrap_content" diff --git a/res/layout-port/retake_done_cancel_layout.xml b/res/layout-port/retake_done_cancel_layout.xml index e00ad5d23..8ef6c16cc 100644 --- a/res/layout-port/retake_done_cancel_layout.xml +++ b/res/layout-port/retake_done_cancel_layout.xml @@ -25,7 +25,7 @@ android:orientation="horizontal" android:gravity="center" android:visibility="invisible" - android:background="@color/bottombar_unpressed" > + android:background="@color/camera_gray_background" > <ImageButton android:id="@+id/retake_button" android:layout_width="wrap_content" diff --git a/res/layout-v21/keyguard_widget.xml b/res/layout-v21/keyguard_widget.xml index 74f482d35..03936c23f 100644 --- a/res/layout-v21/keyguard_widget.xml +++ b/res/layout-v21/keyguard_widget.xml @@ -17,7 +17,7 @@ xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/mode_cover_default_color" > + android:background="@color/camera_gray_background" > <ImageView android:layout_gravity="center" diff --git a/res/layout/keyguard_widget.xml b/res/layout/keyguard_widget.xml index 66f90b4ec..33f75dbca 100644 --- a/res/layout/keyguard_widget.xml +++ b/res/layout/keyguard_widget.xml @@ -17,7 +17,7 @@ xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/mode_cover_default_color" > + android:background="@color/camera_gray_background" > <ImageView android:layout_gravity="center" diff --git a/res/values-v21/styles.xml b/res/values-v21/styles.xml index fe1e6a464..949717956 100644 --- a/res/values-v21/styles.xml +++ b/res/values-v21/styles.xml @@ -27,9 +27,9 @@ <item name="android:windowDrawsSystemBarBackgrounds">false</item> <!-- TODO: add background as @drawable/cover after Camera mode cold start default per b/17702056 --> - <item name="android:windowBackground">@color/mode_cover_default_color</item> - <item name="android:colorBackground">@color/mode_cover_default_color</item> - <item name="android:colorBackgroundCacheHint">@color/mode_cover_default_color</item> + <item name="android:windowBackground">@color/camera_gray_background</item> + <item name="android:colorBackground">@color/camera_gray_background</item> + <item name="android:colorBackgroundCacheHint">@color/camera_gray_background</item> <item name="android:actionBarStyle">@style/Camera.ActionBar</item> </style> diff --git a/res/values/colors.xml b/res/values/colors.xml index 4bc2aeb90..b9735d960 100644 --- a/res/values/colors.xml +++ b/res/values/colors.xml @@ -14,38 +14,7 @@ limitations under the License. --> <resources> - <color name="default_background">#000</color> - - <!-- configuration for album set page --> - <color name="albumset_background">#1A1A1A</color> - <color name="albumset_placeholder">#333</color> - <color name="albumset_label_background">#EE414143</color> - <color name="albumset_label_title">#FBFBFB</color> - <color name="albumset_label_count">#A9ABAD</color> - - <!-- configuration for album page --> - <color name="album_background">#1A1A1A</color> - <color name="album_placeholder">#333</color> - - <!-- configuration for photo page --> - <color name="photo_background">#1A1A1A</color> <color name="photo_placeholder">#333</color> - - <!-- configuration for manage cache page --> - <color name="cache_background">#1A1A1A</color> - <color name="cache_placeholder">#333</color> - - <color name="bitmap_screennail_placeholder">#333</color> - - <color name="slideshow_background">#1A1A1A</color> - - <color name="button_dark_transparent_background">#6000</color> - - <color name="ingest_highlight_semitransparent">#8833b5e5</color> - <color name="ingest_date_tile_text">#33b5e5</color> - - <!-- Camera resources below --> - <color name="recording_time_elapsed_text">#FFFFFFFF</color> <color name="recording_time_remaining_text">#FFFF0033</color> <color name="on_viewfinder_label_background_color">#77333333</color> @@ -88,14 +57,12 @@ <color name="refocus_mode_color">#0f9d58</color> <color name="photosphere_mode_color">#ab47bc</color> <color name="panorama_mode_color">#ff9e00</color> - <color name="mode_cover_default_color">#191919</color> <color name="main_color_global">#00acc1</color> - <color name="bottombar_unpressed">#191919</color> <color name="bottombar_pressed">#262626</color> <color name="mode_options_background">#4C000000</color> - <color name="filmstrip_background">#1b1b1b</color> + <color name="camera_gray_background">#1b1b1b</color> <color name="indicators_background_color">#4c000000</color> diff --git a/res/values/styles.xml b/res/values/styles.xml index bc849ec7c..a9213f9fe 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -24,9 +24,9 @@ <item name="android:windowActionBar">false</item> <item name="android:windowTitleSize">0dp</item> <item name="android:windowActionBarOverlay">true</item> - <item name="android:windowBackground">@color/mode_cover_default_color</item> - <item name="android:colorBackground">@color/mode_cover_default_color</item> - <item name="android:colorBackgroundCacheHint">@color/mode_cover_default_color</item> + <item name="android:windowBackground">@color/camera_gray_background</item> + <item name="android:colorBackground">@color/camera_gray_background</item> + <item name="android:colorBackgroundCacheHint">@color/camera_gray_background</item> <item name="android:actionBarStyle">@style/Camera.ActionBar</item> </style> diff --git a/src/com/android/camera/app/CameraAppUI.java b/src/com/android/camera/app/CameraAppUI.java index 3844397db..217f8e243 100644 --- a/src/com/android/camera/app/CameraAppUI.java +++ b/src/com/android/camera/app/CameraAppUI.java @@ -953,7 +953,7 @@ public class CameraAppUI implements ModeListView.ModeSwitchListener, mController.getQuickSwitchToModuleId(currentModuleIndex); if (currentModuleIndex != moduleToTransitionTo) { mAppRootView.redirectTouchEventsTo(mModeTransitionView); - int shadeColorId = R.color.mode_cover_default_color; + int shadeColorId = R.color.camera_gray_background; int iconRes = CameraUtil.getCameraModeCoverIconResId(moduleToTransitionTo, mController.getAndroidContext()); @@ -1029,7 +1029,7 @@ public class CameraAppUI implements ModeListView.ModeSwitchListener, */ private void showModeCoverUntilPreviewReady() { int modeId = mController.getCurrentModuleIndex(); - int colorId = R.color.mode_cover_default_color;; + int colorId = R.color.camera_gray_background;; int iconId = CameraUtil.getCameraModeCoverIconResId(modeId, mController.getAndroidContext()); mModeTransitionView.setupModeCover(colorId, iconId); mHideCoverRunnable = new Runnable() { @@ -1226,7 +1226,7 @@ public class CameraAppUI implements ModeListView.ModeSwitchListener, mBottomBar = (BottomBar) mCameraRootView.findViewById(R.id.bottom_bar); int unpressedColor = mController.getAndroidContext().getResources() - .getColor(R.color.bottombar_unpressed); + .getColor(R.color.camera_gray_background); setBottomBarColor(unpressedColor); updateModeSpecificUIColors(); diff --git a/src/com/android/camera/widget/FilmstripLayout.java b/src/com/android/camera/widget/FilmstripLayout.java index d30c1c239..96ba45446 100644 --- a/src/com/android/camera/widget/FilmstripLayout.java +++ b/src/com/android/camera/widget/FilmstripLayout.java @@ -489,7 +489,7 @@ public class FilmstripLayout extends FrameLayout implements FilmstripContentPane public FilmstripBackground() { mPaint = new Paint(); mPaint.setAntiAlias(true); - mPaint.setColor(getResources().getColor(R.color.filmstrip_background)); + mPaint.setColor(getResources().getColor(R.color.camera_gray_background)); mPaint.setAlpha(255); } |