diff options
| author | Steve Kondik <steve@cyngn.com> | 2016-08-04 12:50:34 -0700 |
|---|---|---|
| committer | Steve Kondik <steve@cyngn.com> | 2016-08-21 18:46:32 -0700 |
| commit | e3d36c451e9e66c7786c169248c3a8aa06b67de7 (patch) | |
| tree | 1d1fdc563297db51c912203c40ec29a731ae14bc /res | |
| parent | 9fc9fd41865ae855b5d8bb925b8100a16aa63c3b (diff) | |
| download | android_packages_apps_Snap-e3d36c451e9e66c7786c169248c3a8aa06b67de7.tar.gz android_packages_apps_Snap-e3d36c451e9e66c7786c169248c3a8aa06b67de7.tar.bz2 android_packages_apps_Snap-e3d36c451e9e66c7786c169248c3a8aa06b67de7.zip | |
camera2: Fix merge issues
Change-Id: I9b55bcaaa03e598e57325f45e80ee8493029edf1
Diffstat (limited to 'res')
| -rw-r--r-- | res/drawable/ic_settings_filter.xml | 2 | ||||
| -rw-r--r-- | res/layout/camera.xml | 4 | ||||
| -rw-r--r-- | res/layout/capture_module.xml | 10 |
3 files changed, 13 insertions, 3 deletions
diff --git a/res/drawable/ic_settings_filter.xml b/res/drawable/ic_settings_filter.xml index 9f0e4ed77..5b8678967 100644 --- a/res/drawable/ic_settings_filter.xml +++ b/res/drawable/ic_settings_filter.xml @@ -6,7 +6,7 @@ android:viewportHeight="24"> <path - android:fillColor="@color/white" + android:fillColor="@color/grey" android:pathData="M2.53 19.65l1.34 .56 v-9.03l-2.43 5.86c-.41 1.02 .08 2.19 1.09 2.61zm19.5-3.7L17.07 3.98c-.31-.75-1.04-1.21-1.81-1.23-.26 0-.53 .04 -.79 .15 L7.1 5.95c-.75 .31 -1.21 1.03-1.23 1.8-.01 .27 .04 .54 .15 .8 l4.96 11.97c.31 diff --git a/res/layout/camera.xml b/res/layout/camera.xml index a71460066..7ca37e43b 100644 --- a/res/layout/camera.xml +++ b/res/layout/camera.xml @@ -13,7 +13,7 @@ See the License for the specific language governing permissions and limitations under the License. --> -<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" +<com.android.camera.ui.CameraRootFrame xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/camera_root_frame" android:layout_width="match_parent" android:layout_height="match_parent" > @@ -37,4 +37,4 @@ android:layout_width="match_parent" android:layout_height="match_parent" > </com.android.camera.ui.CameraRootView> -</FrameLayout> +</com.android.camera.ui.CameraRootFrame> diff --git a/res/layout/capture_module.xml b/res/layout/capture_module.xml index 07594cef3..26ac8617d 100644 --- a/res/layout/capture_module.xml +++ b/res/layout/capture_module.xml @@ -55,6 +55,16 @@ android:layout_width="match_parent" android:layout_height="match_parent"> + <com.android.camera.ui.focus.FocusRingView + android:id="@+id/focus_ring" + android:layout_width="match_parent" + android:layout_height="match_parent" /> + </FrameLayout> + + <FrameLayout + android:layout_width="match_parent" + android:layout_height="match_parent"> + <com.android.camera.ui.Camera2FaceView android:id="@+id/face_view" android:layout_width="match_parent" |