OSDN Git Service

android-x86/packages-apps-Camera2.git
10 years agoam 1106268f: (-s ours) am 4821c541: (-s ours) Merge "Import translations. DO NOT...
Baligh Uddin [Thu, 19 Sep 2013 21:42:44 +0000 (14:42 -0700)]
am 1106268f: (-s ours) am 4821c541: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-carlsbad

* commit '1106268ffb0050b2d52a345b6827954a91f54bae':
  Import translations. DO NOT MERGE

10 years agoam 3aac79f2: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Thu, 19 Sep 2013 21:38:47 +0000 (14:38 -0700)]
am 3aac79f2: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit '3aac79f2a9b67458ff4754c0a37fb4f09e78bfbd':
  Import translations. DO NOT MERGE

10 years agoam 4821c541: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos...
Baligh Uddin [Thu, 19 Sep 2013 21:38:02 +0000 (14:38 -0700)]
am 4821c541: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-carlsbad

* commit '4821c5418d44d936ca222bfe1fdc1ac367e129f8':
  Import translations. DO NOT MERGE

10 years agoMerge "Import translations. DO NOT MERGE" into gb-ub-photos-carlsbad
Baligh Uddin [Thu, 19 Sep 2013 21:35:41 +0000 (21:35 +0000)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-carlsbad

10 years agoMerge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Thu, 19 Sep 2013 21:33:14 +0000 (21:33 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev

10 years agoam 75ad0584: am 30a21ea3: Merge "Fix drawable location." into gb-ub-photos-carlsbad
Ruben Brunk [Thu, 19 Sep 2013 19:37:47 +0000 (12:37 -0700)]
am 75ad0584: am 30a21ea3: Merge "Fix drawable location." into gb-ub-photos-carlsbad

* commit '75ad0584a13438fa113e5a9e201c6fe1af4880af':
  Fix drawable location.

10 years agoam 30a21ea3: Merge "Fix drawable location." into gb-ub-photos-carlsbad
Ruben Brunk [Thu, 19 Sep 2013 19:35:48 +0000 (12:35 -0700)]
am 30a21ea3: Merge "Fix drawable location." into gb-ub-photos-carlsbad

* commit '30a21ea3356e87bdff0e072b840fa73215597326':
  Fix drawable location.

10 years agoMerge "Fix drawable location." into gb-ub-photos-carlsbad
Ruben Brunk [Thu, 19 Sep 2013 19:33:09 +0000 (19:33 +0000)]
Merge "Fix drawable location." into gb-ub-photos-carlsbad

10 years agoam 27d4468f: am 19ab725a: Add crop activity
nicolasroard [Thu, 19 Sep 2013 19:25:39 +0000 (12:25 -0700)]
am 27d4468f: am 19ab725a: Add crop activity

* commit '27d4468f90dd478839d864376edd0d40201bd80e':
  Add crop activity

10 years agoFix drawable location.
Ruben Brunk [Thu, 19 Sep 2013 19:23:39 +0000 (12:23 -0700)]
Fix drawable location.

Bug: 10430748

- Drawable wasn't included when building from klp-dev.

Change-Id: I85e57eebbab3a25e18e3fd6738ffa43bdd61f974

10 years agoam 19ab725a: Add crop activity
nicolasroard [Thu, 19 Sep 2013 19:22:35 +0000 (12:22 -0700)]
am 19ab725a: Add crop activity

* commit '19ab725a5e640a1a20b1a6def083e37d1d1c1e20':
  Add crop activity

10 years agoAdd crop activity
nicolasroard [Wed, 18 Sep 2013 23:54:05 +0000 (16:54 -0700)]
Add crop activity

bug:10367125

Change-Id: I8dce6d799e7469ff048d419598d87b0c04bef2a0

10 years agoam 9e7cb170: am 064d6000: Use contentObserver to refresh the data when dirty.
ztenghui [Thu, 19 Sep 2013 18:17:40 +0000 (11:17 -0700)]
am 9e7cb170: am 064d6000: Use contentObserver to refresh the data when dirty.

* commit '9e7cb170dfbb9884e2f47e30a8a0e60bded318ad':
  Use contentObserver to refresh the data when dirty.

10 years agoam 064d6000: Use contentObserver to refresh the data when dirty.
ztenghui [Thu, 19 Sep 2013 18:16:14 +0000 (11:16 -0700)]
am 064d6000: Use contentObserver to refresh the data when dirty.

* commit '064d6000933354f7bf344a41e0caa7052401c903':
  Use contentObserver to refresh the data when dirty.

10 years agoUse contentObserver to refresh the data when dirty.
ztenghui [Thu, 5 Sep 2013 22:47:58 +0000 (15:47 -0700)]
Use contentObserver to refresh the data when dirty.

Handle another setDataSource exception.
Remove the old work around for refreshing after editing.

bug:10390298

Change-Id: I8777364b96c86eeaf5581a96163aab823cd4b438

10 years agoam 7806200a: am a5682ab0: Bring back NFC beam support to filmstrip
Mangesh Ghiware [Thu, 19 Sep 2013 18:06:10 +0000 (11:06 -0700)]
am 7806200a: am a5682ab0: Bring back NFC beam support to filmstrip

* commit '7806200aa5235dc8514411107d1603acea12e6b7':
  Bring back NFC beam support to filmstrip

10 years agoam a5682ab0: Bring back NFC beam support to filmstrip
Mangesh Ghiware [Thu, 19 Sep 2013 18:03:46 +0000 (11:03 -0700)]
am a5682ab0: Bring back NFC beam support to filmstrip

* commit 'a5682ab08e1d42fe272ec877929478b4adb769f5':
  Bring back NFC beam support to filmstrip

10 years agoBring back NFC beam support to filmstrip
Mangesh Ghiware [Thu, 19 Sep 2013 16:24:23 +0000 (09:24 -0700)]
Bring back NFC beam support to filmstrip

Bug: 10805211
Change-Id: I457d47625c69fcdaba663e53f46d461d29c7cb92

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Thu, 19 Sep 2013 10:32:46 +0000 (03:32 -0700)]
Import translations. DO NOT MERGE

Change-Id: I14087e2afde009daca03e6005fab8043d36c7e0c
Auto-generated-cl: translation import

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Thu, 19 Sep 2013 10:19:58 +0000 (03:19 -0700)]
Import translations. DO NOT MERGE

