diff options
author | Byunghun Jeon <bjeon@codeaurora.org> | 2016-07-14 11:13:36 -0700 |
---|---|---|
committer | Jay Wang <jaywang@codeaurora.org> | 2016-09-27 11:08:28 -0700 |
commit | a6038bde5f3fbdd05519f1be8ad6f369fd0365bf (patch) | |
tree | ab9761c31171a7053b329a3d08573b370f747336 /res/layout/one_ui_layout.xml | |
parent | 8eefd5866870e7293665df25625ab69fb8e2de0f (diff) | |
download | android_packages_apps_Snap-a6038bde5f3fbdd05519f1be8ad6f369fd0365bf.tar.gz android_packages_apps_Snap-a6038bde5f3fbdd05519f1be8ad6f369fd0365bf.tar.bz2 android_packages_apps_Snap-a6038bde5f3fbdd05519f1be8ad6f369fd0365bf.zip |
SnapdragonCamera: Add OneUI to Camera2
Add new UI called OneUI to Camera2.
It replaces icons, adds 2 new activities for scene menu
and setting menu.
There is no module change anymore
Change-Id: If712e6af7bbc29726dae387168aefbcd2d7c1ea9
CRs-Fixed: 1066519
Diffstat (limited to 'res/layout/one_ui_layout.xml')
-rw-r--r-- | res/layout/one_ui_layout.xml | 113 |
1 files changed, 113 insertions, 0 deletions
diff --git a/res/layout/one_ui_layout.xml b/res/layout/one_ui_layout.xml new file mode 100644 index 000000000..22c2c42e3 --- /dev/null +++ b/res/layout/one_ui_layout.xml @@ -0,0 +1,113 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (c) 2016, The Linux Foundation. All rights reserved. + Not a Contribution. + + Copyright (C) 2013 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> +<com.android.camera.ui.OneUICameraControls xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/camera_controls" + android:layout_width="match_parent" + android:layout_height="match_parent"> + + <com.android.camera.ui.FlashToggleButton + android:id="@+id/flash_button" + style="@style/OneUIMenuButton" + android:src="@drawable/flash" /> + + <com.android.camera.ui.RotateImageView + android:id="@+id/mute_button" + style="@style/OneUIMenuButton" + android:contentDescription="@string/mute_button_desc" + android:src="@drawable/ic_unmuted_button" + android:visibility="gone" /> + + <com.android.camera.ShutterButton + android:id="@+id/shutter_button" + android:layout_width="70dp" + android:layout_height="70dp" + android:clickable="true" + android:contentDescription="@string/accessibility_shutter_button" + android:focusable="true" + android:scaleType="fitCenter" + android:src="@drawable/photo_capture" /> + + <com.android.camera.ui.RotateImageView + android:id="@+id/video_button" + android:layout_width="55dp" + android:layout_height="55dp" + android:clickable="true" + android:contentDescription="@string/accessibility_shutter_button" + android:focusable="true" + android:scaleType="fitCenter" + android:src="@drawable/video_capture" /> + + <com.android.camera.ui.RotateImageView + android:id="@+id/preview_thumb" + android:layout_width="@dimen/capture_size" + android:layout_height="@dimen/capture_size" + android:layout_gravity="top|right" + android:background="@android:color/transparent" + android:contentDescription="@string/switch_photo_filmstrip" + android:scaleType="fitCenter" /> + + <com.android.camera.ui.RotateImageView + android:id="@+id/front_back_switcher" + style="@style/OneUIMenuButton" + android:src="@drawable/front_back_camera" /> + + <com.android.camera.ui.RotateImageView + android:id="@+id/hdr_switcher" + style="@style/OneUIMenuButton" /> + + <com.android.camera.ui.RotateImageView + android:id="@+id/scene_mode_switcher" + style="@style/OneUIMenuButton" + android:src="@drawable/more_options" /> + + <com.android.camera.ui.RotateImageView + android:id="@+id/filter_mode_switcher" + style="@style/OneUIMenuButton" + android:src="@drawable/filters" /> + + <com.android.camera.ui.RotateImageView + android:id="@+id/ts_makeup_switcher" + style="@style/OneUIMenuButton" + android:src="@drawable/beautify" /> + + <LinearLayout + android:id="@+id/remaining_photos" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:background="@android:color/transparent" + android:orientation="horizontal" + android:visibility="gone"> + + <TextView + android:id="@+id/remaining_photos_text" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:background="@android:color/transparent" + android:textColor="@android:color/white" + android:visibility="gone" /> + + <ImageView + android:id="@+id/remaining_photos_image" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:src="@drawable/remaining_sheets" + android:visibility="gone" /> + </LinearLayout> + +</com.android.camera.ui.OneUICameraControls> |