OSDN Git Service
Geoff Mendal [Mon, 13 Jul 2015 16:02:30 +0000 (16:02 +0000)]
am
ca2a2baa: (-s ours) am
b0ffb4f9: (-s ours) am
aecc99f4: (-s ours) am
1fee657d: (-s ours) Import translations. DO NOT MERGE
* commit '
ca2a2baabbc81048149f4110c103f26c4b653823':
Import translations. DO NOT MERGE
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
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
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
Geoff Mendal [Mon, 13 Jul 2015 12:04:16 +0000 (05:04 -0700)]
Import translations. DO NOT MERGE
Change-Id: I3a18493ba5607bc9c3f8ac546601dba4a5718d81
Auto-generated-cl: translation import
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
Geoff Mendal [Sat, 11 Jul 2015 12:10:53 +0000 (05:10 -0700)]
Import translations. DO NOT MERGE
Change-Id: I74165bc491018dfc17a7b35da7cfdac8734ed12b
Auto-generated-cl: translation import
Alan Newberger [Fri, 10 Jul 2015 17:59:07 +0000 (17:59 +0000)]
am
50f44868: am
de893a7b: am
b92d395a: am
981eb996: am
ade8896d: am
2fc4970c: am
00720781: Null check when evaluating valid resolution size
* commit '
50f448689fe1debe655e2176a24d211c140d7c65':
Null check when evaluating valid resolution size
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
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
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
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
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
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
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
zafir [Thu, 9 Jul 2015 02:09:19 +0000 (02:09 +0000)]
am
b2b6fbc1: am
b331ac92: am
b7142d73: am
c28abdb8: am
dfd3ecb1: am
148d0b8e: Launch PermissionsActivity if CameraActivity resume is called without critical permissions.
* commit '
b2b6fbc19d9848eba4322c11345eda626bdd4e12':
Launch PermissionsActivity if CameraActivity resume is called without critical permissions.
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.
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.
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.
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.
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.
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
Alan Newberger [Wed, 8 Jul 2015 21:00:46 +0000 (21:00 +0000)]
am
1c499d0f: am
2e6fe290: am
c5a1f6cf: am
b01de9c3: am
6e0e81f3: am
5c8c7d3c: Clear permissions check after successful PermissionsActivity
* commit '
1c499d0f0c0874086649dc58f2023629054b601d':
Clear permissions check after successful PermissionsActivity
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
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
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
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
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
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
Alan Newberger [Wed, 8 Jul 2015 19:19:37 +0000 (19:19 +0000)]
am
60ad67d0: am
141346ab: am
e2a6302c: am
b462c3ca: am
f2bdf276: am
c2d5d078: Restrict permission checks to M devices
* commit '
60ad67d0415b7fbe87f7642b460a5c8c042b9f65':
Restrict permission checks to M devices
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
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
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
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
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
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
Geoff Mendal [Wed, 8 Jul 2015 15:16:49 +0000 (15:16 +0000)]
am
bd9b797c: (-s ours) 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 '
bd9b797c6c5ed319041fce4f26e18c140bab5731':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 8 Jul 2015 15:16:48 +0000 (15:16 +0000)]
am
6e7947a1: (-s ours) am
533e0b6c: (-s ours) am
0a8c14f8: (-s ours) am
03d7cde4: (-s ours) am
a532005c: (-s ours) Import translations. DO NOT MERGE
* commit '
6e7947a1f66ba39ed7f4c6d92d018c4aae81cd53':
Import translations. DO NOT MERGE
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
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
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
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
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
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
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
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
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
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
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
Geoff Mendal [Wed, 8 Jul 2015 12:47:24 +0000 (05:47 -0700)]
Import translations. DO NOT MERGE
Change-Id: I6b348bea33629f45f9f73dffca4edb20db463411
Auto-generated-cl: translation import
zafir [Tue, 7 Jul 2015 03:25:02 +0000 (03:25 +0000)]
am
2fac1cf8: am
b03e914a: am
2b4101fe: am
ad44cda8: Minimum viable Android M runtime permissions handling for H.
* commit '
2fac1cf8243c4f62e7f76f58b8172659f12041c6':
Minimum viable Android M runtime permissions handling for H.
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.
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.
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.
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
Geoff Mendal [Mon, 6 Jul 2015 12:10:21 +0000 (05:10 -0700)]
Import translations. DO NOT MERGE
Change-Id: I7ed408bf7eda1d981f87ce45ebadb796d8ea2800
Auto-generated-cl: translation import
Geoff Mendal [Wed, 1 Jul 2015 14:15:55 +0000 (07:15 -0700)]
Import translations. DO NOT MERGE
Change-Id: If40e83c76fc26097a3493c38e87f17fbac48cf23
Auto-generated-cl: translation import
Alan Newberger [Mon, 29 Jun 2015 18:42:00 +0000 (18:42 +0000)]
am
4e95f54a: am
cfa12ed5: am
1cef126a: am
fd6f316a: Merge "Ensure CaptureModule/API2 works without front camera" into ub-camera-haleakala
* commit '
4e95f54a38982e525d357acd3648f81b8539b42c':
Ensure CaptureModule/API2 works without front camera
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
Alan Newberger [Mon, 29 Jun 2015 18:22:33 +0000 (18:22 +0000)]
am
5cd5053a: am
6c296b2b: am
245239ba: am
62240e14: Merge "Update filmstrip item on metadata update" into ub-camera-haleakala
* commit '
5cd5053a8f5cf028dfa544842f420a442b240dbb':
Update filmstrip item on metadata update
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
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
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
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
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
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
Alan Newberger [Mon, 29 Jun 2015 17:32:35 +0000 (17:32 +0000)]
Merge "Update filmstrip item on metadata update" into ub-camera-haleakala
Geoff Mendal [Mon, 29 Jun 2015 12:51:50 +0000 (05:51 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ibac86330230a9f45538f69662fa643bc3219fdf8
Auto-generated-cl: translation import
Senpo Hu [Sat, 27 Jun 2015 21:50:02 +0000 (21:50 +0000)]
am
7b72c82c: am
dc1a777d: am
75dcaf3b: am
04a9f8b6: Merge "Fix transform issue in CaptureIntent." into ub-camera-haleakala
* commit '
7b72c82c9691fb2fb30731e3d27e0d5f23311360':
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.
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.
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.
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
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
Senpo Hu [Thu, 25 Jun 2015 17:32:49 +0000 (17:32 +0000)]
Merge "Fix transform issue in CaptureIntent." into ub-camera-haleakala
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
Geoff Mendal [Mon, 22 Jun 2015 12:51:18 +0000 (05:51 -0700)]
Import translations. DO NOT MERGE
Change-Id: I6c7934ad40e1a25c08671dac416bb2aaeb789c96
Auto-generated-cl: translation import
Alan Newberger [Sat, 20 Jun 2015 00:11:56 +0000 (00:11 +0000)]
am
1c19f1b7: am
a596ed32: am
d3611d6a: AOSP Camera source should run camera2 API on M
* commit '
1c19f1b72e0e5f31aa7cd884e0fddc3f2649dfa0':
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
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
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
Geoff Mendal [Wed, 17 Jun 2015 12:24:02 +0000 (05:24 -0700)]
Import translations. DO NOT MERGE
Change-Id: I74c090f6d21bbec1ffd2970b44925507377a07aa
Auto-generated-cl: translation import
Geoff Mendal [Tue, 16 Jun 2015 22:02:45 +0000 (22:02 +0000)]
am
85170b09: (-s ours) am
cdbb62b8: (-s ours) am
e07a7e90: (-s ours) am
2399038f: (-s ours) Import translations. DO NOT MERGE
* commit '
85170b09ea3657df785b2be48321580a77c1a417':
Import translations. DO NOT MERGE
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
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
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
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
Geoff Mendal [Mon, 15 Jun 2015 13:21:59 +0000 (06:21 -0700)]
Import translations. DO NOT MERGE
Change-Id: I3f6a1734073f8d96184cc90be79af3a8a57aba94
Auto-generated-cl: translation import
I-Jong Lin [Thu, 11 Jun 2015 02:35:28 +0000 (02:35 +0000)]
am
412d1df4: am
d5b7df80: am
71d368a9: am
8d8b329d: Fix for invalidated resolutions via upgrade
* commit '
412d1df4db446117b9fbf36b6e1a4b898048cbc6':
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
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
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
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
Geoff Mendal [Wed, 10 Jun 2015 13:16:55 +0000 (06:16 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ibc6224e3493b8bf178ef39da44d0a7cd887664d2
Auto-generated-cl: translation import
I-Jong Lin [Mon, 8 Jun 2015 21:51:25 +0000 (21:51 +0000)]
am
e0eca55c: am
d2ba8c64: am
5b76be0d: am
e2323c53: Refresh required for full-screen undo in filmstrip
* commit '
e0eca55c820906726ba31e8e06eb7a3a585cf4a1':
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
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
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
Geoff Mendal [Mon, 8 Jun 2015 19:58:14 +0000 (19:58 +0000)]
am
67acfc00: (-s ours) am
58908727: (-s ours) am
f7fa07b1: (-s ours) am
43c0ecae: (-s ours) Import translations. DO NOT MERGE
* commit '
67acfc001a9aa025a276dcbbd474076a20523dea':
Import translations. DO NOT MERGE
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
OSDN Git Service
