OSDN Git Service

android-x86/packages-apps-Camera2.git
9 years agoam 43e9ced1: (-s ours) am ea4dc6fc: (-s ours) am 718859d8: (-s ours) am 0462d5b1...
Geoff Mendal [Tue, 14 Jul 2015 17:15:27 +0000 (17:15 +0000)]
am 43e9ced1: (-s ours) am ea4dc6fc: (-s ours) am 718859d8: (-s ours) am 0462d5b1: (-s ours) Import translations. DO NOT MERGE

* commit '43e9ced15a6e69ca18392521e411b7042ce8fcda':
  Import translations. DO NOT MERGE

9 years agoam af820139: am 4bbdfc81: am ca758103: am c9b45d41: am 01c3f7ad: am e25f675a: Shorten...
Alan Newberger [Tue, 14 Jul 2015 17:15:26 +0000 (17:15 +0000)]
am af820139: am 4bbdfc81: am ca758103: am c9b45d41: am 01c3f7ad: am e25f675a: Shorten location startup dialog string

* commit 'af82013931eb7e2d9601228c076d097d4116df10':
  Shorten location startup dialog string

9 years agoam ea4dc6fc: (-s ours) am 718859d8: (-s ours) am 0462d5b1: (-s ours) Import translati...
Geoff Mendal [Tue, 14 Jul 2015 00:42:19 +0000 (00:42 +0000)]
am ea4dc6fc: (-s ours) am 718859d8: (-s ours) am 0462d5b1: (-s ours) Import translations. DO NOT MERGE

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

9 years agoam 4bbdfc81: am ca758103: am c9b45d41: am 01c3f7ad: am e25f675a: Shorten location...
Alan Newberger [Tue, 14 Jul 2015 00:42:18 +0000 (00:42 +0000)]
am 4bbdfc81: am ca758103: am c9b45d41: am 01c3f7ad: am e25f675a: Shorten location startup dialog string

* commit '4bbdfc81dd9302f9ad2359e50e8fa73a42bcee14':
  Shorten location startup dialog string

9 years agoam 718859d8: (-s ours) am 0462d5b1: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Mon, 13 Jul 2015 23:37:29 +0000 (23:37 +0000)]
am 718859d8: (-s ours) am 0462d5b1: (-s ours) Import translations. DO NOT MERGE

* commit '718859d892a1b0fae7cfe470e42a028f46da9000':
  Import translations. DO NOT MERGE

9 years agoam ca758103: am c9b45d41: am 01c3f7ad: am e25f675a: Shorten location startup dialog...
Alan Newberger [Mon, 13 Jul 2015 23:34:32 +0000 (23:34 +0000)]
am ca758103: am c9b45d41: am 01c3f7ad: am e25f675a: Shorten location startup dialog string

* commit 'ca758103543d7f5145ee93e876b7cf5b17b0fb37':
  Shorten location startup dialog string

9 years agoam 0462d5b1: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Mon, 13 Jul 2015 23:00:22 +0000 (23:00 +0000)]
am 0462d5b1: (-s ours) Import translations. DO NOT MERGE

* commit '0462d5b16c7e6c00ecc6bf74df57fca7ba5a3c19':
  Import translations. DO NOT MERGE

9 years agoam c9b45d41: am 01c3f7ad: am e25f675a: Shorten location startup dialog string
Alan Newberger [Mon, 13 Jul 2015 22:30:17 +0000 (22:30 +0000)]
am c9b45d41: am 01c3f7ad: am e25f675a: Shorten location startup dialog string

* commit 'c9b45d41b93f0e31ed88cf22db387006b8219333':
  Shorten location startup dialog string

9 years agoam b0ffb4f9: (-s ours) am aecc99f4: (-s ours) am 1fee657d: (-s ours) Import translati...
Geoff Mendal [Mon, 13 Jul 2015 15:43:46 +0000 (15:43 +0000)]
am b0ffb4f9: (-s ours) am aecc99f4: (-s ours) am 1fee657d: (-s ours) Import translations. DO NOT MERGE

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

9 years agoam aecc99f4: (-s ours) am 1fee657d: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Mon, 13 Jul 2015 15:31:37 +0000 (15:31 +0000)]
am aecc99f4: (-s ours) am 1fee657d: (-s ours) Import translations. DO NOT MERGE

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

9 years agoam 1fee657d: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Mon, 13 Jul 2015 15:09:29 +0000 (15:09 +0000)]
am 1fee657d: (-s ours) Import translations. DO NOT MERGE

* commit '1fee657d480865262f8e4659624b1ae40f2963a6':
  Import translations. DO NOT MERGE

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Sat, 11 Jul 2015 16:51:55 +0000 (09:51 -0700)]
Import translations. DO NOT MERGE

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

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Sat, 11 Jul 2015 12:24:20 +0000 (05:24 -0700)]
Import translations. DO NOT MERGE

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