Change-Id: Id078acbb97019f81cab8f877aa2939192b099e2f
Auto-generated-cl: translation import

10 years agoam e784eb4b: am 0374e092: Merge "Adding gcam module to Camera2 app." into gb-ub-photo...
Ruben Brunk [Thu, 19 Sep 2013 07:26:08 +0000 (00:26 -0700)]
am e784eb4b: am 0374e092: Merge "Adding gcam module to Camera2 app." into gb-ub-photos-carlsbad

* commit 'e784eb4b4e14a38c29f6c7af127ac38b73575413':
  Adding gcam module to Camera2 app.

10 years agoam 0374e092: Merge "Adding gcam module to Camera2 app." into gb-ub-photos-carlsbad
Ruben Brunk [Thu, 19 Sep 2013 07:23:11 +0000 (00:23 -0700)]
am 0374e092: Merge "Adding gcam module to Camera2 app." into gb-ub-photos-carlsbad

* commit '0374e092eb6fdb33cb6edcb7724601928283dd47':
  Adding gcam module to Camera2 app.

10 years agoMerge "Adding gcam module to Camera2 app." into gb-ub-photos-carlsbad
Ruben Brunk [Thu, 19 Sep 2013 07:18:26 +0000 (07:18 +0000)]
Merge "Adding gcam module to Camera2 app." into gb-ub-photos-carlsbad

10 years agoAdding gcam module to Camera2 app.
Ruben Brunk [Fri, 6 Sep 2013 18:56:32 +0000 (11:56 -0700)]
Adding gcam module to Camera2 app.

Bug: 10430748

Change-Id: I0c53085553cd8505ba376b1518507d36065894f5

10 years agoam 247fa7b9: am 9426a38c: Merge "Make Up button in filmstrip go to Gallery." into...
Mangesh Ghiware [Thu, 19 Sep 2013 04:31:11 +0000 (21:31 -0700)]
am 247fa7b9: am 9426a38c: Merge "Make Up button in filmstrip go to Gallery." into gb-ub-photos-carlsbad

* commit '247fa7b988935e73f41805bb640344ebf2614b25':
  Make Up button in filmstrip go to Gallery.

10 years agoam 9426a38c: Merge "Make Up button in filmstrip go to Gallery." into gb-ub-photos...
Mangesh Ghiware [Thu, 19 Sep 2013 04:28:59 +0000 (21:28 -0700)]
am 9426a38c: Merge "Make Up button in filmstrip go to Gallery." into gb-ub-photos-carlsbad

* commit '9426a38c2a3ea7f54f35a202dc8aa83fa0cffa63':
  Make Up button in filmstrip go to Gallery.

