From 761306fadfa94b538f43e8cf3463bf6d22814947 Mon Sep 17 00:00:00 2001 From: Alan Newberger Date: Wed, 30 Oct 2013 12:51:21 -0700 Subject: Remove CameraUtil.launchGallery, ensure SecureCamera uses Gallery up icon CameraUtil.launchGallery incorrectly describes a mechanism to call an APP_GALLERY category intent. Since we're using Gallery icon we should go direct to Gallery, which IntentHelper already does. Simply removed the util class and call the helper direct from the activity. Also noticed during testing that the SecureCamera was not correctly showing the Gallery icon, though its behavior would take user to Gallery. Finally, removing restriction that the video player intent should go to Gallery, instead it should route to system preferred intent. Bug: 11065256 Change-Id: I941f9469de169919c4bac6c91dde7e577921f737 --- AndroidManifest.xml | 1 + 1 file changed, 1 insertion(+) (limited to 'AndroidManifest.xml') diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 8152f8193..9368e38ab 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -112,6 +112,7 @@ android:excludeFromRecents="true" android:icon="@mipmap/ic_launcher_camera" android:label="@string/app_name" + android:logo="@mipmap/ic_launcher_gallery" android:taskAffinity="com.android.camera.SecureCameraActivity" android:theme="@style/Theme.Camera" android:windowSoftInputMode="stateAlwaysHidden|adjustPan" > -- cgit v1.2.3 From 3ec8d21ae9f687ed213f7b2818e1b8758741689d Mon Sep 17 00:00:00 2001 From: ztenghui Date: Tue, 5 Nov 2013 15:23:12 -0800 Subject: Fix the RTL layout in the app's manifest. At the same time, make sure the bottom controls are following RTL rules. bug:11481090 Change-Id: I52262aece7c16c194b6419150c1d4c13abff4f2d --- AndroidManifest.xml | 1 + 1 file changed, 1 insertion(+) (limited to 'AndroidManifest.xml') diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 9368e38ab..e14a251b2 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -47,6 +47,7 @@ android:largeHeap="true" android:logo="@mipmap/ic_launcher_camera" android:restoreAnyVersion="true" + android:supportsRtl="true" android:theme="@style/Theme.Camera" >