9 years agoam 01c3f7ad: am e25f675a: Shorten location startup dialog string
Alan Newberger [Sat, 11 Jul 2015 00:34:29 +0000 (00:34 +0000)]
am 01c3f7ad: am e25f675a: Shorten location startup dialog string

* commit '01c3f7adc5ee35ecd6ad226ad91a03017c0ad4a0':
  Shorten location startup dialog string

9 years agoam e25f675a: Shorten location startup dialog string
Alan Newberger [Sat, 11 Jul 2015 00:28:45 +0000 (00:28 +0000)]
am e25f675a: Shorten location startup dialog string

* commit 'e25f675a189f56df57d08b62fa3604843dfee4a8':
  Shorten location startup dialog string

9 years agoShorten location startup dialog string
Alan Newberger [Fri, 10 Jul 2015 23:46:40 +0000 (16:46 -0700)]
Shorten location startup dialog string

BUG=21706101

Change-Id: I66164d43830cb71bb3a24f0f996a533358cb7d7e

9 years agoam de893a7b: am b92d395a: am 981eb996: am ade8896d: am 2fc4970c: am 00720781: Null...
Alan Newberger [Fri, 10 Jul 2015 17:42:07 +0000 (17:42 +0000)]
am de893a7b: am b92d395a: am 981eb996: am ade8896d: am 2fc4970c: am 00720781: Null check when evaluating valid resolution size

* commit 'de893a7b6795703ea2f05f609264c4fc7917ce09':
  Null check when evaluating valid resolution size

9 years agoam b92d395a: am 981eb996: am ade8896d: am 2fc4970c: am 00720781: Null check when...
Alan Newberger [Fri, 10 Jul 2015 17:30:02 +0000 (17:30 +0000)]
am b92d395a: am 981eb996: am ade8896d: am 2fc4970c: am 00720781: Null check when evaluating valid resolution size

* commit 'b92d395a9a3ac5a9b88b872f0f9621ba8e83cf40':
  Null check when evaluating valid resolution size

9 years agoam 981eb996: am ade8896d: am 2fc4970c: am 00720781: Null check when evaluating valid...
Alan Newberger [Fri, 10 Jul 2015 17:15:34 +0000 (17:15 +0000)]
am 981eb996: am ade8896d: am 2fc4970c: am 00720781: Null check when evaluating valid resolution size

* commit '981eb996de64e9e798fa76c59e50d52e6dc1aa8f':
  Null check when evaluating valid resolution size

9 years agoam ade8896d: am 2fc4970c: am 00720781: Null check when evaluating valid resolution...
Alan Newberger [Fri, 10 Jul 2015 17:06:43 +0000 (17:06 +0000)]
am ade8896d: am 2fc4970c: am 00720781: Null check when evaluating valid resolution size

* commit 'ade8896d12cb0c250c24e38e81848f5fb9032310':
  Null check when evaluating valid resolution size

9 years agoam 2fc4970c: am 00720781: Null check when evaluating valid resolution size
Alan Newberger [Fri, 10 Jul 2015 16:55:18 +0000 (16:55 +0000)]
am 2fc4970c: am 00720781: Null check when evaluating valid resolution size

* commit '2fc4970c2631ec5593c4566a72d4524014b49a29':
  Null check when evaluating valid resolution size

9 years agoam 00720781: Null check when evaluating valid resolution size
Alan Newberger [Fri, 10 Jul 2015 16:48:42 +0000 (16:48 +0000)]
am 00720781: Null check when evaluating valid resolution size

* commit '00720781f6703de532ddbc05238db5bf5fd7cd2d':
  Null check when evaluating valid resolution size

9 years agoNull check when evaluating valid resolution size
Alan Newberger [Fri, 10 Jul 2015 16:39:13 +0000 (09:39 -0700)]
Null check when evaluating valid resolution size

Guard against nonexistent size so that logic to reset size
preference can proceed

BUG=22396405

Change-Id: Id508713ef91f632867366934e72fe939a839e228

9 years agoam b331ac92: am b7142d73: am c28abdb8: am dfd3ecb1: am 148d0b8e: Launch PermissionsAc...
zafir [Thu, 9 Jul 2015 02:00:53 +0000 (02:00 +0000)]
am b331ac92: am b7142d73: am c28abdb8: am dfd3ecb1: am 148d0b8e: Launch PermissionsActivity if CameraActivity resume is called without critical permissions.

* commit 'b331ac923532972160582bdd960936b5e9a0c149':
  Launch PermissionsActivity if CameraActivity resume is called without critical permissions.

9 years agoam b7142d73: am c28abdb8: am dfd3ecb1: am 148d0b8e: Launch PermissionsActivity if...
zafir [Thu, 9 Jul 2015 01:48:58 +0000 (01:48 +0000)]
am b7142d73: am c28abdb8: am dfd3ecb1: am 148d0b8e: Launch PermissionsActivity if CameraActivity resume is called without critical permissions.

* commit 'b7142d73e83a27aba7f874c2f79c2b66d221c8a0':
  Launch PermissionsActivity if CameraActivity resume is called without critical permissions.