10 years agoMerge "Make Up button in filmstrip go to Gallery." into gb-ub-photos-carlsbad
Mangesh Ghiware [Thu, 19 Sep 2013 04:27:58 +0000 (04:27 +0000)]
Merge "Make Up button in filmstrip go to Gallery." into gb-ub-photos-carlsbad

10 years agoam 485f95e4: am b2d70d5b: Fix various message issues
Sascha Haeberling [Thu, 19 Sep 2013 02:35:44 +0000 (19:35 -0700)]
am 485f95e4: am b2d70d5b: Fix various message issues

* commit '485f95e4f48ef76587e2b9d5ecf99063a104c6f7':
  Fix various message issues

10 years agoam b2d70d5b: Fix various message issues
Sascha Haeberling [Thu, 19 Sep 2013 02:34:01 +0000 (19:34 -0700)]
am b2d70d5b: Fix various message issues

* commit 'b2d70d5bfcebbd2deb3e8e81371204eb0fc0421b':
  Fix various message issues

10 years agoMake Up button in filmstrip go to Gallery.
Mangesh Ghiware [Thu, 19 Sep 2013 01:25:26 +0000 (18:25 -0700)]
Make Up button in filmstrip go to Gallery.

Bug: 10748904
Change-Id: If80f3354071893dc4f8bd60e4ca605d3626ecdf9

10 years agoFix various message issues
Sascha Haeberling [Thu, 19 Sep 2013 00:08:29 +0000 (17:08 -0700)]
Fix various message issues

  Bug: 10568697
  Bug: 10589224
  Bug: 10561095
  Bug: 10589353
  Bug: 10570925

Change-Id: I1affdf37d74bef37e099c70775f669ee0ff33acf

10 years agoam f0ec22b7: am 638e6f06: Clean up ApiHelper and remove unused code paths.
Sascha Haeberling [Wed, 18 Sep 2013 22:08:22 +0000 (15:08 -0700)]
am f0ec22b7: am 638e6f06: Clean up ApiHelper and remove unused code paths.

* commit 'f0ec22b78a94e34f1136e87f1cff0d348aea9882':
  Clean up ApiHelper and remove unused code paths.

10 years agoam 638e6f06: Clean up ApiHelper and remove unused code paths.
Sascha Haeberling [Wed, 18 Sep 2013 22:05:50 +0000 (15:05 -0700)]
am 638e6f06: Clean up ApiHelper and remove unused code paths.

* commit '638e6f06c877d90b907f66ea9c22b3c6b73c7384':
  Clean up ApiHelper and remove unused code paths.

10 years agoClean up ApiHelper and remove unused code paths.
Sascha Haeberling [Wed, 18 Sep 2013 21:28:51 +0000 (14:28 -0700)]
Clean up ApiHelper and remove unused code paths.

  Bug: 10821545

As we're targeting ICS there are a lot of checks and code paths
that are no longer in use. This CL cleans them up.

Change-Id: Ic3dd26628a94e134e25e2c496ccec1f1f957216d

10 years agoam 18dcbd5d: am 4ed20592: Adding Hideybar support for K and up.
Sascha Haeberling [Wed, 18 Sep 2013 17:44:31 +0000 (10:44 -0700)]
am 18dcbd5d: am 4ed20592: Adding Hideybar support for K and up.

* commit '18dcbd5d7fbe683b3891a05b5ba90babf359a45f':
  Adding Hideybar support for K and up.

10 years agoam 4ed20592: Adding Hideybar support for K and up.
Sascha Haeberling [Wed, 18 Sep 2013 17:41:19 +0000 (10:41 -0700)]
am 4ed20592: Adding Hideybar support for K and up.

* commit '4ed20592482d2ab2f3f48ee72d5b1c06bf009034':
  Adding Hideybar support for K and up.

10 years agoAdding Hideybar support for K and up.
Sascha Haeberling [Fri, 13 Sep 2013 18:58:33 +0000 (11:58 -0700)]
Adding Hideybar support for K and up.

  Bug: 10723047

Change-Id: Ie1d0bdadfbe6dee6a4e0998facac61ff1fb6e02a

10 years agoam eb0c0d3c: am e1f0f4f1: Merge "Delete the captured video if cancel in review."...
ztenghui [Wed, 18 Sep 2013 00:10:17 +0000 (17:10 -0700)]
am eb0c0d3c: am e1f0f4f1: Merge "Delete the captured video if cancel in review." into gb-ub-photos-carlsbad

* commit 'eb0c0d3cc706a7f63177a55a50ea057e7ecf0232':
  Delete the captured video if cancel in review.

