From f9a0a4306d589b4a4e20554fed512a603426bfa1 Mon Sep 17 00:00:00 2001 From: Owen Lin Date: Wed, 17 Aug 2011 22:07:43 +0800 Subject: Initial code for Gallery2. fix: 5176434 Change-Id: I041e282b9c7b34ceb1db8b033be2b853bb3a992c --- AndroidManifest.xml | 239 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 239 insertions(+) create mode 100644 AndroidManifest.xml (limited to 'AndroidManifest.xml') diff --git a/AndroidManifest.xml b/AndroidManifest.xml new file mode 100644 index 000000000..f568265d1 --- /dev/null +++ b/AndroidManifest.xml @@ -0,0 +1,239 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + !-- HTTP live support --> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -- cgit v1.2.3 From d6db8eab6df048b9065834113a6d46a885af01d3 Mon Sep 17 00:00:00 2001 From: Owen Lin Date: Thu, 18 Aug 2011 21:48:19 +0800 Subject: Fix shortcup broken issue. fix: 5154308 Change-Id: I5cd2ef8efb84d4f356b3fe93106bddf10e0823cc --- AndroidManifest.xml | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) (limited to 'AndroidManifest.xml') diff --git a/AndroidManifest.xml b/AndroidManifest.xml index f568265d1..7d9bc1ace 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -66,6 +66,17 @@ + + + + + + + + @@ -200,18 +211,18 @@ android:syncable="false" android:grantUriPermissions="true" android:authorities="com.android.gallery3d.provider" /> - + - - @@ -226,9 +237,9 @@ - - -- cgit v1.2.3 From 2733d79920254aeecdca6b84f125f0626144653e Mon Sep 17 00:00:00 2001 From: Owen Lin Date: Thu, 1 Sep 2011 14:11:19 +0800 Subject: Fix alias not found issue. Also remove note message in proguard. Change-Id: I7e15a3b00d7caf32565d035f6c972d302e38d49f --- AndroidManifest.xml | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) (limited to 'AndroidManifest.xml') diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 7d9bc1ace..a5a64219d 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -67,16 +67,6 @@ - - - - - - - @@ -149,6 +139,17 @@ + + + + + + + + Date: Mon, 12 Sep 2011 22:25:30 +0800 Subject: Fix b/4643148: Make PhotoEditor integrated into Gallery. 1. Move PhotoEditor code/resources into Gallery for single apk. 2. Change PhotoEditor package to com.android.gallery3d.photoeditor. 3. Rename PhotoEditor resources to avoid mess up Gallery resources. 4. Move Doodle effect from fix-effects to color-effects. 5. Update PhotoEditor bottom action-bar background. Change-Id: I1a2f7d27d89a14fe6a0435575b993ed8b75e6bf4 --- AndroidManifest.xml | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'AndroidManifest.xml') diff --git a/AndroidManifest.xml b/AndroidManifest.xml index a5a64219d..5beb3bfbf 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -192,6 +192,17 @@ + + + + + + + Date: Tue, 13 Sep 2011 10:45:22 +0800 Subject: Change theme for GallerySettings. fix: 5290466 Change-Id: Ib6051f6f8e83d077df029b938b77d3619a4653ed --- AndroidManifest.xml | 1 + 1 file changed, 1 insertion(+) (limited to 'AndroidManifest.xml') diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 5beb3bfbf..cda1d7037 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -217,6 +217,7 @@ Date: Tue, 27 Sep 2011 12:36:41 +0800 Subject: Fix 5369640: Only accept content://media URI for photo editor. Change-Id: Ie68e9cfb8ef8d181ac7e23abd4b0caa6ded20938 --- AndroidManifest.xml | 2 ++ 1 file changed, 2 insertions(+) (limited to 'AndroidManifest.xml') diff --git a/AndroidManifest.xml b/AndroidManifest.xml index cda1d7037..ab12d9b27 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -199,6 +199,8 @@ android:hardwareAccelerated="true"> + + -- cgit v1.2.3 From fef5b9860f0a88fc673af2187938956ebd0ade75 Mon Sep 17 00:00:00 2001 From: Yuli Huang Date: Wed, 28 Sep 2011 01:21:15 +0800 Subject: Fix b/5287869 (and b/5369640). Images from some app (MMS) may not have columns that PhotoEditor tries to query, for example: the orientation. Just ignore the absent columns. Change-Id: I1cda4e32241d9be7819453ede225388c7535c18c --- AndroidManifest.xml | 2 -- 1 file changed, 2 deletions(-) (limited to 'AndroidManifest.xml') diff --git a/AndroidManifest.xml b/AndroidManifest.xml index ab12d9b27..cda1d7037 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -199,8 +199,6 @@ android:hardwareAccelerated="true"> - - -- cgit v1.2.3 From 338d029f0391b781bd6d1ee5ac1843fde1808f9a Mon Sep 17 00:00:00 2001 From: Chih-Chung Chang Date: Thu, 29 Sep 2011 13:34:18 +0800 Subject: Fix 5388852: Separate CropImage activity to another process to have more memory. Change-Id: I3bed66e9c61269f94d909508b8a4b3fa6b934976 --- AndroidManifest.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'AndroidManifest.xml') diff --git a/AndroidManifest.xml b/AndroidManifest.xml index cda1d7037..846cae6fa 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -178,7 +178,8 @@ + android:label="@string/crop_label" + android:process=":crop"> -- cgit v1.2.3 From d37ff2eef80634dabd2f37ecfe6993ae56efb2d4 Mon Sep 17 00:00:00 2001 From: Ruei-sung Lin Date: Mon, 19 Sep 2011 14:33:17 +0800 Subject: facelift in gallery Change-Id: I7cb67c3d977d8b23957586bb5ad1dada096ef07b --- AndroidManifest.xml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'AndroidManifest.xml') diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 846cae6fa..11e59abd2 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -204,12 +204,13 @@ + + android:label="@string/slideshow_dream_name" + android:theme="@android:style/Theme.Black.NoTitleBar.Fullscreen" + android:hardwareAccelerated="true"> -- cgit v1.2.3 From 360f1dbe958aef87bd46b20aeab35193b1b51f01 Mon Sep 17 00:00:00 2001 From: Chih-Chung Chang Date: Mon, 24 Oct 2011 16:45:02 +0800 Subject: Fix 5450241: Forget to support https HTTP live urls. Change-Id: Ib8689a87e8cea4350c388e814807b6cef35fd381 --- AndroidManifest.xml | 1 + 1 file changed, 1 insertion(+) (limited to 'AndroidManifest.xml') diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 11e59abd2..b82eab34f 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -60,6 +60,7 @@ + -- cgit v1.2.3 From 4c89478bfcea7a9b9f6ccc45594b472735e04f56 Mon Sep 17 00:00:00 2001 From: Chih-Chung Chang Date: Mon, 31 Oct 2011 11:23:43 +0800 Subject: Fix 5514384: add video/avi as a supported mime type. Change-Id: I197711a1ef0f5b6356573944c3012c6a14905579 --- AndroidManifest.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'AndroidManifest.xml') diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 11e59abd2..798a46ebe 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -52,6 +52,7 @@ + @@ -144,7 +145,7 @@ + android:label="@string/app_name"> -- cgit v1.2.3 From 4b8b92db6c7238c3d9cff3fc0a6bb8315ca2a0ba Mon Sep 17 00:00:00 2001 From: Jeff Brown Date: Mon, 28 Nov 2011 17:23:56 -0800 Subject: Add application launch category. Bug: 5674723 Change-Id: I6e2cbd2f456d93b4a4e05df5f3be5d3fb05385f0 --- AndroidManifest.xml | 2 ++ 1 file changed, 2 insertions(+) (limited to 'AndroidManifest.xml') diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 798a46ebe..c24279cbb 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -72,7 +72,9 @@ android:configChanges="keyboardHidden|orientation|screenSize"> + + -- cgit v1.2.3 From d091538f6949cca1c73213cea0b9fdf28c878046 Mon Sep 17 00:00:00 2001 From: Chih-Chung Chang Date: Wed, 30 Nov 2011 14:32:35 +0800 Subject: Fix 5685925: Handle PACKAGE_CHANGED intent (when a package is enabled/disabled) Change-Id: Ia994264fb2c11fbc971840c8a103bbe9fa6ee7f7 --- AndroidManifest.xml | 1 + 1 file changed, 1 insertion(+) (limited to 'AndroidManifest.xml') diff --git a/AndroidManifest.xml b/AndroidManifest.xml index c24279cbb..187bac9c2 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -252,6 +252,7 @@ + -- cgit v1.2.3 From 89d0753435b0fdd9fdedc1778156a79786731c70 Mon Sep 17 00:00:00 2001 From: Owen Lin Date: Mon, 12 Dec 2011 15:07:28 +0800 Subject: Make sure the backgroud is cleared in MovieActivity. Change-Id: I1a08c2df1a5c26bcb8de0900ec9c593c0f974d3d fix: 5742974 --- AndroidManifest.xml | 1 + 1 file changed, 1 insertion(+) (limited to 'AndroidManifest.xml') diff --git a/AndroidManifest.xml b/AndroidManifest.xml index a4cc2dd33..1477cf39f 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -31,6 +31,7 @@ android:theme="@style/Theme.Gallery"> -- cgit v1.2.3 From 63764789fdef4dfcdb3c0e1a9fa46b5d62312f07 Mon Sep 17 00:00:00 2001 From: Chih-Chung Chang Date: Thu, 8 Mar 2012 20:10:53 +0800 Subject: Merge Camera into Gallery package. Change-Id: If66d4b841eec3d3f5384a561b07c0eeade92597a --- AndroidManifest.xml | 74 +++++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 69 insertions(+), 5 deletions(-) (limited to 'AndroidManifest.xml') diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 1477cf39f..2f2436d0c 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1,26 +1,31 @@ - + + + + + - + + android:theme="@style/Theme.Gallery" + android:hardwareAccelerated="true"> + + android:theme="@android:style/Theme.Holo.Dialog"/> + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -258,6 +317,11 @@ + + + + + Date: Mon, 12 Mar 2012 16:04:59 +0800 Subject: Add DisableCameraReceiver to disable camera activities if there is no camera. Change-Id: I84061e05c5eec793bf528df1c43d931d22d91d35 --- AndroidManifest.xml | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'AndroidManifest.xml') diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 2f2436d0c..24b3c3b81 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -18,6 +18,7 @@ + @@ -322,6 +323,11 @@ + + + + + Date: Tue, 13 Mar 2012 12:28:02 +0800 Subject: Set task affinity for Camera activities. Bug: 6156475 Change-Id: Idd1be6941242fdfc7f46c706c4a1948acf85d2be --- AndroidManifest.xml | 3 +++ 1 file changed, 3 insertions(+) (limited to 'AndroidManifest.xml') diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 24b3c3b81..04453c926 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -251,6 +251,7 @@ android:theme="@android:style/Theme.Holo.Dialog"/> Date: Thu, 15 Mar 2012 14:46:53 +0800 Subject: Change panorama java package name. bug:5954391 Make camera, camcorder, panorama activities share the same java package. Change-Id: I5b72e94d5fa335a4089e3700e4cc3b5af3f882f6 --- AndroidManifest.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'AndroidManifest.xml') diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 04453c926..f51a685b7 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -295,7 +295,7 @@ turn on the screen, and enter the camera from the lock screen. They can switch to panorama from there. Use singleTask so there will be only one panorama activity. --> - Date: Mon, 19 Mar 2012 15:42:27 +0800 Subject: Remove singleTask mode of panorama. Camera, VideoCamera, PanoramaActivity will be combined to reduce the latency. singleTask should be removed to achieve that. bug:5954389 Change-Id: Ic79f59baffd24669910d1f05b65865788803b79c --- AndroidManifest.xml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'AndroidManifest.xml') diff --git a/AndroidManifest.xml b/AndroidManifest.xml index f51a685b7..697c483cf 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -291,10 +291,6 @@ - + android:windowSoftInputMode="stateAlwaysHidden|adjustPan"> -- cgit v1.2.3 From 33ef03776b7734717b16f6fc861b831fb1b1dfac Mon Sep 17 00:00:00 2001 From: Martijn Coenen Date: Mon, 26 Mar 2012 18:25:50 -0700 Subject: Support for beaming a picture. Change-Id: I73d69f164b455ffa90a495001190937025a56dc5 --- AndroidManifest.xml | 1 + 1 file changed, 1 insertion(+) (limited to 'AndroidManifest.xml') diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 697c483cf..c907da177 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -16,6 +16,7 @@ + -- cgit v1.2.3 From 680ab6c25a99f96847c18224663551498b16ea63 Mon Sep 17 00:00:00 2001 From: Wu-cheng Li Date: Mon, 30 Apr 2012 17:43:01 +0800 Subject: Use gallery icon for action bar app icon in camera. bug:6410923 Change-Id: Ie5b7c5a6b852ed59b61ee0cc4e462dee991167b8 --- AndroidManifest.xml | 1 + 1 file changed, 1 insertion(+) (limited to 'AndroidManifest.xml') diff --git a/AndroidManifest.xml b/AndroidManifest.xml index c907da177..86d2c9ba9 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -36,6 +36,7 @@ Date: Fri, 4 May 2012 15:26:02 +0800 Subject: Use activity-alias to disable camera icon dynamically. Bug: 6438794 Change-Id: Ie2184979f95187eac2411f07b8caee2cad4c4add --- AndroidManifest.xml | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) (limited to 'AndroidManifest.xml') diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 86d2c9ba9..3b4627f99 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -261,11 +261,6 @@ android:clearTaskOnLaunch="true" android:screenOrientation="behind" android:windowSoftInputMode="stateAlwaysHidden|adjustPan"> - - - - - @@ -275,6 +270,18 @@ + + + + + + + + + Date: Mon, 7 May 2012 18:13:29 +0800 Subject: Add 'process' attribute for PhotoEditor. PhotoEditor, similar to CropImage, demands much memory and should run in another process to avoid OOM because of too fragmented memory. bug:6318340 Change-Id: Ic5a71959435f66b8b7bc9b1c80baf8a70ccfecaf --- AndroidManifest.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'AndroidManifest.xml') diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 3b4627f99..7d97ce92f 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -212,7 +212,8 @@ android:label="@string/photoeditor_name" android:theme="@android:style/Theme.Holo.NoActionBar.Fullscreen" android:configChanges="keyboardHidden|orientation|screenSize" - android:hardwareAccelerated="true"> + android:hardwareAccelerated="true" + android:process=":edit"> -- cgit v1.2.3 From b1e38ecd7a9dd67fd34c5fd481e751c40909ba26 Mon Sep 17 00:00:00 2001 From: Wu-cheng Li Date: Fri, 11 May 2012 20:25:22 +0800 Subject: Remove behind screenOrientation from camera activities. Camera has both landscape and portrait layouts. Screen orientation will be set in onCreate. "behind" is not needed anymore. bug:6480864 Change-Id: I6fe3bbe85addf30bae0d037fdddd0ee8569238de --- AndroidManifest.xml | 3 --- 1 file changed, 3 deletions(-) (limited to 'AndroidManifest.xml') diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 7d97ce92f..d60ba3f9c 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -260,7 +260,6 @@ android:icon="@mipmap/ic_launcher_camera" android:configChanges="orientation|screenSize|keyboardHidden" android:clearTaskOnLaunch="true" - android:screenOrientation="behind" android:windowSoftInputMode="stateAlwaysHidden|adjustPan"> @@ -290,7 +289,6 @@ android:configChanges="orientation|screenSize|keyboardHidden" android:icon="@mipmap/ic_launcher_video_camera" android:clearTaskOnLaunch="true" - android:screenOrientation="behind" android:windowSoftInputMode="stateAlwaysHidden|adjustPan"> @@ -307,7 +305,6 @@ android:theme="@style/ThemeCamera" android:configChanges="orientation|screenSize|keyboardHidden" android:clearTaskOnLaunch="true" - android:screenOrientation="behind" android:windowSoftInputMode="stateAlwaysHidden|adjustPan"> Date: Wed, 16 May 2012 13:52:02 -0700 Subject: Remove the black layer in MovieActivity. bug:6491674 Change-Id: I45323fde110b05eda2a342c8f0a85a3ba219d1da --- AndroidManifest.xml | 1 - 1 file changed, 1 deletion(-) (limited to 'AndroidManifest.xml') diff --git a/AndroidManifest.xml b/AndroidManifest.xml index d60ba3f9c..3212f5c6d 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -41,7 +41,6 @@ -- cgit v1.2.3 From 90fff68ef711006c42f7658bcd0cc2cddcd16fed Mon Sep 17 00:00:00 2001 From: Chih-Chung Chang Date: Thu, 31 May 2012 13:34:15 -0700 Subject: Use "Gallery" instead of "Photo Studio" as the label for photo editor. Bug: 6589966 Change-Id: I0760fa6864da5c398e157f386295dea372f0b33e --- AndroidManifest.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'AndroidManifest.xml') diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 3212f5c6d..2a69ce1e3 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -208,7 +208,7 @@ Date: Wed, 27 Jun 2012 18:25:47 +0800 Subject: Replace BroadcastReceiver.goAsync() with IntentService to make Gallery run on older API. Change-Id: I30dacb38eb4e70ed3f89135544d6c514d0379add --- AndroidManifest.xml | 1 + 1 file changed, 1 insertion(+) (limited to 'AndroidManifest.xml') diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 2a69ce1e3..5fc501506 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -322,6 +322,7 @@ + -- cgit v1.2.3 From f8e36b36cecf6c7330041356425756dd8d76e949 Mon Sep 17 00:00:00 2001 From: Wu-cheng Li Date: Fri, 29 Jun 2012 18:21:15 +0800 Subject: Make gallery/camera build in JB API level. Bug:4965992 Change-Id: I91e56aacb5447c811aafce756292ab5ee0636cee --- AndroidManifest.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'AndroidManifest.xml') diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 5fc501506..c7a693b43 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -7,7 +7,7 @@ - + -- cgit v1.2.3 From 7ca90116a6f7c81f2a20ff8cb8968d41321acafd Mon Sep 17 00:00:00 2001 From: Wu-cheng Li Date: Thu, 19 Jul 2012 17:31:31 +0800 Subject: Change minSdkVersion to 13. bug:6706723 Change-Id: I3bb7cfa173f6fdd2ba9df4bda96ea31349b5bd5c --- AndroidManifest.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'AndroidManifest.xml') diff --git a/AndroidManifest.xml b/AndroidManifest.xml index c7a693b43..57aa797ee 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -7,7 +7,7 @@ - + -- cgit v1.2.3 From a50a00a8dfcc6f62812af2986b0bc855bd7d114f Mon Sep 17 00:00:00 2001 From: Wu-cheng Li Date: Wed, 1 Aug 2012 15:47:08 +0800 Subject: Change minSdkVersion to 11. Change-Id: If1f4ebb2850e80c965be4e664a67eb8023376926 --- AndroidManifest.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'AndroidManifest.xml') diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 57aa797ee..09056cf3d 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -7,7 +7,7 @@ - + -- cgit v1.2.3 From e8e80ba0801b78593ff5849d5352f99664dbce5d Mon Sep 17 00:00:00 2001 From: Nick Kralevich Date: Fri, 3 Aug 2012 15:50:39 -0700 Subject: Explicitly export content providers In a future version of Android, the default value for will change from true to false. Explicitly set android:exported="true" Bug: 3306452 Change-Id: Ic5d3152988ed6a576501830338ec324f056921c4 --- AndroidManifest.xml | 1 + 1 file changed, 1 insertion(+) (limited to 'AndroidManifest.xml') diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 09056cf3d..2b89dca7f 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -240,6 +240,7 @@ Date: Mon, 6 Aug 2012 17:55:30 +0800 Subject: Do not show photo editor before api level 14. bug:6927717 Change-Id: Iab0fddaa169e03b65dd0a987ee8b5c892f971000 --- AndroidManifest.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'AndroidManifest.xml') diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 2b89dca7f..612b90ec7 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -212,7 +212,8 @@ android:theme="@android:style/Theme.Holo.NoActionBar.Fullscreen" android:configChanges="keyboardHidden|orientation|screenSize" android:hardwareAccelerated="true" - android:process=":edit"> + android:process=":edit" + android:enabled="false"> -- cgit v1.2.3 From 788d039b2fe8724916e228c86fbd73bd69a30797 Mon Sep 17 00:00:00 2001 From: Wu-cheng Li Date: Wed, 8 Aug 2012 17:19:51 +0800 Subject: Change minSdkVersion to 10. bug:6927809 Change-Id: I6dcea54d3204bca71975a2600ee704a7161bf0bc --- AndroidManifest.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'AndroidManifest.xml') diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 612b90ec7..2e87baee0 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -7,7 +7,7 @@ - + -- cgit v1.2.3 From ceb25e968ae6c7360de52c477816995ee3edc340 Mon Sep 17 00:00:00 2001 From: Wu-cheng Li Date: Tue, 14 Aug 2012 16:21:00 +0800 Subject: Rename ThemeCamera to Theme.Camera to be consistent. bug:6982707 Change-Id: Ic82f542ee8aafdf6c49344887459e75303ca5df8 --- AndroidManifest.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'AndroidManifest.xml') diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 2e87baee0..2ad38c4ce 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -257,7 +257,7 @@ -- cgit v1.2.3 From ab15e830ee7b0bf81d979de57f947c334e9edb14 Mon Sep 17 00:00:00 2001 From: Ahbong Chang Date: Tue, 21 Aug 2012 14:06:51 +0800 Subject: Do not use Theme.Holo and Theme.Holo.Dialog on gingerbread. Bug: 6982707 Change-Id: I84726bcd6cefcc3bd0f313306163a3d80d9cdade --- AndroidManifest.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'AndroidManifest.xml') diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 2ad38c4ce..2ef8086c2 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -235,7 +235,7 @@ + android:theme="@style/Theme.Gallery.Dialog"/> Date: Sun, 26 Aug 2012 23:53:13 +0800 Subject: Register STILL_IMAGE_CAMERA_SECURE intent in the manifest. bug:7053266 Change-Id: I6468a82f5da5afb98316d52b31117f1cc4f82fb9 --- AndroidManifest.xml | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'AndroidManifest.xml') diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 2ef8086c2..b48af2890 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -270,6 +270,10 @@ + + + + Date: Mon, 10 Sep 2012 15:14:56 -0700 Subject: Enable new camera UI Bug: 7139361 Leave both icons in launcher for comparisons Change-Id: I9ecf0af5f27f5fc3e8be092a54188238d51b281e --- AndroidManifest.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'AndroidManifest.xml') diff --git a/AndroidManifest.xml b/AndroidManifest.xml index b48af2890..3a755ccb5 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -287,6 +287,21 @@ + + + + + + + + Date: Mon, 10 Sep 2012 18:28:15 +0800 Subject: Add attribution of icons. Change-Id: I5c7a5580ec4bd6313a3f536f0b9e3927d8ab624e --- AndroidManifest.xml | 3 +++ 1 file changed, 3 insertions(+) (limited to 'AndroidManifest.xml') diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 3a755ccb5..778830b65 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -33,6 +33,7 @@ android:normalScreens="true" android:largeScreens="true" android:anyDensity="true" /> + + + Date: Fri, 24 Aug 2012 14:50:37 -0700 Subject: Add the UI elements for video trim activity. 1. Refactored the classes to support both the video play and trim. Now the common code for controller overlay is in CommonControllerOverlay, which is basically the same as the original MovieControllerOverlay without animation. Because in trimming, we don't want to hide all the controller. The specific animations are implemented in the sub-classes which are TrimControllerOverlay and MovieControllerOverlay. At the same time, TrimTimeBar extended TimeBar to support the extra trimming start scrubber and end scrubber. The interface between the timebar and the controllerOverlay are kept almost the same way, except adding the trimming info when necessary. With all these, the activity of TrimVideo now relied on the TrimTimeBar and TrimControllerOverlay. Similarily, the MovieActivity relied on the TimeBar and MovieControllerOverlay. 2. Hook the TrimVideo activity with the trim menu. Note that the icons are temporary for now, still need UX input on that. bug:7093055 Change-Id: Ib9bfbc090106744a569fce4c451ddffc0a2c699b --- AndroidManifest.xml | 3 +++ 1 file changed, 3 insertions(+) (limited to 'AndroidManifest.xml') diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 778830b65..f29240a8a 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -208,6 +208,9 @@ + + Date: Fri, 14 Sep 2012 00:10:41 -0700 Subject: Update AndroidManifest.xml Handle launcher, camera, and video camera intents using new CameraActivity. Continue to handle image and video capture intents using old Camera and VideoCamera activities. Bug: 7167758 Change-Id: Idfddedf04c9664a368f745ebf3f5b44c3d584207 --- AndroidManifest.xml | 36 ++++++++++++++++-------------------- 1 file changed, 16 insertions(+), 20 deletions(-) (limited to 'AndroidManifest.xml') diff --git a/AndroidManifest.xml b/AndroidManifest.xml index f29240a8a..4a727b277 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -271,6 +271,17 @@ + + + + @@ -279,13 +290,17 @@ + + + + + android:targetActivity="com.android.camera.CameraActivity" > @@ -293,21 +308,6 @@ - - - - - - - - - - - - -- cgit v1.2.3 From fd9924947260eb2851843ef1e91b47e10eae1337 Mon Sep 17 00:00:00 2001 From: Mangesh Ghiware Date: Fri, 14 Sep 2012 12:17:54 -0700 Subject: Handle image capture intent using new camera UI. Bug: 7166362 Change-Id: I253230342803c12d25025378ef80ba3ef96a1233 --- AndroidManifest.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'AndroidManifest.xml') diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 4a727b277..cc992155c 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -267,10 +267,6 @@ android:configChanges="orientation|screenSize|keyboardHidden" android:clearTaskOnLaunch="true" android:windowSoftInputMode="stateAlwaysHidden|adjustPan"> - - - - @@ -282,6 +278,10 @@ android:configChanges="orientation|screenSize|keyboardHidden" android:clearTaskOnLaunch="true" android:windowSoftInputMode="stateAlwaysHidden|adjustPan"> + + + + -- cgit v1.2.3 From c6ece8cc3c941803a77b3c58fa5e4ec7e0a6a744 Mon Sep 17 00:00:00 2001 From: Mangesh Ghiware Date: Fri, 14 Sep 2012 12:40:03 -0700 Subject: Add launcher icon for old camera UI Needed for testing HAL Change-Id: I528fe4564d1e2a2b9fe0e2a5be711da3c98a4a45 --- AndroidManifest.xml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'AndroidManifest.xml') diff --git a/AndroidManifest.xml b/AndroidManifest.xml index cc992155c..95e2741ef 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -263,10 +263,15 @@ android:taskAffinity="com.android.camera" android:label="@string/camera_label" android:theme="@style/Theme.Camera" - android:icon="@mipmap/ic_launcher_camera" + android:icon="@drawable/ic_switch_camera_holo_light" android:configChanges="orientation|screenSize|keyboardHidden" android:clearTaskOnLaunch="true" android:windowSoftInputMode="stateAlwaysHidden|adjustPan"> + + + + + @@ -274,7 +279,7 @@ android:taskAffinity="com.google.android.camera" android:label="@string/camera_label" android:theme="@style/Theme.Camera" - android:icon="@drawable/ic_switch_camera_holo_light" + android:icon="@mipmap/ic_launcher_camera" android:configChanges="orientation|screenSize|keyboardHidden" android:clearTaskOnLaunch="true" android:windowSoftInputMode="stateAlwaysHidden|adjustPan"> -- cgit v1.2.3 From 1a875b21515baa2f105d9970a3e1d615f771d538 Mon Sep 17 00:00:00 2001 From: Doris Liu Date: Fri, 14 Sep 2012 18:43:41 -0700 Subject: Update AndroidManifest for video caputure intent in the new camera Bug: 7174617 Change-Id: Ib749615fbcb4bc8c882138d29ed234441ca4103e --- AndroidManifest.xml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'AndroidManifest.xml') diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 95e2741ef..ab35ad49f 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -274,7 +274,6 @@ - + + + + @@ -321,10 +324,6 @@ android:icon="@mipmap/ic_launcher_video_camera" android:clearTaskOnLaunch="true" android:windowSoftInputMode="stateAlwaysHidden|adjustPan"> - - - - Date: Sun, 16 Sep 2012 17:16:25 -0700 Subject: Fix manifest to launch correct activity Bug: 7175368 Change task affinity to launch correct camera activity Change-Id: I6bd22a8b64317a8e37f4c13ebf374465096662e7 --- AndroidManifest.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'AndroidManifest.xml') diff --git a/AndroidManifest.xml b/AndroidManifest.xml index ab35ad49f..b2c6c72ff 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -260,7 +260,7 @@ Date: Mon, 17 Sep 2012 17:32:59 +0800 Subject: Use a different task affinity for secure camera. This makes sure non-secure camera activity is not started in secure lock screen. Also add excludeFromRecents for secure camera. bug:7148152 Change-Id: I18a10ccf95f22563aad59d5d936470af47596b91 --- AndroidManifest.xml | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) (limited to 'AndroidManifest.xml') diff --git a/AndroidManifest.xml b/AndroidManifest.xml index b2c6c72ff..f9035fa5d 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -291,15 +291,26 @@ - + - + + + + - + -- cgit v1.2.3 From 5dbbfcd44ff6360cd46ec636b006c52b5ebd9293 Mon Sep 17 00:00:00 2001 From: Michael Kolb Date: Mon, 24 Sep 2012 19:42:34 -0700 Subject: Remove old camera activity from launcher Bug: 7201108 The old activity can still be started via: adb shell am start -n com.google.android.gallery3d/com.android.camera.Camera Change-Id: I57094903375a1ab26c43b7f6870de073d58345fa --- AndroidManifest.xml | 6 ------ 1 file changed, 6 deletions(-) (limited to 'AndroidManifest.xml') diff --git a/AndroidManifest.xml b/AndroidManifest.xml index f9035fa5d..bc0270b72 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -263,15 +263,9 @@ android:taskAffinity="com.android.camera.Camera" android:label="@string/camera_label" android:theme="@style/Theme.Camera" - android:icon="@drawable/ic_switch_camera_holo_light" android:configChanges="orientation|screenSize|keyboardHidden" android:clearTaskOnLaunch="true" android:windowSoftInputMode="stateAlwaysHidden|adjustPan"> - - - - - Date: Tue, 25 Sep 2012 11:20:27 +0800 Subject: Register secure image capture intent. bug:7225688 Change-Id: I22f0ee81a921b3ec811444c7d554f2400e6a5485 --- AndroidManifest.xml | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'AndroidManifest.xml') diff --git a/AndroidManifest.xml b/AndroidManifest.xml index bc0270b72..622707c99 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -307,6 +307,10 @@ + + + + -- cgit v1.2.3 From 9c3912a2dcea9131a63ddcb10e1df2a1f3ae8269 Mon Sep 17 00:00:00 2001 From: Wu-cheng Li Date: Wed, 26 Sep 2012 13:46:21 +0800 Subject: Remove icon attributon. bug:6855540 Change-Id: Ia2ab04523797da907aa73a013b6146ff929838b9 --- AndroidManifest.xml | 3 --- 1 file changed, 3 deletions(-) (limited to 'AndroidManifest.xml') diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 622707c99..884f27bd9 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -33,7 +33,6 @@ android:normalScreens="true" android:largeScreens="true" android:anyDensity="true" /> - - - Date: Tue, 25 Sep 2012 14:27:56 -0700 Subject: Initial import of the new image editor bug:7165910 Change-Id: I756d6594f5bddd233772c979410362ca22e232a3 --- AndroidManifest.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'AndroidManifest.xml') diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 884f27bd9..cf9f46134 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -375,5 +375,20 @@ + + + + + + + + + + + + -- cgit v1.2.3 From f37e1e9a9ce5aade5ccb1ad24b754bde29327716 Mon Sep 17 00:00:00 2001 From: nicolasroard Date: Thu, 27 Sep 2012 12:20:11 -0700 Subject: Add the intent filter to start the new editor Set Gallery to identify as needing a largeHeap bug:7246621 Change-Id: I2d5bad8ea13353e9eb95ce8a7bc27e858c4c1d94 --- AndroidManifest.xml | 35 +++++++++++++++++++---------------- 1 file changed, 19 insertions(+), 16 deletions(-) (limited to 'AndroidManifest.xml') diff --git a/AndroidManifest.xml b/AndroidManifest.xml index cf9f46134..9c857b6a3 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -37,7 +37,8 @@ android:name="com.android.gallery3d.app.GalleryAppImpl" android:theme="@style/Theme.Gallery" android:logo="@mipmap/ic_launcher_gallery" - android:hardwareAccelerated="true"> + android:hardwareAccelerated="true" + android:largeHeap="true"> + + + + + + + + + + + + + + @@ -375,20 +393,5 @@ - - - - - - - - - - - - -- cgit v1.2.3 From 9594c8d3e0dd0d6157710ceae1d1deea8e566db4 Mon Sep 17 00:00:00 2001 From: nicolasroard Date: Thu, 27 Sep 2012 20:54:48 -0700 Subject: Use an actionbar - move the "show original" button to the bottom left - move the history button to the overflow menu for now - add a reset item in the overflow menu. bug:7234317 bug:7233975 bug:7233986 Change-Id: Icc1d03d1e1ce18f38b1169b466be62645424bc7e --- AndroidManifest.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'AndroidManifest.xml') diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 9c857b6a3..3a3ac92de 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -228,7 +228,7 @@ + android:theme="@android:style/Theme.Holo" > -- cgit v1.2.3 From 0ee91a2b74808fa3f51d370daaddf99f588d72ef Mon Sep 17 00:00:00 2001 From: nicolasroard Date: Mon, 1 Oct 2012 00:25:11 -0700 Subject: Implements image sharing bug:7233986 Change-Id: I8feb94d77facf8dbb8da5fab89b49ed7c224116e --- AndroidManifest.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'AndroidManifest.xml') diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 3a3ac92de..166d75e72 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -225,6 +225,18 @@ + + + + + Date: Mon, 8 Oct 2012 15:00:39 -0700 Subject: Fix the filtershow activity to portrait bug:7279214 Stop-gap for factory rom. Change-Id: I6073d148dff1016577244cf26c7048ca00d58a54 --- AndroidManifest.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'AndroidManifest.xml') diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 166d75e72..ef16d66ee 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -240,7 +240,8 @@ + android:theme="@android:style/Theme.Holo" + android:screenOrientation="portrait"> -- cgit v1.2.3 From 0eaafe8a5d9c7bcc19a61fdc90a4c5635a56f4da Mon Sep 17 00:00:00 2001 From: Wu-cheng Li Date: Tue, 9 Oct 2012 19:46:53 +0800 Subject: Change versionCode to 40001 and versionName to 1.1.40001. bug:7310127 Change-Id: Id2648c3eab0b6e3a64c6013530551af40a1cdced --- AndroidManifest.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'AndroidManifest.xml') diff --git a/AndroidManifest.xml b/AndroidManifest.xml index ef16d66ee..31bcd49e9 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1,7 +1,7 @@ - -- cgit v1.2.3 From fea98f55311b39977969dc071296bacd48813e0b Mon Sep 17 00:00:00 2001 From: Bobby Georgescu Date: Wed, 10 Oct 2012 15:57:17 -0700 Subject: Change FilterShow theme and extra remove gray line Bug: 7326326 Change-Id: Ie2286e36da77fb22907f21d084177268f919d10e --- AndroidManifest.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'AndroidManifest.xml') diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 31bcd49e9..eda881508 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -240,7 +240,7 @@ -- cgit v1.2.3 From 09473aa0a53d451c791ca402a343e49cce2c31c5 Mon Sep 17 00:00:00 2001 From: Chris Craik Date: Thu, 11 Oct 2012 14:06:45 -0700 Subject: Alias com.android.camera.Camera to point at CameraActivity bug:7291128 Change-Id: Id6649024516ba79fa042284db95d29a37552eef4 --- AndroidManifest.xml | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) (limited to 'AndroidManifest.xml') diff --git a/AndroidManifest.xml b/AndroidManifest.xml index eda881508..b96042fa2 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -288,15 +288,6 @@ android:configChanges="keyboardHidden|orientation|screenSize" android:theme="@style/Theme.Gallery.Dialog"/> - - - + + + + + + + Date: Sun, 14 Oct 2012 21:28:31 +0800 Subject: Remove old camera classes. bug:7201108 Change-Id: I539d02c411c654238d7e5e0c34e9ec3e6e6d4d90 --- AndroidManifest.xml | 17 ----------------- 1 file changed, 17 deletions(-) (limited to 'AndroidManifest.xml') diff --git a/AndroidManifest.xml b/AndroidManifest.xml index b96042fa2..30c079709 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -354,23 +354,6 @@ - - - - -- cgit v1.2.3 From ca181a68a30ad830d55eb8886f62a323c64e1ba3 Mon Sep 17 00:00:00 2001 From: Owen Lin Date: Tue, 16 Oct 2012 10:22:54 +0800 Subject: Add permission to GalleryProvider. bug: 7202384 Change-Id: I1a13ed7e480163c898cf376219953b321290d4d4 --- AndroidManifest.xml | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'AndroidManifest.xml') diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 30c079709..b62fe470f 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -9,6 +9,9 @@ + + @@ -276,6 +279,7 @@ android:syncable="false" android:grantUriPermissions="true" android:exported="true" + android:permission="com.android.gallery3d.permission.GALLERY_PROVIDER" android:authorities="com.android.gallery3d.provider" /> Date: Wed, 17 Oct 2012 00:40:35 -0700 Subject: Added support for crop actions. Changed overflow menu to use new editor. Bug: 7281479 Bug: 7337191 Change-Id: I91055c972666e4c2d605903646b55d8c67ae87f3 --- AndroidManifest.xml | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'AndroidManifest.xml') diff --git a/AndroidManifest.xml b/AndroidManifest.xml index b62fe470f..58c47fb0d 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -255,6 +255,13 @@ + + + + + + + Date: Thu, 18 Oct 2012 16:16:36 -0700 Subject: Handle screen rotation bug:7328773 Change-Id: I3c03c233a5b5a883963c8fd124c760655fd12bc7 --- AndroidManifest.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'AndroidManifest.xml') diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 58c47fb0d..be6408d6b 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -243,8 +243,8 @@ + android:theme="@style/Theme.Gallery" + android:configChanges="keyboardHidden|orientation|screenSize"> -- cgit v1.2.3 From 9baf2fd55613ce3f545da2d341c8e8a36b82ee78 Mon Sep 17 00:00:00 2001 From: Scott Main Date: Thu, 18 Oct 2012 11:59:47 -0700 Subject: DO NOT MERGE cherrypick from Change-Id: I51c6a730e8663586153750a1cda6ea65aad592e8 remove old fashioned Dream, no longer supported Change-Id: I51c6a730e8663586153750a1cda6ea65aad592e8 Conflicts: AndroidManifest.xml --- AndroidManifest.xml | 11 ----------- 1 file changed, 11 deletions(-) (limited to 'AndroidManifest.xml') diff --git a/AndroidManifest.xml b/AndroidManifest.xml index be6408d6b..88981d175 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -267,17 +267,6 @@ - - - - - - - - -- cgit v1.2.3 From 2bb9b8cfd2605d913d277a41b37e22696a424193 Mon Sep 17 00:00:00 2001 From: Mangesh Ghiware Date: Mon, 22 Oct 2012 15:47:22 -0700 Subject: Add activity-alias for video camera Bug: 7390076 Change-Id: I4827f1b5412476075f89d714fe3f1bbe2576c357 --- AndroidManifest.xml | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) (limited to 'AndroidManifest.xml') diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 88981d175..2ec746b00 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -304,14 +304,6 @@ - - - - - - - - + + + + + + + + + + + -- cgit v1.2.3 From 50116ffb044f6566ef5e36aaa8e41dcb7522076e Mon Sep 17 00:00:00 2001 From: nicolasroard Date: Wed, 24 Oct 2012 17:55:51 -0700 Subject: Remove the old photo editor bug:7407573 Change-Id: Ifac6d3d7cec02c9cb8ef8bbd390f0512e6cdb66c (cherry picked from commit a96c8e9c9aac509ba074b340c66e31e20ec05823) --- AndroidManifest.xml | 13 ------------- 1 file changed, 13 deletions(-) (limited to 'AndroidManifest.xml') diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 2ec746b00..2d8ade784 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -214,19 +214,6 @@ - - - - - - - -- cgit v1.2.3 From 5aa454b3bde8b2162eb2b91400973113e2c63070 Mon Sep 17 00:00:00 2001 From: Ruben Brunk Date: Thu, 25 Oct 2012 15:53:42 -0700 Subject: Fixed crop intent. Bug: 7415140 Bug: 7403813 Change-Id: I545162544f845d210d21185cddaca09b219fb091 --- AndroidManifest.xml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'AndroidManifest.xml') diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 2d8ade784..b147aa1c1 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -243,7 +243,12 @@ - + + + + + + -- cgit v1.2.3 From 07b70a524d4188120153eee5da31b079ecb135ed Mon Sep 17 00:00:00 2001 From: Mangesh Ghiware Date: Wed, 10 Oct 2012 15:56:29 -0700 Subject: Handle 360 panorama specific MIME type. Bug: 7407448 Change-Id: I939a061e2100c2cdc17279982de98f1d446d8aef --- AndroidManifest.xml | 1 + 1 file changed, 1 insertion(+) (limited to 'AndroidManifest.xml') diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 2d8ade784..24a03c9bb 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -125,6 +125,7 @@ + -- cgit v1.2.3 From f85d974363a40b8ce588ba3fe902eec38de603d9 Mon Sep 17 00:00:00 2001 From: John Reck Date: Wed, 24 Oct 2012 11:11:51 -0700 Subject: Add proxy launcher Bug: 7394901 Change-Id: I667a6e6fbd11d4c02dc536067bb6f3813775db9c --- AndroidManifest.xml | 3 +++ 1 file changed, 3 insertions(+) (limited to 'AndroidManifest.xml') diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 7a7e04466..986f56de5 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -389,5 +389,8 @@ + + -- cgit v1.2.3 From 589381bffb30f4f4a84ebe59b9bc3a140153831c Mon Sep 17 00:00:00 2001 From: Mangesh Ghiware Date: Tue, 30 Oct 2012 15:41:00 -0700 Subject: Change protection level for GALLERY_PROVIDER to signatureOrSystem Bug: 7433498 Change-Id: I1c5f43ab8b5f5974356b0a50c2d8b643591991b5 --- AndroidManifest.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'AndroidManifest.xml') diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 986f56de5..4ccb22435 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -10,7 +10,7 @@ + android:protectionLevel="signatureOrSystem" /> -- cgit v1.2.3 From 471d898606bc15878b4d1708236f60157bab08df Mon Sep 17 00:00:00 2001 From: Wu-cheng Li Date: Wed, 31 Oct 2012 11:12:05 +0800 Subject: Add keyguard camera widget meta-data to gallery manifest. bug:7445471 Change-Id: I420ec1c44e32332d6e7f6023471f34f726fed264 --- AndroidManifest.xml | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'AndroidManifest.xml') diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 4ccb22435..b8b4461b0 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -297,6 +297,8 @@ + + Date: Thu, 1 Nov 2012 11:49:43 +0800 Subject: Backup the preferences to the backup service. bug:7259104 Change-Id: Id99f8782f0fb5b93b89930d51d38e7d1d98af11d --- AndroidManifest.xml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'AndroidManifest.xml') diff --git a/AndroidManifest.xml b/AndroidManifest.xml index b8b4461b0..e465479a6 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -41,8 +41,12 @@ android:theme="@style/Theme.Gallery" android:logo="@mipmap/ic_launcher_gallery" android:hardwareAccelerated="true" - android:largeHeap="true"> + android:largeHeap="true" + android:backupAgent="com.android.camera.CameraBackupAgent" + android:restoreAnyVersion="true"> + -- cgit v1.2.3 From 9cd730836cb40d66d98db893eca28e94b14500cd Mon Sep 17 00:00:00 2001 From: nicolasroard Date: Wed, 28 Nov 2012 19:11:42 -0800 Subject: Fix overdraw in FilterShow activity bug:7634701 Change-Id: I2da3e3fdb1ef853fa1a0340a1697e5a013ee87f2 --- AndroidManifest.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'AndroidManifest.xml') diff --git a/AndroidManifest.xml b/AndroidManifest.xml index b8b4461b0..0ef4fba34 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -231,7 +231,7 @@ -- cgit v1.2.3 From d10468b65396dd1fa4f20006fa8cea1221cc613c Mon Sep 17 00:00:00 2001 From: Your Name Date: Mon, 3 Dec 2012 14:14:19 -0800 Subject: Change themes Bug: 7587841 Change-Id: Ie283c23015ae94ba6eeb69ba55a0523899718d4e --- AndroidManifest.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'AndroidManifest.xml') diff --git a/AndroidManifest.xml b/AndroidManifest.xml index b8b4461b0..43e4e173a 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -394,7 +394,7 @@ + android:theme="@style/Theme.ProxyLauncher"> -- cgit v1.2.3 From a2d0d34a90543ee19ea295e72c112fde18fb3828 Mon Sep 17 00:00:00 2001 From: Bobby Georgescu Date: Mon, 3 Dec 2012 13:56:00 -0800 Subject: Move MenuExecutor operations into Service Bug: 6680729 Change-Id: I538bb0a8783f7c1ff467ba8d8eb0deefdc0b6ea2 --- AndroidManifest.xml | 1 + 1 file changed, 1 insertion(+) (limited to 'AndroidManifest.xml') diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 25fe9dd9b..1234bfcc9 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -400,5 +400,6 @@ + -- cgit v1.2.3 From 795776f67fe5bca902b09c01edec630879263341 Mon Sep 17 00:00:00 2001 From: Ruben Brunk Date: Wed, 5 Dec 2012 22:07:12 -0800 Subject: Removed old crop. Bug: 7441237 Change-Id: I29801f798a1d1ad3af81a82950edbb8a72ccae82 --- AndroidManifest.xml | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) (limited to 'AndroidManifest.xml') diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 644a409a1..f2dac1256 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -199,23 +199,6 @@ - - - - - - - - - - - - - - @@ -248,7 +231,7 @@ - + -- cgit v1.2.3 From d3aac52ffb88ced53413d5eef29c641dd6982267 Mon Sep 17 00:00:00 2001 From: Bobby Georgescu Date: Wed, 26 Dec 2012 00:52:28 -0800 Subject: Replace camera importer Change-Id: Icfeb23301bc6c9f8c8b12824bcbb0d8b41852d07 --- AndroidManifest.xml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'AndroidManifest.xml') diff --git a/AndroidManifest.xml b/AndroidManifest.xml index f2dac1256..f5415a00c 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -173,16 +173,18 @@ - - + + + Date: Wed, 16 Jan 2013 15:52:32 -0800 Subject: Add image/webp type to intent filter bug:8012543 Change-Id: I0ebd2941c5508d169855864165e93e2ea1dacf81 --- AndroidManifest.xml | 1 + 1 file changed, 1 insertion(+) (limited to 'AndroidManifest.xml') diff --git a/AndroidManifest.xml b/AndroidManifest.xml index f5415a00c..7034aa967 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -127,6 +127,7 @@ + -- cgit v1.2.3 From ca593b02ab6a3054f625878621ee5117953f7385 Mon Sep 17 00:00:00 2001 From: John Reck Date: Mon, 28 Jan 2013 13:35:56 -0800 Subject: Code drop Change-Id: Ibee7c3a1aed61dbe9d3d62ad7f3d3653994c8ef8 --- AndroidManifest.xml | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'AndroidManifest.xml') diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 7034aa967..360128ceb 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -161,6 +161,9 @@ + @@ -387,5 +390,12 @@ android:theme="@style/Theme.ProxyLauncher"> + + -- cgit v1.2.3 From c099398cfe60422d73281e66de209c4837284c88 Mon Sep 17 00:00:00 2001 From: Angus Kong Date: Tue, 29 Jan 2013 17:43:48 -0800 Subject: Make background media saving a service bug:8091328 Change-Id: If35c1832238e921b6582d8642fdbaa4378ea0c48 --- AndroidManifest.xml | 1 + 1 file changed, 1 insertion(+) (limited to 'AndroidManifest.xml') diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 360128ceb..d4972832c 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -390,6 +390,7 @@ android:theme="@style/Theme.ProxyLauncher"> + Date: Tue, 5 Feb 2013 10:44:51 -0800 Subject: Cleanup Move Canvas to com.android.photos.canvas Remove workaround for b/8079561 Change-Id: I14b832d5935eb8704e96e5591c58f33a7cd4de31 --- AndroidManifest.xml | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) (limited to 'AndroidManifest.xml') diff --git a/AndroidManifest.xml b/AndroidManifest.xml index d4972832c..e36f1a4bb 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -161,9 +161,6 @@ - @@ -391,12 +388,29 @@ + + + + + + + + + + -- cgit v1.2.3 From 0c7d07e101909bf5694ff372abbf678e951649b0 Mon Sep 17 00:00:00 2001 From: John Reck Date: Wed, 6 Feb 2013 13:18:47 -0800 Subject: Request GALLERY_PROVIDER permission Bug: 8138594 Change-Id: I39f446f8066cf15a62acf3f16c0faa84bc4b71d7 --- AndroidManifest.xml | 1 + 1 file changed, 1 insertion(+) (limited to 'AndroidManifest.xml') diff --git a/AndroidManifest.xml b/AndroidManifest.xml index e36f1a4bb..4cb308946 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -31,6 +31,7 @@ + Date: Fri, 1 Feb 2013 12:57:14 -0800 Subject: Importer: Full-screen viewing, UI refinement, refactoring Bug: 7990333 Bug: 8151814 Bug: 8037411 This CL adds or changes the following things: - Full-screen image viewing and UI for switching modes - Moved general functionality from MtpThumbnailTileView to MtpImageView to allow for reuse in full-screen image use-case - MtpBitmapCache moved from ui to data package - Orientation now respected when set in image metadata - Miscellaneous UI consistency issues fixed - Miscellaneous instability issues fixed Change-Id: I5f188b763617b693e32fedc03273d711d604922a --- AndroidManifest.xml | 1 + 1 file changed, 1 insertion(+) (limited to 'AndroidManifest.xml') diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 4cb308946..78a6db1a7 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -179,6 +179,7 @@ media from attached MTP devices, like cameras and camera phones --> -- cgit v1.2.3 From 26781cfc12df7ff35fc7eed254057d43a74cb113 Mon Sep 17 00:00:00 2001 From: Angus Kong Date: Fri, 15 Feb 2013 16:09:11 -0800 Subject: Bump up the version number to 1.1.40002 Change-Id: I5911eb3345b7774a6690372999fce3673b551f84 --- AndroidManifest.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'AndroidManifest.xml') diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 78a6db1a7..508aefe9f 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1,7 +1,7 @@ - -- cgit v1.2.3 From 5f30b98d6ac98c6aa863d48f47e9b8e2b77a1820 Mon Sep 17 00:00:00 2001 From: John Reck Date: Fri, 15 Feb 2013 14:32:08 -0800 Subject: Start of photos Change-Id: Id53dd96d8873e0fe6c2685e07cd7bdc0cde7ea75 --- AndroidManifest.xml | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) (limited to 'AndroidManifest.xml') diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 508aefe9f..3cd30cbac 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -88,8 +88,11 @@ - + @@ -164,17 +167,6 @@ - - - - - - - - Date: Wed, 20 Feb 2013 17:01:54 -0800 Subject: Add initial implementation of PhotosProvider. Change-Id: I98694cf54bd0fb549703a7184e1816e9590a05ff --- AndroidManifest.xml | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'AndroidManifest.xml') diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 3cd30cbac..1a6f800f2 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -254,6 +254,11 @@ android:exported="true" android:permission="com.android.gallery3d.permission.GALLERY_PROVIDER" android:authorities="com.android.gallery3d.provider" /> + Date: Tue, 26 Feb 2013 15:19:30 -0800 Subject: Thumbnails for PhotoSetPage Change-Id: I8d62b4ca0d0902ca2a18b087a344d35d17a97fa7 --- AndroidManifest.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'AndroidManifest.xml') diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 3cd30cbac..8145f233a 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -7,7 +7,7 @@ - + -- cgit v1.2.3 From dcf862b0444fff3bb79421380f7a79fe682584fe Mon Sep 17 00:00:00 2001 From: Justin Koh Date: Wed, 27 Feb 2013 15:31:29 -0800 Subject: Updated Gallery2 with Pano. Updated Gallery2 with Pano. Bug: 8263808 Change-Id: Iedaba9dc478fb20480f3b37e9708bc8d67cf6003 --- AndroidManifest.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'AndroidManifest.xml') diff --git a/AndroidManifest.xml b/AndroidManifest.xml index ca62d8aab..303cb91a0 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -405,10 +405,10 @@ android:theme="@style/Theme.ProxyLauncher"> - + -- cgit v1.2.3 From d8732610ff48dc57063559d55ea3c84775e30e41 Mon Sep 17 00:00:00 2001 From: John Reck Date: Wed, 27 Feb 2013 16:48:16 -0800 Subject: Add full screen image view Change-Id: I5b3db9ce4c86788b640a48bafa87cd9e952739d4 --- AndroidManifest.xml | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'AndroidManifest.xml') diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 303cb91a0..c33ab3d82 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -167,6 +167,13 @@ + + + Date: Fri, 1 Mar 2013 18:11:07 -0800 Subject: Bump up the version number to 1.1.40003 Change-Id: I696aae61f9f3c61d810e3bb78e2b804ca2106173 --- AndroidManifest.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'AndroidManifest.xml') diff --git a/AndroidManifest.xml b/AndroidManifest.xml index c33ab3d82..abe76d2d5 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1,7 +1,7 @@ - -- cgit v1.2.3 From f6e687bc30887695374580712092aeb917c84253 Mon Sep 17 00:00:00 2001 From: John Reck Date: Fri, 8 Mar 2013 11:19:27 -0800 Subject: Support clicking on photos to view them Change-Id: I511af0cbe46c833d81cbbd563b9c2b4feec2bffe --- AndroidManifest.xml | 36 +++++++++++++++++++++--------------- 1 file changed, 21 insertions(+), 15 deletions(-) (limited to 'AndroidManifest.xml') diff --git a/AndroidManifest.xml b/AndroidManifest.xml index abe76d2d5..3da58f76c 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -88,7 +88,8 @@ - + + + + + + + + + + + + + + + @@ -151,20 +171,6 @@ - - - - - - - - - - - - - Date: Fri, 8 Mar 2013 13:49:24 -0800 Subject: Bump up the version number to 1.1.40004 Change-Id: If5e430e9877c6b881f33893a544313eff0647ce5 --- AndroidManifest.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'AndroidManifest.xml') diff --git a/AndroidManifest.xml b/AndroidManifest.xml index abe76d2d5..0eb0c30e2 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1,7 +1,7 @@ - -- cgit v1.2.3 From d4caa58d6e08a88d5493ab02b2260bdcf4034c32 Mon Sep 17 00:00:00 2001 From: Justin Koh Date: Tue, 12 Mar 2013 10:49:04 -0700 Subject: Update Pano XML tag and permission. Update Pano XML tag and permission. Bug: 8359058 Change-Id: I92626f03f5c6857951d5f17fb6f811ffbc24e74f --- AndroidManifest.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'AndroidManifest.xml') diff --git a/AndroidManifest.xml b/AndroidManifest.xml index b3c5f5c0b..06ebd8667 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -407,7 +407,7 @@ android:authorities="com.android.gallery3d.provider.CanvasProvider" android:exported="true" android:label="@string/app_name" - android:permission="android.permission.ACCESS_APP_BROWSE_DATA" /> + android:permission="com.google.android.pano.permission.ACCESS_APP_BROWSE_DATA" /> -- cgit v1.2.3 From ad0a874d0383106a412d22138ebec6b51a13d88e Mon Sep 17 00:00:00 2001 From: John Reck Date: Fri, 15 Mar 2013 13:19:30 -0700 Subject: Prepare to switch to panolibs Change-Id: Ie29c0014fcb08105cab1ee6043f66b58e5ac85f8 --- AndroidManifest.xml | 24 ------------------------ 1 file changed, 24 deletions(-) (limited to 'AndroidManifest.xml') diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 06ebd8667..8d28a7cfd 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -400,29 +400,5 @@ - - - - - - - - - - - - -- cgit v1.2.3 From 345e819f618af931e83bbd72882a173187c856af Mon Sep 17 00:00:00 2001 From: Bart Sears Date: Mon, 18 Mar 2013 20:02:47 -0700 Subject: Bump up the version number to 1.1.40005 Change-Id: Ic01aa447fdae6628a84cd9d9561134c32c521df8 --- AndroidManifest.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'AndroidManifest.xml') diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 8d28a7cfd..82654f75e 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1,7 +1,7 @@ - -- cgit v1.2.3 From def3606a1e7ffa20171c473d792af7a0bbec4ea8 Mon Sep 17 00:00:00 2001 From: Bobby Georgescu Date: Mon, 18 Mar 2013 14:56:40 -0700 Subject: Add album viewing to new Gallery Change-Id: I71230541db0b06d41e2d23d51e83f0b3b8e8caf4 --- AndroidManifest.xml | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'AndroidManifest.xml') diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 8d28a7cfd..d379df85d 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -128,6 +128,13 @@ + + -- cgit v1.2.3 From 476576159c2ecbfaca99c696b5b46c56b30f3d19 Mon Sep 17 00:00:00 2001 From: Bart Sears Date: Fri, 22 Mar 2013 14:47:19 -0700 Subject: Bump up the version number to 1.1.40006 Change-Id: Id256fd9a7fdde81ea140b7a58b06f1eb87944b2c --- AndroidManifest.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'AndroidManifest.xml') diff --git a/AndroidManifest.xml b/AndroidManifest.xml index c2f16a9a4..16805d23c 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1,7 +1,7 @@ - -- cgit v1.2.3 From 4f58f87598044f3742d6faaf1ac8ff777c7dcffc Mon Sep 17 00:00:00 2001 From: Bart Sears Date: Thu, 4 Apr 2013 15:07:12 -0700 Subject: Bump up the version number to 1.1.40007 Change-Id: Ia494e2c210f642ec0232394d0cfabaf5e1b8f96a --- AndroidManifest.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'AndroidManifest.xml') diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 16805d23c..30891e186 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1,7 +1,7 @@ - -- cgit v1.2.3 From a7879852cc93cde93c415da59453a3cb2c91c12d Mon Sep 17 00:00:00 2001 From: Bart Sears Date: Fri, 5 Apr 2013 14:55:58 -0700 Subject: Bump up the version number to 1.1.40008 Change-Id: I42dce1bc936b54a4d4f72c2179d2f1d9e27f72d7 --- AndroidManifest.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'AndroidManifest.xml') diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 30891e186..1a7e23758 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1,7 +1,7 @@ - -- cgit v1.2.3 From 5317e54019bc1c88c82333a9e42882623691270f Mon Sep 17 00:00:00 2001 From: Bart Sears Date: Mon, 8 Apr 2013 18:12:07 -0700 Subject: Bump up the version number to 1.1.40009 Change-Id: Ia266e6493a535cd4ae36fda2fa497195b810ebb4 --- AndroidManifest.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'AndroidManifest.xml') diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 1a7e23758..afee9231b 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1,7 +1,7 @@ - -- cgit v1.2.3 From fb0636179335a7786ec2c0edf9889a55596db126 Mon Sep 17 00:00:00 2001 From: Doris Liu Date: Thu, 14 Mar 2013 21:01:35 -0700 Subject: Work in progress - Put preview in TextureView Fixed gesture recognizing and pie menu. Fixed camera picker. Exposure setting got fixed with rebasing. Rebased for new pie menu Fixed camera mode switch listener Ongoing: secure album, aspect ratio for video recording on ICS Change-Id: Iedae80815faf81cb49c791885810c8427034a6d1 --- AndroidManifest.xml | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'AndroidManifest.xml') diff --git a/AndroidManifest.xml b/AndroidManifest.xml index afee9231b..a918af94a 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -290,6 +290,19 @@ android:configChanges="keyboardHidden|orientation|screenSize" android:theme="@style/Theme.Gallery.Dialog"/> + + + + + + + Date: Mon, 8 Apr 2013 10:14:14 -0700 Subject: Remove unneeded READ_SMS permission Bug: 8469283 Change-Id: I0d211705fe1fb86dc0ce85230e82d500f0202291 --- AndroidManifest.xml | 1 - 1 file changed, 1 deletion(-) (limited to 'AndroidManifest.xml') diff --git a/AndroidManifest.xml b/AndroidManifest.xml index a918af94a..f736d7951 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -20,7 +20,6 @@ - -- cgit v1.2.3 From 6fe165b7d28299d5b2f97deb135b233d84eb300f Mon Sep 17 00:00:00 2001 From: Ruben Brunk Date: Thu, 4 Apr 2013 17:20:42 -0700 Subject: Moving crop to a separate activity. Refactoring. Bug: 8526929 Change-Id: I8acf6d46de069dd84c31afea6b4a7ae8e1c2fcce --- AndroidManifest.xml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'AndroidManifest.xml') diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 1a7e23758..171f03650 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -247,7 +247,14 @@ - + + + + -- cgit v1.2.3 From 4772792dbe4a29bd90139eead6a881f47523ede5 Mon Sep 17 00:00:00 2001 From: Bart Sears Date: Fri, 12 Apr 2013 13:48:58 -0700 Subject: Bump up the version number to 1.1.40010 Bug: 8607157 Change-Id: I4c0f4cd481d0989cad2fd9cadbda9f7768b81765 --- AndroidManifest.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'AndroidManifest.xml') diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 87c7b8031..64cb3b994 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1,7 +1,7 @@ - -- cgit v1.2.3 From 93074e91a15a926c079a40d7bc86025d5297259b Mon Sep 17 00:00:00 2001 From: John Reck Date: Fri, 19 Apr 2013 10:04:12 -0700 Subject: Remove photos from gallery2 manifest Bug: 8659787 Change-Id: I72c85db38b3f7409a2ce84b2a6a7b7ccab41a351 --- AndroidManifest.xml | 34 +++++++++++----------------------- 1 file changed, 11 insertions(+), 23 deletions(-) (limited to 'AndroidManifest.xml') diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 64cb3b994..040519dff 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -87,12 +87,8 @@ - + @@ -125,18 +121,6 @@ - - - - @@ -179,12 +163,16 @@ - + + - + android:label="@string/app_name"> + + + + -- cgit v1.2.3 From 86d622f79e9b72b78b7d9b34c66c6ed9d83c9ea5 Mon Sep 17 00:00:00 2001 From: Bart Sears Date: Mon, 22 Apr 2013 18:43:29 -0700 Subject: Bump up the version number to 1.1.40011 Bug: 8607157 Change-Id: I7fc2c526228d9526b0af28181b6505173bbfbd7d --- AndroidManifest.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'AndroidManifest.xml') diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 040519dff..0cdaf991f 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1,7 +1,7 @@ - -- cgit v1.2.3 From 52a069f0839cbc0bff49ea359a497f65d127ef3b Mon Sep 17 00:00:00 2001 From: Doris Liu Date: Thu, 25 Apr 2013 13:41:12 -0700 Subject: Remove new camera activity code from Bryce Bug: 8722017 Change-Id: Ife3f45511f6724c61fb01c4753078df14571fc4a --- AndroidManifest.xml | 13 ------------- 1 file changed, 13 deletions(-) (limited to 'AndroidManifest.xml') diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 0cdaf991f..d5a5ef9fa 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -284,19 +284,6 @@ android:configChanges="keyboardHidden|orientation|screenSize" android:theme="@style/Theme.Gallery.Dialog"/> - - - - - - - Date: Wed, 8 May 2013 15:14:15 -0700 Subject: Remove new camera activity to avoid build breakage Change-Id: I56f0586ae196f57a0f55b8d835e6bc8fd27bdcfe --- AndroidManifest.xml | 14 -------------- 1 file changed, 14 deletions(-) (limited to 'AndroidManifest.xml') diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 0cdaf991f..8b70acaa5 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -283,20 +283,6 @@ - - - - - - - - Date: Mon, 20 May 2013 15:59:20 -0700 Subject: Bump up the version number to 1.1.40012 Bug: 8607157 Change-Id: I5fdf05fd4d10a54f72129177572285d438740b97 --- AndroidManifest.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'AndroidManifest.xml') diff --git a/AndroidManifest.xml b/AndroidManifest.xml index d5a5ef9fa..02ffcc1d5 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1,7 +1,7 @@ - -- cgit v1.2.3 From d3edb7e79300aa4c08da68b023c40c5472b98b8a Mon Sep 17 00:00:00 2001 From: Jeff Sharkey Date: Tue, 28 May 2013 14:34:50 -0700 Subject: Fix XML comment. Change-Id: If54672cc7cb9ad6a240bb2dff07cbe9c39a521a3 (cherry picked from commit 53a0d0aa62b5f33ca3ff2c9ec63a4bcf606c5292) --- AndroidManifest.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'AndroidManifest.xml') diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 75509534d..5b91b96aa 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -74,7 +74,7 @@ - !-- HTTP live support --> + -- cgit v1.2.3 From 7d086bd03f2df996599185e80e0b3776b8ac0580 Mon Sep 17 00:00:00 2001 From: Bart Sears Date: Thu, 27 Jun 2013 11:37:23 -0700 Subject: Bump up the version number to 1.1.40030 Change-Id: I391e9515e50ec9d61855f4e939b4033dad648ac5 --- AndroidManifest.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'AndroidManifest.xml') diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 5b91b96aa..68780f70b 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1,7 +1,7 @@ - -- cgit v1.2.3 From 24d6ec7beb37eb3a5449f1fa49b4adb123391d24 Mon Sep 17 00:00:00 2001 From: nicolasroard Date: Fri, 12 Jul 2013 18:27:54 -0700 Subject: Add background processing service bug:7298624 Change-Id: Ie79f88fd84fdf8f4dab6a8071f06a819e247b357 --- AndroidManifest.xml | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'AndroidManifest.xml') diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 68780f70b..ef1d91459 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -219,6 +219,11 @@ android:grantUriPermissions="true" android:readPermission="com.android.gallery3d.filtershow.permission.READ" android:writePermission="com.android.gallery3d.filtershow.permission.WRITE" /> + + + Date: Thu, 8 Aug 2013 11:27:09 -0700 Subject: Remove Camera from Gallery2. Change-Id: I89adebffcacd1269217d7bd8c630c2f78886f590 --- AndroidManifest.xml | 91 ----------------------------------------------------- 1 file changed, 91 deletions(-) (limited to 'AndroidManifest.xml') diff --git a/AndroidManifest.xml b/AndroidManifest.xml index ef1d91459..7aee8663d 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -42,11 +42,8 @@ android:logo="@mipmap/ic_launcher_gallery" android:hardwareAccelerated="true" android:largeHeap="true" - android:backupAgent="com.android.camera.CameraBackupAgent" android:restoreAnyVersion="true"> - @@ -288,81 +285,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -381,16 +303,6 @@ - - - - - - - - - - - - -- cgit v1.2.3 From f142f2f0823f08c5d6207066a291449ed90d642f Mon Sep 17 00:00:00 2001 From: Mangesh Ghiware Date: Wed, 14 Aug 2013 08:44:07 -0700 Subject: Add a trampoline activity to launch new Camera This preserves shortcuts, if any, to the Camera activity in the old package name. Bug: 10312966 Change-Id: Iffd3d708333515bb3b998faecff360bc01c142d2 --- AndroidManifest.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'AndroidManifest.xml') diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 7aee8663d..4a5da186a 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -171,6 +171,21 @@ + + + + + + + + + Date: Fri, 16 Aug 2013 16:24:55 -0700 Subject: Add the intent filter for video trimming. bug:10313015 Change-Id: I3e2ef58e065d0cdabfab6943b11b6fddc0b112eb --- AndroidManifest.xml | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'AndroidManifest.xml') diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 7aee8663d..6927b7650 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -202,6 +202,13 @@ + + + + + + + Date: Wed, 21 Aug 2013 18:18:03 -0700 Subject: Add label to CameraLauncher activity-alias. Bug: 10430717 Change-Id: I37f9e63483211ecfe11e4790361c051d377aef55 --- AndroidManifest.xml | 1 + 1 file changed, 1 insertion(+) (limited to 'AndroidManifest.xml') diff --git a/AndroidManifest.xml b/AndroidManifest.xml index b7a1c4e93..c2f93f3ea 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -179,6 +179,7 @@ android:label="@string/camera_label" android:theme="@style/android:Theme.NoDisplay" /> -- cgit v1.2.3 From 7777cdfeb8890276659b3becee4181ea3de6a0f3 Mon Sep 17 00:00:00 2001 From: Mangesh Ghiware Date: Mon, 9 Sep 2013 09:42:09 -0700 Subject: Exclude trampoline activity from Recents Bug: 10653067 Change-Id: I79b4cb66886a63d19139cb9cb7272a754320b256 --- AndroidManifest.xml | 1 + 1 file changed, 1 insertion(+) (limited to 'AndroidManifest.xml') diff --git a/AndroidManifest.xml b/AndroidManifest.xml index c2f93f3ea..69d16ca98 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -179,6 +179,7 @@ android:label="@string/camera_label" android:theme="@style/android:Theme.NoDisplay" /> -- cgit v1.2.3 From 94e122bf3dbcd316922cbd145adec30b49f2f8ae Mon Sep 17 00:00:00 2001 From: Mangesh Ghiware Date: Thu, 19 Sep 2013 15:56:15 -0700 Subject: Use the same taskAffinity for trampoline as Camera Bug: 10842131 Change-Id: I2bf6961d7c411dc95e9b9589d9ec71ee34b3011f --- AndroidManifest.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'AndroidManifest.xml') diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 69d16ca98..a8ffe43ef 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -177,9 +177,9 @@ -- cgit v1.2.3 From 5cf48128283db1def078dea4cc57ee10195e9a47 Mon Sep 17 00:00:00 2001 From: Mangesh Ghiware Date: Sun, 22 Sep 2013 13:00:24 -0700 Subject: Add (back) receiver to disable camera. Bug: 10411981 Change-Id: Icff31d2da466746ef6b00d4be32e92067cebd1f1 --- AndroidManifest.xml | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'AndroidManifest.xml') diff --git a/AndroidManifest.xml b/AndroidManifest.xml index a8ffe43ef..e7da0be88 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -337,6 +337,13 @@ + + + + + + + -- cgit v1.2.3 From 105fbcf3289491aa4f590057e304fee33f1c88ca Mon Sep 17 00:00:00 2001 From: nicolasroard Date: Mon, 23 Sep 2013 16:12:10 -0700 Subject: Fix issues with RTL support bug:8148068 Change-Id: I869e1a90686c46f8076a66f94040ad03c7c6ca10 --- AndroidManifest.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'AndroidManifest.xml') diff --git a/AndroidManifest.xml b/AndroidManifest.xml index e7da0be88..2c280106f 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -42,7 +42,8 @@ android:logo="@mipmap/ic_launcher_gallery" android:hardwareAccelerated="true" android:largeHeap="true" - android:restoreAnyVersion="true"> + android:restoreAnyVersion="true" + android:supportsRtl="true"> Date: Tue, 24 Sep 2013 14:20:04 -0700 Subject: Fix style for crop activity bug:10786662 Change-Id: Ie104b8ba2484455ad5cdf90d8c26157480143b0b --- AndroidManifest.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'AndroidManifest.xml') diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 2c280106f..41eb461ba 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -266,7 +266,7 @@ -- cgit v1.2.3 From 06c027675948259368a902fd6f8c2ecac5db5167 Mon Sep 17 00:00:00 2001 From: Mangesh Ghiware Date: Wed, 11 Sep 2013 15:59:59 -0700 Subject: Rename Gallery activity and add trampoline Bug: 10807861 Change-Id: Iaaf17b579db2fe09900e9817f766f43dd66dea61 --- AndroidManifest.xml | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) (limited to 'AndroidManifest.xml') diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 41eb461ba..8f48edf20 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -85,7 +85,7 @@ - @@ -161,10 +161,21 @@ + + + + + + + + -- cgit v1.2.3 From a545774386d84dca5825b503c682a8eab272705c Mon Sep 17 00:00:00 2001 From: Mangesh Ghiware Date: Wed, 21 Aug 2013 14:00:34 -0700 Subject: Disable GET_CONTENT intent-filter for KLP+ Bug: 10415790 Change-Id: I94260dbe7c61c1ead2a0e6ea12f837a76a69d547 --- AndroidManifest.xml | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) (limited to 'AndroidManifest.xml') diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 8f48edf20..d1642f38f 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -93,18 +93,6 @@ - - - - - - - - - - - - @@ -172,6 +160,22 @@ + + + + + + + + + + + Date: Tue, 24 Sep 2013 15:23:43 -0700 Subject: Explicitly enable CameraLauncher Bug: 10912503 Change-Id: Ic3370dd946bcc334de2758c0321ef5b187573ea3 --- AndroidManifest.xml | 1 + 1 file changed, 1 insertion(+) (limited to 'AndroidManifest.xml') diff --git a/AndroidManifest.xml b/AndroidManifest.xml index d1642f38f..21921dc3b 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -196,6 +196,7 @@ android:taskAffinity="com.android.camera.CameraActivity" android:theme="@style/android:Theme.NoDisplay" /> -- cgit v1.2.3 From 47f602c3262652f981a9c98358e5a8bde41656ea Mon Sep 17 00:00:00 2001 From: Mangesh Ghiware Date: Fri, 4 Oct 2013 21:49:15 +0000 Subject: Revert "Disable GET_CONTENT intent-filter for KLP+" This reverts commit a545774386d84dca5825b503c682a8eab272705c. Bug: 11085255 Change-Id: I254e9cbaca074928d77851083418e4d0f692b13b --- AndroidManifest.xml | 28 ++++++++++++---------------- 1 file changed, 12 insertions(+), 16 deletions(-) (limited to 'AndroidManifest.xml') diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 21921dc3b..7b372a8d0 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -93,6 +93,18 @@ + + + + + + + + + + + + @@ -160,22 +172,6 @@ - - - - - - - - - - - Date: Tue, 8 Oct 2013 15:29:58 -0700 Subject: Fix incorrect usage of getComponentEnabledSetting() Bug: 10912503 Change-Id: I9835995d121445ca170668ae8150a24e95e27544 --- AndroidManifest.xml | 1 - 1 file changed, 1 deletion(-) (limited to 'AndroidManifest.xml') diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 7b372a8d0..8f48edf20 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -192,7 +192,6 @@ android:taskAffinity="com.android.camera.CameraActivity" android:theme="@style/android:Theme.NoDisplay" /> -- cgit v1.2.3 From 21b619541d6a92d595bbe6e95d4a0b46b6f40f77 Mon Sep 17 00:00:00 2001 From: Alan Newberger Date: Thu, 31 Oct 2013 15:15:45 -0700 Subject: Gallery should show up in recents even when run via shortcut Gallery when run through the shortcut doesn't show up in recents. This is a minimal change to show the activity in recents even when started via shortcut. Bug: 11195140 Change-Id: Iaa7230fd1874871744403b1b2e2e9216c4cb73d2 --- AndroidManifest.xml | 1 - 1 file changed, 1 deletion(-) (limited to 'AndroidManifest.xml') diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 8f48edf20..59da7eae7 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -164,7 +164,6 @@ -- cgit v1.2.3 From 014369d5abdcd23e951d31021144d2e0039cd218 Mon Sep 17 00:00:00 2001 From: Alan Newberger Date: Wed, 17 Sep 2014 17:33:16 -0700 Subject: Bring Gallery2 manifest into parity with CROP support Gallery2 does not support http/https CROPping, so remove them from manifest. Tested app on device and confirmed Gallery2 is still successfully a CROP app for content URIs after this modification. Bug: 15919429 Change-Id: Ib0dacdbf3013d8a2f35a07a8ea0e15070ebdb2e7 --- AndroidManifest.xml | 3 --- 1 file changed, 3 deletions(-) (limited to 'AndroidManifest.xml') diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 59da7eae7..7c290c768 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -280,11 +280,8 @@ android:configChanges="keyboardHidden|orientation|screenSize"> - - - -- cgit v1.2.3 From d73fd7eb45f643c98c40279d6a096de56f39260c Mon Sep 17 00:00:00 2001 From: Rob Walker Date: Thu, 26 Jan 2012 13:32:35 -0800 Subject: Gallery2: add support for the DASH mimetype Add support for the DASH mimetype CRs-Fixed: 539815 Change-Id: Ibbd03a2e4e3b1ca9224d4651e1c518e2ba51ba77 --- AndroidManifest.xml | 1 + 1 file changed, 1 insertion(+) (limited to 'AndroidManifest.xml') diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 7c290c768..95beee19c 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -82,6 +82,7 @@ + -- cgit v1.2.3 From 65b4d0c1ded85105802bf69ddb5646eb72839e17 Mon Sep 17 00:00:00 2001 From: Likai Ding Date: Tue, 13 Aug 2013 14:43:40 +0800 Subject: Gallery2: support GIF animation This change implements a Java GIF decoder. Change-Id: I72b6e8eb25572bba77a2a46e1754d8db8c47a0cc Signed-off-by: Xiaojing Zhang --- AndroidManifest.xml | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'AndroidManifest.xml') diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 95beee19c..52048895b 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -297,6 +297,16 @@ android:theme="@style/Theme.Gallery" android:configChanges="orientation|keyboardHidden|screenSize" /> + + + + + + + + Date: Mon, 19 Aug 2013 16:33:24 +0800 Subject: Gallery2: support live streaming and bookmarks Users can input a URL for streaming display. URL bookmarking is supported. Change-Id: Ia69497cdcfee963ba2209119a5b9dc82b64497da --- AndroidManifest.xml | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) (limited to 'AndroidManifest.xml') diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 52048895b..58b2a1a6f 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -29,6 +29,7 @@ + @@ -364,5 +365,33 @@ + + + + + + + + + + + + + + + + + + + + + + -- cgit v1.2.3 From 253ebbd3baff765d034adcd960bdaf40e949a44f Mon Sep 17 00:00:00 2001 From: Likai Ding Date: Tue, 20 Aug 2013 16:21:57 +0800 Subject: Gallery2: add some video features including: previous/next video play mode, screen mode, fast forward/rewind button, step settings. Change-Id: I3f4890c4dd95956e0eca889a5fd8b8d83b8d542e --- AndroidManifest.xml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'AndroidManifest.xml') diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 58b2a1a6f..780ee8bc6 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -63,6 +63,7 @@ + @@ -392,6 +393,9 @@ - + + -- cgit v1.2.3 From 47184c7b2bfb477a1ff800ac8a463478e4674dd9 Mon Sep 17 00:00:00 2001 From: wjiang Date: Fri, 14 Feb 2014 17:45:53 +0800 Subject: Gallery2: Fix batches of issues in movie effects Fix following issues: - All settings aren't restored to previous state when user cancel his operations. - Check the validity to avoid calling member function of an already released object. - Recycle effect instance when MovieActivity pauses. - Don't restore strength from pref when toggling switch. - Force the Effect's dialog to be uncancelable. - Fix null pointer and effect leak issue due to CMCC features. - Fix audio effects dialog display on small screens. - Recognize bluetooth headset. - Update visual design. Conflicts: src/com/android/gallery3d/ui/Knob.java Change-Id: I803897508c0c1a6723170b7691e3ece03680e4f1 --- AndroidManifest.xml | 1 + 1 file changed, 1 insertion(+) (limited to 'AndroidManifest.xml') diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 780ee8bc6..679ca0408 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -32,6 +32,7 @@ + Date: Fri, 18 Apr 2014 16:13:11 +0800 Subject: Gallery2: Add audio output switcher between headset/speaker There is no audio output switcher between headset/speaker. Add the audio output switcher button to menu list in order to let user use this function. CRs-Fixed: 650867 Change-Id: I16f5fdc74a76ee55557ba87b0145e51165f0408a --- AndroidManifest.xml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) (limited to 'AndroidManifest.xml') diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 679ca0408..6136da96d 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1,4 +1,21 @@ + + -- cgit v1.2.3 From 2dccb62d8b640162a4183311e790f826f06bf82c Mon Sep 17 00:00:00 2001 From: kaiyiz Date: Fri, 14 Nov 2014 14:28:44 +0800 Subject: Gallery2: Fix file exist in SD card when delete from Gallery The permission of writing sd card is not effective which cause this bug happen. Add write sd card permission. CRs-Fixed: 754706 Change-Id: Idd14a7ffbcce1e35d7ca6272118c48014758a1a5 --- AndroidManifest.xml | 1 + 1 file changed, 1 insertion(+) (limited to 'AndroidManifest.xml') diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 6136da96d..84b3eb700 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -49,6 +49,7 @@ + -- cgit v1.2.3 From a28677726eaaaf1c90a2e04cf66e27bd76c91d06 Mon Sep 17 00:00:00 2001 From: lubiny Date: Tue, 4 Mar 2014 16:40:36 +0800 Subject: Gallery2: add extra mimetypes to gallery manifest - Add extra mimetypes so they can be used for streaming Change-Id: I1df1b011ee54b646f23cfe3faa206c0aac41a838 CRs-Fixed: 620381 --- AndroidManifest.xml | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'AndroidManifest.xml') diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 84b3eb700..b7960a26d 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -92,6 +92,14 @@ + + + + + + + + -- cgit v1.2.3 From 9382a979292e52de5c60a39ba24688362dce8bc1 Mon Sep 17 00:00:00 2001 From: Paramananda Pradhan Date: Sun, 14 Dec 2014 17:27:31 +0530 Subject: Gallery2: Make Gallery2 support OMADRM feature - Make Gallery2 can recognize and consume DRM images and videos. Change-Id: I1655d295bcec31b5760c2c86c06f815cf6ed57ee --- AndroidManifest.xml | 1 + 1 file changed, 1 insertion(+) (limited to 'AndroidManifest.xml') diff --git a/AndroidManifest.xml b/AndroidManifest.xml index b7960a26d..4c9bf20cb 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -172,6 +172,7 @@ + -- cgit v1.2.3 From ba37d51c1ddc20b0b8472a2eee768a2d024f4fff Mon Sep 17 00:00:00 2001 From: kaiyiz Date: Tue, 27 Jan 2015 18:24:14 +0800 Subject: Gallery2: Grant permission to read/write files of Settings. Set photo of "user" via statusbar->more settings fails, because that Gallery2 does not have the permission to read and write files of Settings. Grant read and write Settings permission to Gallery2. Change-Id: Ifcc5b4d8d938960296c4fa9d0f7f302d353c3197 CRs-Fixed: 785671 --- AndroidManifest.xml | 1 + 1 file changed, 1 insertion(+) (limited to 'AndroidManifest.xml') diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 4c9bf20cb..9ccac2dc7 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -20,6 +20,7 @@ -- cgit v1.2.3 From 7ff0557fb4e1af3ced80bd2ae52d49b2ed202898 Mon Sep 17 00:00:00 2001 From: Jing Wang Date: Fri, 30 Jan 2015 01:31:17 -0800 Subject: Revert "Gallery2: Grant permission to read/write files of Settings." it will be fixed by another way This reverts commit ba37d51c1ddc20b0b8472a2eee768a2d024f4fff Change-Id: I35b0ed339b427634f5056addfbefc20198dcfd04 --- AndroidManifest.xml | 1 - 1 file changed, 1 deletion(-) (limited to 'AndroidManifest.xml') diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 9ccac2dc7..4c9bf20cb 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -20,7 +20,6 @@ -- cgit v1.2.3 From dd0ab3f17e6968b6cf14db09c3e2e113970ff640 Mon Sep 17 00:00:00 2001 From: Narayan Kamath Date: Fri, 13 Feb 2015 10:23:11 +0000 Subject: Add an explicit dependency on org.apache.http.legacy. bug: 18027885 Change-Id: I8e041025dc3f58b82ddce5b9ab2e3bdd3512cf00 --- AndroidManifest.xml | 1 + 1 file changed, 1 insertion(+) (limited to 'AndroidManifest.xml') diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 7c290c768..234d39a38 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -45,6 +45,7 @@ android:restoreAnyVersion="true" android:supportsRtl="true"> + -- cgit v1.2.3 From 0addfeb2d1851fe6d6ddd80b66882f00f1c2d927 Mon Sep 17 00:00:00 2001 From: Alex Klyubin Date: Wed, 20 May 2015 09:25:28 -0700 Subject: Gallery2 app might use cleartext network traffic. This declares that Gallery2 app might be using cleartext network traffic (e.g., HTTP instead of HTTPS). This CL does not change the behavior of the app. The flag added by this CL to the app's manifest will make it easier to identify apps that use cleartext traffic in the future. The only reason for using cleartext network traffic is the pre-existing public contract that this app can display externally provided HTTP image URLs and play back externally provided HTTP and RTSP video URLs. Bug: 19215516 Change-Id: I6e1e8400f40ba7c280742c71af7a572b0dbad231 --- AndroidManifest.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'AndroidManifest.xml') diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 234d39a38..2aea5699c 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -43,7 +43,8 @@ android:hardwareAccelerated="true" android:largeHeap="true" android:restoreAnyVersion="true" - android:supportsRtl="true"> + android:supportsRtl="true" + usesCleartextHttp="true"> Date: Thu, 26 Jan 2012 13:32:35 -0800 Subject: Gallery2: add support for the DASH mimetype Add support for the DASH mimetype CRs-Fixed: 539815 Change-Id: Ibbd03a2e4e3b1ca9224d4651e1c518e2ba51ba77 --- AndroidManifest.xml | 1 + 1 file changed, 1 insertion(+) (limited to 'AndroidManifest.xml') diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 2aea5699c..31a2495e1 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -84,6 +84,7 @@ + -- cgit v1.2.3 From 49f14dd9382af3a04ec27bde0b2ae7362220181a Mon Sep 17 00:00:00 2001 From: Ravi Banuri Date: Wed, 21 Oct 2015 15:54:59 +0530 Subject: Gallery: UX enhancement Added new resources and modified source to enhance the UI of Gallery application. CRs-Fixed: 926603 Change-Id: I5ca7c49115ab4a3531b72a53380bb765d52707a2 --- AndroidManifest.xml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'AndroidManifest.xml') diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 01d6123ad..93b015849 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -24,7 +24,7 @@ - + @@ -59,7 +59,6 @@ - @@ -292,7 +292,6 @@ @@ -399,6 +398,7 @@ @@ -426,6 +426,7 @@ -- cgit v1.2.3 From 9127df3cf7bec5bfe32960ea9c7e7bcd7f5ad3bb Mon Sep 17 00:00:00 2001 From: yongga Date: Sat, 9 Jan 2016 16:14:11 +0800 Subject: Gallery2: Fix no android.permission.INTERACT_ACROSS_USERS in guest mode. Guest don't have permission to set system property. add the permission for guest. Change-Id: I8d63da7f94d27ee2ceb4a04b19d85afe097b1659 CRs-Fixed: 954666 95622 --- AndroidManifest.xml | 2 ++ 1 file changed, 2 insertions(+) (limited to 'AndroidManifest.xml') diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 93b015849..810d621f3 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -52,6 +52,8 @@ + //add for guest to set system property + Date: Mon, 25 Jan 2016 11:21:24 +0800 Subject: Gallery: Add mime type to support TS format files. Add mime type to gallery manifest to support the playback of TS files. Change-Id: I095a1b75caae28edfbc6e9e19b1cdf654a2d08de CRs-Fixed: 924830 --- AndroidManifest.xml | 1 + 1 file changed, 1 insertion(+) (limited to 'AndroidManifest.xml') diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 810d621f3..be77afc82 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -95,6 +95,7 @@ + -- cgit v1.2.3 From ec11f6c6012980baa388c64c071463f11b999846 Mon Sep 17 00:00:00 2001 From: Likai Ding Date: Thu, 28 Jan 2016 15:22:37 +0800 Subject: Gallery2: don't start on bootup Streaming settings have reasonable defaults. It is not necessary to write default values on BOOT_COMPLETED. Change-Id: If394b7c9ace6bfc7aa5992cc44f468ae485e84cd --- AndroidManifest.xml | 1 - 1 file changed, 1 deletion(-) (limited to 'AndroidManifest.xml') diff --git a/AndroidManifest.xml b/AndroidManifest.xml index be77afc82..11f9d62d0 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -412,7 +412,6 @@ - -- cgit v1.2.3 From 6f8d6b6cceb1031fea826439589614a201943cd9 Mon Sep 17 00:00:00 2001 From: zdi Date: Tue, 1 Mar 2016 11:45:51 +0800 Subject: Gallery2: Add configChanges in TrimVideo The video will play from the start automatically when orientation changed. Add android:configChanges="keyboardHidden|orientation|screenSize" in TrimVideo. Change-Id: Ida52900780ec7ccc09e5f20d3f0ccf47f9a9a852 CRs-Fixed: 982758 --- AndroidManifest.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'AndroidManifest.xml') diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 11f9d62d0..53d51cb71 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -266,7 +266,8 @@ android:resource="@xml/wallpaper_picker_preview" /> + android:label="@string/trim_label" + android:configChanges="keyboardHidden|orientation|screenSize"> -- cgit v1.2.3 From 9c3a0fef93ceacabc578d78f110f6a65723d2d55 Mon Sep 17 00:00:00 2001 From: zdi Date: Tue, 15 Mar 2016 10:06:26 +0800 Subject: Gallery2: Add "keyboard" in MovieActivity's configChanges. Blank Frame flicker on source after session teardown during WFD Session AV playback. Add "keyboard" in MovieActivity's configChanges. Change-Id: Ie5aa2c1dedab78b2f92e469829b732caab8e1346 CRs-Fixed: 979747 --- AndroidManifest.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'AndroidManifest.xml') diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 53d51cb71..d9d9b4eb5 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -71,7 +71,7 @@ + android:configChanges="orientation|keyboardHidden|screenSize|keyboard"> -- cgit v1.2.3 From 80eaa18ac94163ff3abf49b64caa90d43da4fc4c Mon Sep 17 00:00:00 2001 From: Likai Ding Date: Thu, 25 Feb 2016 15:01:30 +0800 Subject: Gallery: runtime permission check Some permissions are not used anymore so they are removed from manifest. Storage permission is required on startup. Change-Id: I46bd46b4f59667cd5818e53a37621ded8727b60e CRs-Fixed: 977136 --- AndroidManifest.xml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'AndroidManifest.xml') diff --git a/AndroidManifest.xml b/AndroidManifest.xml index d9d9b4eb5..91a243c20 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -24,23 +24,18 @@ - + - - - - - -- cgit v1.2.3 From d34f6bc73e0ac287729ea48107c914a427af6309 Mon Sep 17 00:00:00 2001 From: Chao Zhang Date: Wed, 16 Mar 2016 19:34:56 +0800 Subject: Gallery2: fix display abnormal when rotate screen after set font scale. Add fontScale in CropActivity's android:configChanges to make onConfigurationChanged() work well after set font scale in system settings. Change-Id: I46b8b083891ec27baa1d579f2e352275587c8221 CRs-Fixed: 980318 --- AndroidManifest.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'AndroidManifest.xml') diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 91a243c20..08ca742e0 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -309,7 +309,7 @@ android:name="com.android.gallery3d.filtershow.crop.CropActivity" android:label="@string/crop" android:theme="@style/Theme.Crop" - android:configChanges="keyboardHidden|orientation|screenSize"> + android:configChanges="keyboardHidden|orientation|screenSize|fontScale"> -- cgit v1.2.3 From cba2c073700990bea194ee14ff3eac76fc31b42b Mon Sep 17 00:00:00 2001 From: huiyan Date: Mon, 21 Mar 2016 14:55:31 +0800 Subject: Gallery2: Play gif photo directly in photopage Implement new feature: Remove play icon and play the gif photo directly Change-Id: I95f82ca8ab912a98a5120ce2c01fe2fe33c9a875 CRs-Fixed: 987942 --- AndroidManifest.xml | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) (limited to 'AndroidManifest.xml') diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 08ca742e0..1eda90bf7 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1,5 +1,5 @@ -