9 years agoam c28abdb8: am dfd3ecb1: am 148d0b8e: Launch PermissionsActivity if CameraActivity...
zafir [Thu, 9 Jul 2015 01:35:27 +0000 (01:35 +0000)]
am c28abdb8: am dfd3ecb1: am 148d0b8e: Launch PermissionsActivity if CameraActivity resume is called without critical permissions.

* commit 'c28abdb81256db38f8a6ee4780d7e3d091d65991':
  Launch PermissionsActivity if CameraActivity resume is called without critical permissions.

9 years agoam dfd3ecb1: am 148d0b8e: Launch PermissionsActivity if CameraActivity resume is...
zafir [Thu, 9 Jul 2015 01:21:54 +0000 (01:21 +0000)]
am dfd3ecb1: am 148d0b8e: Launch PermissionsActivity if CameraActivity resume is called without critical permissions.

* commit 'dfd3ecb1b6bbec03d419b3a65a10dd344ae5dbc3':
  Launch PermissionsActivity if CameraActivity resume is called without critical permissions.

9 years agoam 148d0b8e: Launch PermissionsActivity if CameraActivity resume is called without...
zafir [Thu, 9 Jul 2015 01:12:05 +0000 (01:12 +0000)]
am 148d0b8e: Launch PermissionsActivity if CameraActivity resume is called without critical permissions.

* commit '148d0b8e3fd412fa6a666e75484fe6b7e0465f5a':
  Launch PermissionsActivity if CameraActivity resume is called without critical permissions.

9 years agoLaunch PermissionsActivity if CameraActivity resume is called without critical permis...
zafir [Wed, 8 Jul 2015 23:12:02 +0000 (16:12 -0700)]
Launch PermissionsActivity if CameraActivity resume is called without critical permissions.

Bug: 22358833
Change-Id: I5c189d4976b9355d531e028ecc163bb67bae6987

9 years agoam 2e6fe290: am c5a1f6cf: am b01de9c3: am 6e0e81f3: am 5c8c7d3c: Clear permissions...
Alan Newberger [Wed, 8 Jul 2015 20:47:11 +0000 (20:47 +0000)]
am 2e6fe290: am c5a1f6cf: am b01de9c3: am 6e0e81f3: am 5c8c7d3c: Clear permissions check after successful PermissionsActivity

* commit '2e6fe290943702e78a55b063bf25b2473291e2a9':
  Clear permissions check after successful PermissionsActivity

9 years agoam c5a1f6cf: am b01de9c3: am 6e0e81f3: am 5c8c7d3c: Clear permissions check after...
Alan Newberger [Wed, 8 Jul 2015 20:30:41 +0000 (20:30 +0000)]
am c5a1f6cf: am b01de9c3: am 6e0e81f3: am 5c8c7d3c: Clear permissions check after successful PermissionsActivity

* commit 'c5a1f6cf4e13bcad4fd7b29631cd20d67d70c75e':
  Clear permissions check after successful PermissionsActivity

9 years agoam b01de9c3: am 6e0e81f3: am 5c8c7d3c: Clear permissions check after successful Permi...
Alan Newberger [Wed, 8 Jul 2015 20:16:53 +0000 (20:16 +0000)]
am b01de9c3: am 6e0e81f3: am 5c8c7d3c: Clear permissions check after successful PermissionsActivity

* commit 'b01de9c315cd69ee995d034475e5470c677b3105':
  Clear permissions check after successful PermissionsActivity

9 years agoam 6e0e81f3: am 5c8c7d3c: Clear permissions check after successful PermissionsActivity
Alan Newberger [Wed, 8 Jul 2015 20:07:55 +0000 (20:07 +0000)]
am 6e0e81f3: am 5c8c7d3c: Clear permissions check after successful PermissionsActivity

* commit '6e0e81f33fb78722474ee139c99c8f2e94af5592':
  Clear permissions check after successful PermissionsActivity

9 years agoam 5c8c7d3c: Clear permissions check after successful PermissionsActivity
Alan Newberger [Wed, 8 Jul 2015 19:59:53 +0000 (19:59 +0000)]
am 5c8c7d3c: Clear permissions check after successful PermissionsActivity

* commit '5c8c7d3c86a866fc955d2cf2e6c3ed5e49d1d233':
  Clear permissions check after successful PermissionsActivity

9 years agoClear permissions check after successful PermissionsActivity
Alan Newberger [Wed, 8 Jul 2015 19:42:04 +0000 (12:42 -0700)]
Clear permissions check after successful PermissionsActivity

If the permissions activity indicates the user was successful,
mark mHasCriticalPermissions true to allow the app to resume normally.

BUG=22347017

Change-Id: I6b9bdd02382d071530529a08e8f8fe7faf02fe3b

9 years agoam 141346ab: am e2a6302c: am b462c3ca: am f2bdf276: am c2d5d078: Restrict permission...
Alan Newberger [Wed, 8 Jul 2015 19:07:34 +0000 (19:07 +0000)]
am 141346ab: am e2a6302c: am b462c3ca: am f2bdf276: am c2d5d078: Restrict permission checks to M devices