10 years agoam e1f0f4f1: Merge "Delete the captured video if cancel in review." into gb-ub-photos...
ztenghui [Wed, 18 Sep 2013 00:04:47 +0000 (17:04 -0700)]
am e1f0f4f1: Merge "Delete the captured video if cancel in review." into gb-ub-photos-carlsbad

* commit 'e1f0f4f1bce2a8d0dca3856aa0211dcfffb74abc':
  Delete the captured video if cancel in review.

10 years agoMerge "Delete the captured video if cancel in review." into gb-ub-photos-carlsbad
ztenghui [Wed, 18 Sep 2013 00:02:45 +0000 (00:02 +0000)]
Merge "Delete the captured video if cancel in review." into gb-ub-photos-carlsbad

10 years agoDelete the captured video if cancel in review.
ztenghui [Tue, 17 Sep 2013 23:51:15 +0000 (16:51 -0700)]
Delete the captured video if cancel in review.

In capture intent case, video get inserted all the time before review.
So if cancelled in review mode, the captured video should be deleted.

bug:8897671
Change-Id: I01dd4b0707dd1b70480cda94b2a9b9c6ce9194c7

10 years agoam c008cf33: am 15125661: Fall back to Photo module if stores index is illegal.
Sascha Haeberling [Tue, 17 Sep 2013 23:08:50 +0000 (16:08 -0700)]
am c008cf33: am 15125661: Fall back to Photo module if stores index is illegal.

* commit 'c008cf3380e2b30cede4ee24e0463fb4f9b12d44':
  Fall back to Photo module if stores index is illegal.

10 years agoam 15125661: Fall back to Photo module if stores index is illegal.
Sascha Haeberling [Tue, 17 Sep 2013 23:07:20 +0000 (16:07 -0700)]
am 15125661: Fall back to Photo module if stores index is illegal.

* commit '15125661ad968cf4d40989a9bc88d11189beb0b3':
  Fall back to Photo module if stores index is illegal.

10 years agoam bfb14b9c: am 483d25a2: Merge "Don\'t crash the app if camera is not available...
Sascha Haeberling [Tue, 17 Sep 2013 23:02:25 +0000 (16:02 -0700)]
am bfb14b9c: am 483d25a2: Merge "Don\'t crash the app if camera is not available." into gb-ub-photos-carlsbad

* commit 'bfb14b9cbf42967721df8ef96e3d43fb5aa70d9f':
  Don't crash the app if camera is not available.

10 years agoFall back to Photo module if stores index is illegal.
Sascha Haeberling [Tue, 17 Sep 2013 22:44:22 +0000 (15:44 -0700)]
Fall back to Photo module if stores index is illegal.

  Bug: 10805249

Change-Id: Iace590af34cf646abf7af74b498520d686c04511

10 years agoam 483d25a2: Merge "Don\'t crash the app if camera is not available." into gb-ub...
Sascha Haeberling [Tue, 17 Sep 2013 23:01:12 +0000 (16:01 -0700)]
am 483d25a2: Merge "Don\'t crash the app if camera is not available." into gb-ub-photos-carlsbad

* commit '483d25a21058094303b94e44cc67cbd8fecd4bf8':
  Don't crash the app if camera is not available.

10 years agoMerge "Don't crash the app if camera is not available." into gb-ub-photos-carlsbad
Sascha Haeberling [Tue, 17 Sep 2013 22:58:47 +0000 (22:58 +0000)]
Merge "Don't crash the app if camera is not available." into gb-ub-photos-carlsbad

10 years agoam e7c77157: am 4ee4d99c: Merge "Adding a simple done handler interface." into gb...
Sascha Haeberling [Tue, 17 Sep 2013 22:55:31 +0000 (15:55 -0700)]
am e7c77157: am 4ee4d99c: Merge "Adding a simple done handler interface." into gb-ub-photos-carlsbad

* commit 'e7c77157c61fb0e09b5a5eec0b977a3b75f7a6eb':
  Adding a simple done handler interface.

10 years agoam 4ee4d99c: Merge "Adding a simple done handler interface." into gb-ub-photos-carlsbad
Sascha Haeberling [Tue, 17 Sep 2013 22:53:06 +0000 (15:53 -0700)]
am 4ee4d99c: Merge "Adding a simple done handler interface." into gb-ub-photos-carlsbad

* commit '4ee4d99cfc519847bd8f84aca9ece5d2b6519536':
  Adding a simple done handler interface.

10 years agoMerge "Adding a simple done handler interface." into gb-ub-photos-carlsbad
Sascha Haeberling [Tue, 17 Sep 2013 22:51:43 +0000 (22:51 +0000)]
Merge "Adding a simple done handler interface." into gb-ub-photos-carlsbad