* commit '141346ab03824ebc3d40b4a92696e63ecda6040c':
  Restrict permission checks to M devices

9 years agoam e2a6302c: am b462c3ca: am f2bdf276: am c2d5d078: Restrict permission checks to...
Alan Newberger [Wed, 8 Jul 2015 18:51:59 +0000 (18:51 +0000)]
am e2a6302c: am b462c3ca: am f2bdf276: am c2d5d078: Restrict permission checks to M devices

* commit 'e2a6302cc3e897b73c4dc8e629d2f747cf679390':
  Restrict permission checks to M devices

9 years agoam b462c3ca: am f2bdf276: am c2d5d078: Restrict permission checks to M devices
Alan Newberger [Wed, 8 Jul 2015 18:36:59 +0000 (18:36 +0000)]
am b462c3ca: am f2bdf276: am c2d5d078: Restrict permission checks to M devices

* commit 'b462c3ca45c1daafa1b2bb4461959b55734cf544':
  Restrict permission checks to M devices

9 years agoam f2bdf276: am c2d5d078: Restrict permission checks to M devices
Alan Newberger [Wed, 8 Jul 2015 18:19:47 +0000 (18:19 +0000)]
am f2bdf276: am c2d5d078: Restrict permission checks to M devices

* commit 'f2bdf2767617415e476ecab683e1fc05704174e7':
  Restrict permission checks to M devices

9 years agoam c2d5d078: Restrict permission checks to M devices
Alan Newberger [Wed, 8 Jul 2015 18:11:50 +0000 (18:11 +0000)]
am c2d5d078: Restrict permission checks to M devices

* commit 'c2d5d078821ca5e8de0c0d03b6603bf7c505c53f':
  Restrict permission checks to M devices

9 years agoRestrict permission checks to M devices
Alan Newberger [Wed, 8 Jul 2015 16:51:04 +0000 (09:51 -0700)]
Restrict permission checks to M devices

Add an ApiHelper check and only call checkSelfPermission if we
are on M and the methods exist.

BUG=22345681

Change-Id: Icda8d40057b5492502858ced731a749a2f66abf8

9 years agoam 0f3288e3: (-s ours) am 342ebca3: (-s ours) am 3f3dfcb1: (-s ours) am ccb925b1...
Geoff Mendal [Wed, 8 Jul 2015 13:57:38 +0000 (13:57 +0000)]
am 0f3288e3: (-s ours) am 342ebca3: (-s ours) am 3f3dfcb1: (-s ours) am ccb925b1: (-s ours) am a5380779: (-s ours) Import translations. DO NOT MERGE

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

9 years agoam 533e0b6c: (-s ours) am 0a8c14f8: (-s ours) am 03d7cde4: (-s ours) am a532005c...
Geoff Mendal [Wed, 8 Jul 2015 13:57:37 +0000 (13:57 +0000)]
am 533e0b6c: (-s ours) am 0a8c14f8: (-s ours) am 03d7cde4: (-s ours) am a532005c: (-s ours) Import translations. DO NOT MERGE

* commit '533e0b6ca76c1a8df1ce5a51299829ef2df611fb':
  Import translations. DO NOT MERGE

9 years agoam 342ebca3: (-s ours) am 3f3dfcb1: (-s ours) am ccb925b1: (-s ours) am a5380779...
Geoff Mendal [Wed, 8 Jul 2015 13:44:40 +0000 (13:44 +0000)]
am 342ebca3: (-s ours) am 3f3dfcb1: (-s ours) am ccb925b1: (-s ours) am a5380779: (-s ours) Import translations. DO NOT MERGE

* commit '342ebca36172e67dfcb6d7c96f61765ab4075d4f':
  Import translations. DO NOT MERGE

9 years agoam 0a8c14f8: (-s ours) am 03d7cde4: (-s ours) am a532005c: (-s ours) Import translati...
Geoff Mendal [Wed, 8 Jul 2015 13:44:39 +0000 (13:44 +0000)]
am 0a8c14f8: (-s ours) am 03d7cde4: (-s ours) am a532005c: (-s ours) Import translations. DO NOT MERGE

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

9 years agoam 3f3dfcb1: (-s ours) am ccb925b1: (-s ours) am a5380779: (-s ours) Import translati...
Geoff Mendal [Wed, 8 Jul 2015 13:31:15 +0000 (13:31 +0000)]
am 3f3dfcb1: (-s ours) am ccb925b1: (-s ours) am a5380779: (-s ours) Import translations. DO NOT MERGE

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

9 years agoam 03d7cde4: (-s ours) am a532005c: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Wed, 8 Jul 2015 13:31:14 +0000 (13:31 +0000)]
am 03d7cde4: (-s ours) am a532005c: (-s ours) Import translations. DO NOT MERGE

* commit '03d7cde4c5ba0eb4195b7b91266ef10c3e85a574':
  Import translations. DO NOT MERGE

9 years agoam ccb925b1: (-s ours) am a5380779: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Wed, 8 Jul 2015 13:24:12 +0000 (13:24 +0000)]
am ccb925b1: (-s ours) am a5380779: (-s ours) Import translations. DO NOT MERGE

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

9 years agoam a532005c: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Wed, 8 Jul 2015 13:15:12 +0000 (13:15 +0000)]
am a532005c: (-s ours) Import translations. DO NOT MERGE

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

9 years agoam a5380779: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Wed, 8 Jul 2015 13:13:52 +0000 (13:13 +0000)]
am a5380779: (-s ours) Import translations. DO NOT MERGE

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

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Wed, 8 Jul 2015 13:02:29 +0000 (06:02 -0700)]
Import translations. DO NOT MERGE

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

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Wed, 8 Jul 2015 13:01:30 +0000 (06:01 -0700)]
Import translations. DO NOT MERGE

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

9 years agoam b03e914a: am 2b4101fe: am ad44cda8: Minimum viable Android M runtime permissions...
zafir [Tue, 7 Jul 2015 02:33:54 +0000 (02:33 +0000)]
am b03e914a: am 2b4101fe: am ad44cda8: Minimum viable Android M runtime permissions handling for H.

* commit 'b03e914a5e889fb140553d0a33a69a5c1ddbf896':
  Minimum viable Android M runtime permissions handling for H.

9 years agoam 2b4101fe: am ad44cda8: Minimum viable Android M runtime permissions handling for H.
zafir [Tue, 7 Jul 2015 02:21:44 +0000 (02:21 +0000)]
am 2b4101fe: am ad44cda8: Minimum viable Android M runtime permissions handling for H.

* commit '2b4101fe49818cc4b71105386820c9d753ca5aaa':
  Minimum viable Android M runtime permissions handling for H.

9 years agoam ad44cda8: Minimum viable Android M runtime permissions handling for H.
zafir [Tue, 7 Jul 2015 01:38:02 +0000 (01:38 +0000)]
am ad44cda8: Minimum viable Android M runtime permissions handling for H.

* commit 'ad44cda82fe6ec5ee090115129223c6314f9e1bb':
  Minimum viable Android M runtime permissions handling for H.

9 years agoMinimum viable Android M runtime permissions handling for H.
zafir [Mon, 29 Jun 2015 05:08:22 +0000 (00:08 -0500)]
Minimum viable Android M runtime permissions handling for H.

Creates new activity for permissions handling: both checking
for permissions and handling error condition when critical
permissions are not present. The reason for creating a
new activity is so the app does not attempt to continue
executing OnCreate, OnResume etc, which opens
the camera while the dialogs are showing. This should
not slow the app down because the permissions activity
will only run when a) the first time the app has
insufficient permissions and b) when a critical
permission is missing and the app needs to shut down.

Bug: 21273463
Change-Id: I603acfb3057ba26b9cfa7935eb4cb24b5d547cb5

9 years agoam cfa12ed5: am 1cef126a: am fd6f316a: Merge "Ensure CaptureModule/API2 works without...
Alan Newberger [Mon, 29 Jun 2015 18:29:04 +0000 (18:29 +0000)]
am cfa12ed5: am 1cef126a: am fd6f316a: Merge "Ensure CaptureModule/API2 works without front camera" into ub-camera-haleakala

* commit 'cfa12ed54554c0dd7c96d404e6279f0fd7b4d04b':
  Ensure CaptureModule/API2 works without front camera

9 years agoam 1cef126a: am fd6f316a: Merge "Ensure CaptureModule/API2 works without front camera...
Alan Newberger [Mon, 29 Jun 2015 18:15:29 +0000 (18:15 +0000)]
am 1cef126a: am fd6f316a: Merge "Ensure CaptureModule/API2 works without front camera" into ub-camera-haleakala

* commit '1cef126a6de13b002f0caf55963fe0b48de00546':
  Ensure CaptureModule/API2 works without front camera

9 years agoam 6c296b2b: am 245239ba: am 62240e14: Merge "Update filmstrip item on metadata updat...
Alan Newberger [Mon, 29 Jun 2015 18:07:04 +0000 (18:07 +0000)]
am 6c296b2b: am 245239ba: am 62240e14: Merge "Update filmstrip item on metadata update" into ub-camera-haleakala

* commit '6c296b2b15abfb375e14c2cdbe353c28d05b7ae9':
  Update filmstrip item on metadata update

9 years agoam fd6f316a: Merge "Ensure CaptureModule/API2 works without front camera" into ub...
Alan Newberger [Mon, 29 Jun 2015 18:06:04 +0000 (18:06 +0000)]
am fd6f316a: Merge "Ensure CaptureModule/API2 works without front camera" into ub-camera-haleakala

* commit 'fd6f316adc5abfa071534642688bdf46f47a3925':
  Ensure CaptureModule/API2 works without front camera