10 years agoDon't crash the app if camera is not available.
Sascha Haeberling [Tue, 17 Sep 2013 22:36:13 +0000 (15:36 -0700)]
Don't crash the app if camera is not available.

  Bug: 10747001

Change-Id: I8a4e302a9b458c73901776a95a0118da0e4e8b6c

10 years agoam 1b3ffde9: am 9c0492a6: Merge "Fix camera controls rotation for secure camera"...
Doris Liu [Tue, 17 Sep 2013 22:22:36 +0000 (15:22 -0700)]
am 1b3ffde9: am 9c0492a6: Merge "Fix camera controls rotation for secure camera" into gb-ub-photos-carlsbad

* commit '1b3ffde934ceb9247e319d432d61a81dc6a28ecd':
  Fix camera controls rotation for secure camera

10 years agoam 9c0492a6: Merge "Fix camera controls rotation for secure camera" into gb-ub-photos...
Doris Liu [Tue, 17 Sep 2013 22:20:46 +0000 (15:20 -0700)]
am 9c0492a6: Merge "Fix camera controls rotation for secure camera" into gb-ub-photos-carlsbad

* commit '9c0492a606ca48dbc3e56b03051ea9242d952e3e':
  Fix camera controls rotation for secure camera

10 years agoMerge "Fix camera controls rotation for secure camera" into gb-ub-photos-carlsbad
Doris Liu [Tue, 17 Sep 2013 22:19:06 +0000 (22:19 +0000)]
Merge "Fix camera controls rotation for secure camera" into gb-ub-photos-carlsbad

10 years agoFix camera controls rotation for secure camera
Doris Liu [Tue, 17 Sep 2013 22:07:31 +0000 (15:07 -0700)]
Fix camera controls rotation for secure camera

Bug: 8878379
Change-Id: I80b06d98010dbed14a46994f365d1fbb9aa8ba49

10 years agoam 7315a189: am c2497d0a: Merge "Show dialog when camera device is not connected...
Angus Kong [Tue, 17 Sep 2013 21:57:40 +0000 (14:57 -0700)]
am 7315a189: am c2497d0a: Merge "Show dialog when camera device is not connected." into gb-ub-photos-carlsbad

* commit '7315a189fc166735ae46261e99e9da81baaa7936':
  Show dialog when camera device is not connected.

10 years agoam c2497d0a: Merge "Show dialog when camera device is not connected." into gb-ub...
Angus Kong [Tue, 17 Sep 2013 21:53:38 +0000 (14:53 -0700)]
am c2497d0a: Merge "Show dialog when camera device is not connected." into gb-ub-photos-carlsbad

* commit 'c2497d0a7213a3c105ec312f12b0f8b00347d5e5':
  Show dialog when camera device is not connected.

10 years agoMerge "Show dialog when camera device is not connected." into gb-ub-photos-carlsbad
Angus Kong [Tue, 17 Sep 2013 21:51:50 +0000 (21:51 +0000)]
Merge "Show dialog when camera device is not connected." into gb-ub-photos-carlsbad

10 years agoShow dialog when camera device is not connected.
Angus Kong [Mon, 16 Sep 2013 21:25:35 +0000 (14:25 -0700)]
Show dialog when camera device is not connected.

  bug:10726516

Change-Id: I3d3433d0b2eced54027b19910473fd55135d0e1c

10 years agoam a4c33574: am 828c9190: Merge "Use a new Intent to work around issues in framework...
ztenghui [Tue, 17 Sep 2013 20:59:40 +0000 (13:59 -0700)]
am a4c33574: am 828c9190: Merge "Use a new Intent to work around issues in framework" into gb-ub-photos-carlsbad

* commit 'a4c33574b2bd70a1a04b0aac58ee97c3d022fc5e':
  Use a new Intent to work around issues in framework

10 years agoam 828c9190: Merge "Use a new Intent to work around issues in framework" into gb...
ztenghui [Tue, 17 Sep 2013 20:55:16 +0000 (13:55 -0700)]
am 828c9190: Merge "Use a new Intent to work around issues in framework" into gb-ub-photos-carlsbad

* commit '828c9190aafc9b57126f5a4868e5cee922cf9f2c':
  Use a new Intent to work around issues in framework

10 years agoMerge "Use a new Intent to work around issues in framework" into gb-ub-photos-carlsbad
ztenghui [Tue, 17 Sep 2013 20:53:32 +0000 (20:53 +0000)]
Merge "Use a new Intent to work around issues in framework" into gb-ub-photos-carlsbad