9 years agoam 245239ba: am 62240e14: Merge "Update filmstrip item on metadata update" into ub...
Alan Newberger [Mon, 29 Jun 2015 18:00:11 +0000 (18:00 +0000)]
am 245239ba: am 62240e14: Merge "Update filmstrip item on metadata update" into ub-camera-haleakala

* commit '245239baa8ac24036f05716af4b2739b254846f6':
  Update filmstrip item on metadata update

9 years agoam 62240e14: Merge "Update filmstrip item on metadata update" into ub-camera-haleakala
Alan Newberger [Mon, 29 Jun 2015 17:52:46 +0000 (17:52 +0000)]
am 62240e14: Merge "Update filmstrip item on metadata update" into ub-camera-haleakala

* commit '62240e14e310aa06601b4d069f30c0190e7b5ef3':
  Update filmstrip item on metadata update

9 years agoMerge "Ensure CaptureModule/API2 works without front camera" into ub-camera-haleakala
Alan Newberger [Mon, 29 Jun 2015 17:49:25 +0000 (17:49 +0000)]
Merge "Ensure CaptureModule/API2 works without front camera" into ub-camera-haleakala

9 years agoMerge "Update filmstrip item on metadata update" into ub-camera-haleakala
Alan Newberger [Mon, 29 Jun 2015 17:32:35 +0000 (17:32 +0000)]
Merge "Update filmstrip item on metadata update" into ub-camera-haleakala

9 years agoam dc1a777d: am 75dcaf3b: am 04a9f8b6: Merge "Fix transform issue in CaptureIntent...
Senpo Hu [Sat, 27 Jun 2015 21:37:48 +0000 (21:37 +0000)]
am dc1a777d: am 75dcaf3b: am 04a9f8b6: Merge "Fix transform issue in CaptureIntent." into ub-camera-haleakala

* commit 'dc1a777d0a7e95d461fcc6d9c28a12def38afcb0':
  Fix transform issue in CaptureIntent.

9 years agoam 75dcaf3b: am 04a9f8b6: Merge "Fix transform issue in CaptureIntent." into ub-camer...
Senpo Hu [Sat, 27 Jun 2015 21:25:21 +0000 (21:25 +0000)]
am 75dcaf3b: am 04a9f8b6: Merge "Fix transform issue in CaptureIntent." into ub-camera-haleakala

* commit '75dcaf3bd47ec093f5805dc422dcdd397d2d0e1a':
  Fix transform issue in CaptureIntent.

9 years agoam 04a9f8b6: Merge "Fix transform issue in CaptureIntent." into ub-camera-haleakala
Senpo Hu [Sat, 27 Jun 2015 21:18:47 +0000 (21:18 +0000)]
am 04a9f8b6: Merge "Fix transform issue in CaptureIntent." into ub-camera-haleakala

* commit '04a9f8b68dfc636e5d2194af18cc2022e6b8354f':
  Fix transform issue in CaptureIntent.

9 years agoEnsure CaptureModule/API2 works without front camera
Alan Newberger [Thu, 25 Jun 2015 20:58:33 +0000 (13:58 -0700)]
Ensure CaptureModule/API2 works without front camera

Add a check in both first run dialogs, and the generated HardwareSpec,
so that front cameras are only used if detected.

BUG=21781461

Change-Id: I6844655b2fd3df90b649f5dfd6a006ef68dbf1da

9 years agoUpdate filmstrip item on metadata update
Alan Newberger [Thu, 25 Jun 2015 18:40:32 +0000 (11:40 -0700)]
Update filmstrip item on metadata update

Due to async metadata loading, when viewing an image progress bar,
after progress completion the main handler hiding progress bar would
also hide filmstrip buttons if in secure mode, but the async metadata
handler was calling a restricted handler that would only update the
controls, not hiding for secure, or updating overflow menu. This
change ensures all UI aspects of the item update are processed upon
metadata loading.

BUG=21499182

Change-Id: I92f22667d836d6ece6aa8427d967ec8e038b1e77

9 years agoMerge "Fix transform issue in CaptureIntent." into ub-camera-haleakala
Senpo Hu [Thu, 25 Jun 2015 17:32:49 +0000 (17:32 +0000)]
Merge "Fix transform issue in CaptureIntent." into ub-camera-haleakala

9 years agoFix transform issue in CaptureIntent.
Senpo Hu [Fri, 12 Jun 2015 23:20:46 +0000 (16:20 -0700)]
Fix transform issue in CaptureIntent.

On M, EventOnTextureViewLayoutChanged comes earlier during app
initialization in StateForeground which doesn't handle it. So
here in StateReadyForCapture, we pull the current preview layout
size and inform ResourceSurfaceTexture to allow it to calculate
transform.

Noted that we also need to bring this fix to Ivvavik.

Bug: 21786937
Bug: 20173626
Change-Id: I417aef2f09247e77059fc5b066cbf10602ce5cf1

9 years agoam a596ed32: am d3611d6a: AOSP Camera source should run camera2 API on M
Alan Newberger [Fri, 19 Jun 2015 22:48:32 +0000 (22:48 +0000)]
am a596ed32: am d3611d6a: AOSP Camera source should run camera2 API on M

* commit 'a596ed322aacf2ba005c95d4ae536ddb5f00a6c6':
  AOSP Camera source should run camera2 API on M

9 years agoam d3611d6a: AOSP Camera source should run camera2 API on M
Alan Newberger [Fri, 19 Jun 2015 22:34:42 +0000 (22:34 +0000)]
am d3611d6a: AOSP Camera source should run camera2 API on M

* commit 'd3611d6a86f46fb877e5260410ddd6389445be1e':
  AOSP Camera source should run camera2 API on M

9 years agoAOSP Camera source should run camera2 API on M
Alan Newberger [Fri, 19 Jun 2015 20:59:32 +0000 (13:59 -0700)]
AOSP Camera source should run camera2 API on M

In all cases has Camera2 app run in CaptureModule, using
capability levels to configure in either LEGACY or LIMITED
JPEG, or full ZSL mode.

BUG=21490086

Change-Id: I75842e9afc8d6ef387dd6611a5251394e8318caa

9 years agoam cdbb62b8: (-s ours) am e07a7e90: (-s ours) am 2399038f: (-s ours) Import translati...
Geoff Mendal [Tue, 16 Jun 2015 21:23:54 +0000 (21:23 +0000)]
am cdbb62b8: (-s ours) am e07a7e90: (-s ours) am 2399038f: (-s ours) Import translations. DO NOT MERGE

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

9 years agoam e07a7e90: (-s ours) am 2399038f: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Tue, 16 Jun 2015 20:06:40 +0000 (20:06 +0000)]
am e07a7e90: (-s ours) am 2399038f: (-s ours) Import translations. DO NOT MERGE

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

9 years agoam 2399038f: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Tue, 16 Jun 2015 14:39:12 +0000 (14:39 +0000)]
am 2399038f: (-s ours) Import translations. DO NOT MERGE

* commit '2399038f488c5ae0a4cd6fb45301ff8747a29be1':
  Import translations. DO NOT MERGE

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Tue, 16 Jun 2015 14:26:13 +0000 (07:26 -0700)]
Import translations. DO NOT MERGE

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

9 years agoam d5b7df80: am 71d368a9: am 8d8b329d: Fix for invalidated resolutions via upgrade
I-Jong Lin [Thu, 11 Jun 2015 02:08:21 +0000 (02:08 +0000)]
am d5b7df80: am 71d368a9: am 8d8b329d: Fix for invalidated resolutions via upgrade

* commit 'd5b7df805063b631c790a2d74118318ab4a3fa39':
  Fix for invalidated resolutions via upgrade

9 years agoam 71d368a9: am 8d8b329d: Fix for invalidated resolutions via upgrade
I-Jong Lin [Thu, 11 Jun 2015 01:33:49 +0000 (01:33 +0000)]
am 71d368a9: am 8d8b329d: Fix for invalidated resolutions via upgrade

* commit '71d368a9672dc366165a16d7f6a94797dafd92c9':
  Fix for invalidated resolutions via upgrade

9 years agoam 8d8b329d: Fix for invalidated resolutions via upgrade
I-Jong Lin [Thu, 11 Jun 2015 00:36:14 +0000 (00:36 +0000)]
am 8d8b329d: Fix for invalidated resolutions via upgrade

* commit '8d8b329da25456adb5ee45e0450680654114e125':
  Fix for invalidated resolutions via upgrade

9 years agoFix for invalidated resolutions via upgrade
I-Jong Lin [Thu, 11 Jun 2015 00:10:30 +0000 (17:10 -0700)]
Fix for invalidated resolutions via upgrade

Bug: 21758681

There was a upgrade bug where an valid resolution of the
previous version of the Camera App could then be invalidated
the subsequent version of the Camera App.  If there were no
other valid resolutions of the same aspect ratio available
to the app, the current Camera App would choose (0,0) as its
default size and then write this value into the saved settings.

This fix allows the current Camera App to consider other resolutions
not of aspect ratio as a fallback resolution setting.  Also, if
an invalid resolution valid has been saved to the settings, it
also ignores it and then resaves a valid resolution value to the
settings.

Change-Id: I08f19d1ee6491619e92697897b73e4fd33a19a00

9 years agoam d2ba8c64: am 5b76be0d: am e2323c53: Refresh required for full-screen undo in filmstrip
I-Jong Lin [Mon, 8 Jun 2015 21:39:17 +0000 (21:39 +0000)]
am d2ba8c64: am 5b76be0d: am e2323c53: Refresh required for full-screen undo in filmstrip

* commit 'd2ba8c6463f6c4213b3202732e10442951228450':
  Refresh required for full-screen undo in filmstrip