10 years agoUse a new Intent to work around issues in framework
ztenghui [Tue, 17 Sep 2013 18:33:02 +0000 (11:33 -0700)]
Use a new Intent to work around issues in framework

Framework didn't update the action provider if reusing the intent object.
The work around is creating new intents here.

bug:10713267

Change-Id: Iee64e84e191c8c2c2377fb5b9b95a91dae3c445c

10 years agoam d313b92c: (-s ours) am 53304d69: (-s ours) Merge "Import translations. DO NOT...
Baligh Uddin [Tue, 17 Sep 2013 04:25:55 +0000 (21:25 -0700)]
am d313b92c: (-s ours) am 53304d69: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-carlsbad

* commit 'd313b92c73257a7427945acdf66a861afb188b0d':
  Import translations. DO NOT MERGE

10 years agoam f72f347c: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Tue, 17 Sep 2013 04:22:24 +0000 (21:22 -0700)]
am f72f347c: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit 'f72f347cae1ab00203d7e8bd374a7079d3ee5d05':
  Import translations. DO NOT MERGE

10 years agoam 53304d69: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos...
Baligh Uddin [Tue, 17 Sep 2013 04:21:26 +0000 (21:21 -0700)]
am 53304d69: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-carlsbad

* commit '53304d6953ff8f09a51c1128b7a0f3921e45b651':
  Import translations. DO NOT MERGE