9 years agoam 5b76be0d: am e2323c53: Refresh required for full-screen undo in filmstrip
I-Jong Lin [Mon, 8 Jun 2015 21:30:39 +0000 (21:30 +0000)]
am 5b76be0d: am e2323c53: Refresh required for full-screen undo in filmstrip

* commit '5b76be0d5896711d4d8b08a23c8f86bc48583d2e':
  Refresh required for full-screen undo in filmstrip

9 years agoam e2323c53: Refresh required for full-screen undo in filmstrip
I-Jong Lin [Mon, 8 Jun 2015 21:23:53 +0000 (21:23 +0000)]
am e2323c53: Refresh required for full-screen undo in filmstrip

* commit 'e2323c537f0ec4966ad58251a14e1437071ae085':
  Refresh required for full-screen undo in filmstrip

9 years agoRefresh required for full-screen undo in filmstrip
I-Jong Lin [Mon, 8 Jun 2015 19:24:51 +0000 (12:24 -0700)]
Refresh required for full-screen undo in filmstrip

Bug: 21666018

A Glacier regression bug: when filmstrip is in full-screen mode,
and an deletion is undone, a blank screen is shown.  With the fix,
the undo forces the filmstrip into its "filmstrip" mode and
forces a refresh with the un-deleted image.

Change-Id: Id99be5d4d06e220e8698821badff32dba9b43997

9 years agoam 58908727: (-s ours) am f7fa07b1: (-s ours) am 43c0ecae: (-s ours) Import translati...
Geoff Mendal [Mon, 8 Jun 2015 18:42:33 +0000 (18:42 +0000)]
am 58908727: (-s ours) am f7fa07b1: (-s ours) am 43c0ecae: (-s ours) Import translations. DO NOT MERGE

* commit '5890872722491fe9f6fadc5a333609c63b0803b6':
  Import translations. DO NOT MERGE

9 years agoam f7fa07b1: (-s ours) am 43c0ecae: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Mon, 8 Jun 2015 18:29:42 +0000 (18:29 +0000)]
am f7fa07b1: (-s ours) am 43c0ecae: (-s ours) Import translations. DO NOT MERGE

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

9 years agoam 43c0ecae: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Mon, 8 Jun 2015 18:21:52 +0000 (18:21 +0000)]
am 43c0ecae: (-s ours) Import translations. DO NOT MERGE

* commit '43c0ecae9759eb19ab4485e367e1b09f7291578f':
  Import translations. DO NOT MERGE

9 years agoam d5da1496: (-s ours) am 1c94fe67: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Mon, 8 Jun 2015 17:03:59 +0000 (17:03 +0000)]
am d5da1496: (-s ours) am 1c94fe67: (-s ours) Import translations. DO NOT MERGE

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

9 years agoam 1c94fe67: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Mon, 8 Jun 2015 16:43:06 +0000 (16:43 +0000)]
am 1c94fe67: (-s ours) Import translations. DO NOT MERGE

* commit '1c94fe675b519315f91a38c95412d334c8c23f05':
  Import translations. DO NOT MERGE

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 8 Jun 2015 12:36:01 +0000 (05:36 -0700)]
Import translations. DO NOT MERGE

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

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 8 Jun 2015 12:34:54 +0000 (05:34 -0700)]
Import translations. DO NOT MERGE

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

9 years agoam 5719021e: (-s ours) am d949816b: (-s ours) am f79704fb: (-s ours) Import translati...
Geoff Mendal [Wed, 3 Jun 2015 18:49:49 +0000 (18:49 +0000)]
am 5719021e: (-s ours) am d949816b: (-s ours) am f79704fb: (-s ours) Import translations. DO NOT MERGE

* commit '5719021e0bad14ca85210c027a495b5ca5a2fe29':
  Import translations. DO NOT MERGE

9 years agoam b8e1e78c: (-s ours) am 78b74c20: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Wed, 3 Jun 2015 18:46:08 +0000 (18:46 +0000)]
am b8e1e78c: (-s ours) am 78b74c20: (-s ours) Import translations. DO NOT MERGE

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

9 years agoam d949816b: (-s ours) am f79704fb: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Wed, 3 Jun 2015 18:19:52 +0000 (18:19 +0000)]
am d949816b: (-s ours) am f79704fb: (-s ours) Import translations. DO NOT MERGE

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

9 years agoam 78b74c20: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Wed, 3 Jun 2015 17:42:05 +0000 (17:42 +0000)]
am 78b74c20: (-s ours) Import translations. DO NOT MERGE

* commit '78b74c2032b749395cbc37bc0f9993dfd4b2231c':
  Import translations. DO NOT MERGE

9 years agoam f79704fb: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Wed, 3 Jun 2015 17:35:54 +0000 (17:35 +0000)]
am f79704fb: (-s ours) Import translations. DO NOT MERGE

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

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Wed, 3 Jun 2015 16:20:51 +0000 (09:20 -0700)]
Import translations. DO NOT MERGE

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

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Wed, 3 Jun 2015 16:18:50 +0000 (09:18 -0700)]
Import translations. DO NOT MERGE

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