10 years agoMerge "Import translations. DO NOT MERGE" into gb-ub-photos-carlsbad
Baligh Uddin [Tue, 17 Sep 2013 04:18:23 +0000 (04:18 +0000)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-carlsbad

10 years agoMerge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Tue, 17 Sep 2013 04:17:42 +0000 (04:17 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev

10 years agoam 987a17d0: am 2065e606: Merge "Fix zoom for images with orientation tag" into gb...
Doris Liu [Tue, 17 Sep 2013 01:51:49 +0000 (18:51 -0700)]
am 987a17d0: am 2065e606: Merge "Fix zoom for images with orientation tag" into gb-ub-photos-carlsbad

* commit '987a17d0c926fd665ff57e20df744b6424b442c0':
  Fix zoom for images with orientation tag

10 years agoam 2065e606: Merge "Fix zoom for images with orientation tag" into gb-ub-photos-carlsbad
Doris Liu [Tue, 17 Sep 2013 01:48:59 +0000 (18:48 -0700)]
am 2065e606: Merge "Fix zoom for images with orientation tag" into gb-ub-photos-carlsbad

* commit '2065e606b68f7e8532317f076c7f688a2093186d':
  Fix zoom for images with orientation tag

10 years agoMerge "Fix zoom for images with orientation tag" into gb-ub-photos-carlsbad
Doris Liu [Tue, 17 Sep 2013 01:47:01 +0000 (01:47 +0000)]
Merge "Fix zoom for images with orientation tag" into gb-ub-photos-carlsbad

10 years agoam 1dffcefa: am 5bee41c6: Merge "Set correct alpha for views in filmstrip." into...
Angus Kong [Tue, 17 Sep 2013 01:37:15 +0000 (18:37 -0700)]
am 1dffcefa: am 5bee41c6: Merge "Set correct alpha for views in filmstrip." into gb-ub-photos-carlsbad

* commit '1dffcefae388b4ea643150b4a077c668e8e765a2':
  Set correct alpha for views in filmstrip.

10 years agoFix zoom for images with orientation tag
Doris Liu [Mon, 16 Sep 2013 20:38:24 +0000 (13:38 -0700)]
Fix zoom for images with orientation tag

Bug: 10780042
Change-Id: I518bf8a6e2b53647398180e60b55533960ebe318

10 years agoam 5bee41c6: Merge "Set correct alpha for views in filmstrip." into gb-ub-photos...
Angus Kong [Tue, 17 Sep 2013 01:34:52 +0000 (18:34 -0700)]
am 5bee41c6: Merge "Set correct alpha for views in filmstrip." into gb-ub-photos-carlsbad

* commit '5bee41c6d727c730c7b10fba886862284a489257':
  Set correct alpha for views in filmstrip.

10 years agoMerge "Set correct alpha for views in filmstrip." into gb-ub-photos-carlsbad
Angus Kong [Tue, 17 Sep 2013 01:33:24 +0000 (01:33 +0000)]
Merge "Set correct alpha for views in filmstrip." into gb-ub-photos-carlsbad

10 years agoam 38cea6cf: am 3d91d906: Add HQ and HD strings.
Sascha Haeberling [Tue, 17 Sep 2013 01:06:28 +0000 (18:06 -0700)]
am 38cea6cf: am 3d91d906: Add HQ and HD strings.

* commit '38cea6cfee607493adfea682e13d0814fe26714c':
  Add HQ and HD strings.

10 years agoam 3d91d906: Add HQ and HD strings.
Sascha Haeberling [Tue, 17 Sep 2013 01:04:44 +0000 (18:04 -0700)]
am 3d91d906: Add HQ and HD strings.

* commit '3d91d906fa288923b0d307f8333af89699303528':
  Add HQ and HD strings.

10 years agoAdd HQ and HD strings.
Sascha Haeberling [Mon, 16 Sep 2013 22:41:58 +0000 (15:41 -0700)]
Add HQ and HD strings.

  Bug: 10785988

Change-Id: Idc76e1888cb91d3ec6b56657f38f7422a2df7e43

10 years agoSet correct alpha for views in filmstrip.
Angus Kong [Sat, 14 Sep 2013 01:09:18 +0000 (18:09 -0700)]
Set correct alpha for views in filmstrip.

  bug:10713813

Change-Id: I2715b7c3ecb2e0c995e8f66e710c91561e9cf231

10 years agoAdding a simple done handler interface.
Sascha Haeberling [Mon, 16 Sep 2013 21:07:11 +0000 (14:07 -0700)]
Adding a simple done handler interface.

  Bug: 10747001

Needed by http://ag/360619

Change-Id: I942cb601391a8cdd2c30ea152415f56d38fd0918

10 years agoam 9ca0842a: am d688c0c3: Merge "Fix flicker when zooming images smaller than screen...
Doris Liu [Mon, 16 Sep 2013 20:29:02 +0000 (13:29 -0700)]
am 9ca0842a: am d688c0c3: Merge "Fix flicker when zooming images smaller than screen" into gb-ub-photos-carlsbad

* commit '9ca0842a2ba0ac2f848942fe4e5d1d80e7510588':
  Fix flicker when zooming images smaller than screen

10 years agoam f546cdbd: am c2915695: Avoid expensive O(n) main-thread operation when adding...
Sascha Haeberling [Mon, 16 Sep 2013 20:29:02 +0000 (13:29 -0700)]
am f546cdbd: am c2915695: Avoid expensive O(n) main-thread operation when adding Photo Sphere.

* commit 'f546cdbd24b9576c416204b83914c87a111641d7':
  Avoid expensive O(n) main-thread operation when adding Photo Sphere.

10 years agoam d688c0c3: Merge "Fix flicker when zooming images smaller than screen" into gb...
Doris Liu [Mon, 16 Sep 2013 20:24:40 +0000 (13:24 -0700)]
am d688c0c3: Merge "Fix flicker when zooming images smaller than screen" into gb-ub-photos-carlsbad

* commit 'd688c0c31d4287c03b664f6fca5c6498a1e4bd7d':
  Fix flicker when zooming images smaller than screen

10 years agoam c2915695: Avoid expensive O(n) main-thread operation when adding Photo Sphere.
Sascha Haeberling [Mon, 16 Sep 2013 20:24:40 +0000 (13:24 -0700)]
am c2915695: Avoid expensive O(n) main-thread operation when adding Photo Sphere.

* commit 'c29156954bcbf0218a78c308c3ba8f25e00aeecc':
  Avoid expensive O(n) main-thread operation when adding Photo Sphere.

10 years agoMerge "Fix flicker when zooming images smaller than screen" into gb-ub-photos-carlsbad
Doris Liu [Mon, 16 Sep 2013 20:22:55 +0000 (20:22 +0000)]
Merge "Fix flicker when zooming images smaller than screen" into gb-ub-photos-carlsbad

10 years agoAvoid expensive O(n) main-thread operation when adding Photo Sphere.
Sascha Haeberling [Mon, 16 Sep 2013 18:04:25 +0000 (11:04 -0700)]
Avoid expensive O(n) main-thread operation when adding Photo Sphere.

  Bug: 10747001

Change-Id: I8dcc3c5e7dd12879a927aa82e71bea0c6370ccda

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Mon, 16 Sep 2013 19:59:09 +0000 (12:59 -0700)]
Import translations. DO NOT MERGE

Change-Id: Iab05e7410b6829ad7934d71024fee3e1e2d77f8f
Auto-generated-cl: translation import

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Mon, 16 Sep 2013 19:48:25 +0000 (12:48 -0700)]
Import translations. DO NOT MERGE

Change-Id: Ib51b9e17820f90dcc176c4f8196d60bca3b0d0a5
Auto-generated-cl: translation import

10 years agoFix flicker when zooming images smaller than screen
Doris Liu [Mon, 16 Sep 2013 19:21:21 +0000 (12:21 -0700)]
Fix flicker when zooming images smaller than screen

Bug: 10733300
Change-Id: Ifa753722132b1fd81265b5fc105a0b96602b6fd2

10 years agoam 0f9a86d8: (-s ours) am d095b79d: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Sat, 14 Sep 2013 20:48:33 +0000 (13:48 -0700)]
am 0f9a86d8: (-s ours) am d095b79d: (-s ours) Import translations. DO NOT MERGE

* commit '0f9a86d86436d05529c9f1a73ed48771362adb5f':
  Import translations. DO NOT MERGE

10 years agoam d095b79d: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Sat, 14 Sep 2013 20:45:24 +0000 (13:45 -0700)]
am d095b79d: (-s ours) Import translations. DO NOT MERGE

* commit 'd095b79d083440e20d683ddb05ff8477159ee38f':
  Import translations. DO NOT MERGE

10 years agoam d5fc134e: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Sat, 14 Sep 2013 20:05:02 +0000 (13:05 -0700)]
am d5fc134e: (-s ours) Import translations. DO NOT MERGE

* commit 'd5fc134e66a3ea232ea450d91c8da6fae54430d2':
  Import translations. DO NOT MERGE

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Sat, 14 Sep 2013 07:47:58 +0000 (00:47 -0700)]
Import translations. DO NOT MERGE

Change-Id: I66cd67cee8d92b6c594ad9f19d217a1a4cceae44
Auto-generated-cl: translation import

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Sat, 14 Sep 2013 07:38:11 +0000 (00:38 -0700)]
Import translations. DO NOT MERGE

Change-Id: Icb32a9036f201b08701bfeea02cbf38552b1f24e
Auto-generated-cl: translation import

10 years agoam 14bbdd6a: am 44974d4b: Don\'t show menu/indicators in wide-angle mode.
Angus Kong [Sat, 14 Sep 2013 00:16:02 +0000 (17:16 -0700)]
am 14bbdd6a: am 44974d4b: Don\'t show menu/indicators in wide-angle mode.

* commit '14bbdd6a5b304abdcbef0ad3a2a2ab0459cd3a37':
  Don't show menu/indicators in wide-angle mode.

10 years agoam 51da31a9: am 7e1e10f3: Merge "Fix potential deadlock while rendering the preview...
Sascha Haeberling [Sat, 14 Sep 2013 00:14:28 +0000 (17:14 -0700)]
am 51da31a9: am 7e1e10f3: Merge "Fix potential deadlock while rendering the preview." into gb-ub-photos-carlsbad

* commit '51da31a916633a6bf9b7a4f52f7341da86ea2595':
  Fix potential deadlock while rendering the preview.

10 years agoam b3804596: am a29e0bfc: Merge "Always leave full-screen when swip from camera....
Angus Kong [Sat, 14 Sep 2013 00:14:21 +0000 (17:14 -0700)]
am b3804596: am a29e0bfc: Merge "Always leave full-screen when swip from camera." into gb-ub-photos-carlsbad

* commit 'b3804596c874387c83ab37d4ba489daed98af1c1':
  Always leave full-screen when swip from camera.

10 years agoam 44974d4b: Don\'t show menu/indicators in wide-angle mode.
Angus Kong [Fri, 13 Sep 2013 23:43:54 +0000 (16:43 -0700)]
am 44974d4b: Don\'t show menu/indicators in wide-angle mode.

* commit '44974d4b8014ec1f3c8ef1b9d77aae990bbba821':
  Don't show menu/indicators in wide-angle mode.

10 years agoDon't show menu/indicators in wide-angle mode.
Angus Kong [Fri, 13 Sep 2013 21:55:31 +0000 (14:55 -0700)]
Don't show menu/indicators in wide-angle mode.

  bug:10674078

Change-Id: I08edd11ead1c71cd6b81274938c92f788c039a8f

10 years agoam 7e1e10f3: Merge "Fix potential deadlock while rendering the preview." into gb...
Sascha Haeberling [Fri, 13 Sep 2013 21:28:15 +0000 (14:28 -0700)]
am 7e1e10f3: Merge "Fix potential deadlock while rendering the preview." into gb-ub-photos-carlsbad

* commit '7e1e10f34dcb77566d0551b7fb8b0b4e7e18ca25':
  Fix potential deadlock while rendering the preview.