OSDN Git Service

android-x86/packages-apps-Camera2.git
8 years agoam 57b4d24e: (-s ours) am 09364eeb: (-s ours) am b980a5be: (-s ours) Import translati...
Geoff Mendal [Mon, 13 Jul 2015 07:21:08 +0000 (07:21 +0000)]
am 57b4d24e: (-s ours) am 09364eeb: (-s ours) am b980a5be: (-s ours) Import translations. DO NOT MERGE

* commit '57b4d24e779a10a6dccf4c5c841d1f43c2bc77fd':
  Import translations. DO NOT MERGE

8 years agoam 5d806912: (-s ours) am e27c079d: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Mon, 13 Jul 2015 07:21:06 +0000 (07:21 +0000)]
am 5d806912: (-s ours) am e27c079d: (-s ours) Import translations. DO NOT MERGE

* commit '5d806912451dd81453aac72c9b7b2fa53e4f6096':
  Import translations. DO NOT MERGE

8 years agoam 0462d5b1: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Mon, 13 Jul 2015 07:21:05 +0000 (07:21 +0000)]
am 0462d5b1: (-s ours) Import translations. DO NOT MERGE

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

8 years agoam c9b45d41: am 01c3f7ad: am e25f675a: Shorten location startup dialog string
Alan Newberger [Mon, 13 Jul 2015 07:20:02 +0000 (07:20 +0000)]
am c9b45d41: am 01c3f7ad: am e25f675a: Shorten location startup dialog string

* commit 'c9b45d41b93f0e31ed88cf22db387006b8219333':
  Shorten location startup dialog string

8 years agoam 09364eeb: (-s ours) am b980a5be: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Sat, 11 Jul 2015 12:41:38 +0000 (12:41 +0000)]
am 09364eeb: (-s ours) am b980a5be: (-s ours) Import translations. DO NOT MERGE

* commit '09364eebaa1c07801e5849b73c5163646b4ceb4d':
  Import translations. DO NOT MERGE

8 years agoam e27c079d: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Sat, 11 Jul 2015 12:35:25 +0000 (12:35 +0000)]
am e27c079d: (-s ours) Import translations. DO NOT MERGE

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

8 years agoam b980a5be: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Sat, 11 Jul 2015 12:34:51 +0000 (12:34 +0000)]
am b980a5be: (-s ours) Import translations. DO NOT MERGE

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

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

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

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

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

8 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

8 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

8 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

8 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

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

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

8 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

8 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

8 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

8 years agoam dfd3ecb1: am 148d0b8e: Launch PermissionsActivity if CameraActivity resume is...
zafir [Thu, 9 Jul 2015 01:23:51 +0000 (01:23 +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.

8 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.

8 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

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

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

8 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

8 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

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

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

8 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

8 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

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

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

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

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

8 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

8 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

8 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

8 years agoam 2b4101fe: am ad44cda8: Minimum viable Android M runtime permissions handling for H.
zafir [Tue, 7 Jul 2015 01:49:33 +0000 (01:49 +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.

8 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.

8 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

8 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

8 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

8 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

8 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

8 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

8 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

8 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

8 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

8 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.

8 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.

8 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.

8 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

8 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

8 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

8 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

8 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

8 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

8 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

8 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

8 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

8 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

8 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

8 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

8 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

8 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

8 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

8 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

8 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

8 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

8 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

8 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

8 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

8 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

8 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

8 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

8 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

8 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

8 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

8 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

8 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

8 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

8 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

8 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

8 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

9 years agoam 168be08d: (-s ours) am 7081fd65: (-s ours) am 4fa352a2: (-s ours) Import translati...
Geoff Mendal [Mon, 1 Jun 2015 18:13:53 +0000 (18:13 +0000)]
am 168be08d: (-s ours) am 7081fd65: (-s ours) am 4fa352a2: (-s ours) Import translations. DO NOT MERGE

* commit '168be08db03c69e7ad20b3b8e432b08b4e80c9c8':
  Import translations. DO NOT MERGE

9 years agoam bbae025f: (-s ours) am 8fb1558e: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Mon, 1 Jun 2015 18:13:48 +0000 (18:13 +0000)]
am bbae025f: (-s ours) am 8fb1558e: (-s ours) Import translations. DO NOT MERGE

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

9 years agoam 06d102ea: (-s ours) am ab2bc522: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Mon, 1 Jun 2015 17:09:36 +0000 (17:09 +0000)]
am 06d102ea: (-s ours) am ab2bc522: (-s ours) Import translations. DO NOT MERGE

* commit '06d102ea787555a89cc87b438e2c7b90444703c4':
  Import translations. DO NOT MERGE

9 years agoam 3758bfb4: (-s ours) am ee1910d4: (-s ours) am 818a2ecc: (-s ours) Import translati...
Geoff Mendal [Mon, 1 Jun 2015 17:08:36 +0000 (17:08 +0000)]
am 3758bfb4: (-s ours) am ee1910d4: (-s ours) am 818a2ecc: (-s ours) Import translations. DO NOT MERGE

* commit '3758bfb4283bb90a0f1bc99d5c1cce6707a4a652':
  Import translations. DO NOT MERGE

9 years agoam b434a100: am 862447f3: am 2eb8298b: Use Google Feedback CrashBuilder API to make...
Sascha Haeberling [Mon, 1 Jun 2015 17:06:41 +0000 (17:06 +0000)]
am b434a100: am 862447f3: am 2eb8298b: Use Google Feedback CrashBuilder API to make reports easier to consume.

* commit 'b434a10033a8a2386693b589ecff094adfdddeb7':
  Use Google Feedback CrashBuilder API to make reports easier to consume.

9 years agoam 42efb312: (-s ours) am 7958ad5c: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Mon, 1 Jun 2015 14:31:07 +0000 (14:31 +0000)]
am 42efb312: (-s ours) am 7958ad5c: (-s ours) Import translations. DO NOT MERGE

* commit '42efb31207e583f1232e7a66e6bf5f6185064f27':
  Import translations. DO NOT MERGE

9 years agoam 93882a22: am 3d908f59: am e6b00bf3: Fix for unusable camera after quick pause...
Gabriel Nava [Mon, 1 Jun 2015 14:31:06 +0000 (14:31 +0000)]
am 93882a22: am 3d908f59: am e6b00bf3: Fix for unusable camera after quick pause/resume and HDR+ switch (camera-Haleakala)

* commit '93882a227d38a260885f4e123124a791e31bc07f':
  Fix for unusable camera after quick pause/resume and HDR+ switch (camera-Haleakala)

9 years agoam 7081fd65: (-s ours) am 4fa352a2: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Mon, 1 Jun 2015 13:39:46 +0000 (13:39 +0000)]
am 7081fd65: (-s ours) am 4fa352a2: (-s ours) Import translations. DO NOT MERGE

* commit '7081fd655bee82f050854aa9ec2cb6a461d95014':
  Import translations. DO NOT MERGE

9 years agoam 8fb1558e: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Mon, 1 Jun 2015 13:24:00 +0000 (13:24 +0000)]
am 8fb1558e: (-s ours) Import translations. DO NOT MERGE

* commit '8fb1558e59bd04e40b2d70731190e72e8efb25e1':
  Import translations. DO NOT MERGE

9 years agoam 4fa352a2: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Mon, 1 Jun 2015 13:23:35 +0000 (13:23 +0000)]
am 4fa352a2: (-s ours) Import translations. DO NOT MERGE

* commit '4fa352a29cb96fe72032a55222baae8ff4257f4c':
  Import translations. DO NOT MERGE

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 1 Jun 2015 13:07:40 +0000 (06:07 -0700)]
Import translations. DO NOT MERGE

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

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 1 Jun 2015 13:06:40 +0000 (06:06 -0700)]
Import translations. DO NOT MERGE

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

9 years agoam ab2bc522: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Sat, 30 May 2015 22:42:28 +0000 (22:42 +0000)]
am ab2bc522: (-s ours) Import translations. DO NOT MERGE

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

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Sat, 30 May 2015 22:28:13 +0000 (15:28 -0700)]
Import translations. DO NOT MERGE

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

9 years agoam ee1910d4: (-s ours) am 818a2ecc: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Sat, 30 May 2015 16:44:02 +0000 (16:44 +0000)]
am ee1910d4: (-s ours) am 818a2ecc: (-s ours) Import translations. DO NOT MERGE

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

9 years agoam 818a2ecc: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Sat, 30 May 2015 16:34:53 +0000 (16:34 +0000)]
am 818a2ecc: (-s ours) Import translations. DO NOT MERGE

* commit '818a2ecc3f9756866c03d462667499ae88ef2a2a':
  Import translations. DO NOT MERGE

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Sat, 30 May 2015 16:15:38 +0000 (09:15 -0700)]
Import translations. DO NOT MERGE

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

9 years agoam 862447f3: am 2eb8298b: Use Google Feedback CrashBuilder API to make reports easier...
Sascha Haeberling [Fri, 29 May 2015 23:57:51 +0000 (23:57 +0000)]
am 862447f3: am 2eb8298b: Use Google Feedback CrashBuilder API to make reports easier to consume.

* commit '862447f384ca4e210bafff498503b94ad72c0980':
  Use Google Feedback CrashBuilder API to make reports easier to consume.

9 years agoam 2eb8298b: Use Google Feedback CrashBuilder API to make reports easier to consume.
Sascha Haeberling [Fri, 29 May 2015 23:42:00 +0000 (23:42 +0000)]
am 2eb8298b: Use Google Feedback CrashBuilder API to make reports easier to consume.

* commit '2eb8298b5fa99af132f6be6da920ed8867974488':
  Use Google Feedback CrashBuilder API to make reports easier to consume.

9 years agoUse Google Feedback CrashBuilder API to make reports easier to consume.
Sascha Haeberling [Fri, 29 May 2015 23:20:28 +0000 (16:20 -0700)]
Use Google Feedback CrashBuilder API to make reports easier to consume.

Manual Cherry-Pick Part 1 of http://ag/699672

Currently, Feedback reports don't include a stacktrace. You have to
download
a system log file to find it. This tweak allows us to see the stacktrace
on the Report page itself.

Example old report:
https://feedback.corp.google.com/product/102042/crash?lView=rd&lCategory=8590053278&lRSort=1&lROrder=2&lRFilter=1&lReport=5517267704
Example new report:
https://feedback.corp.google.com/product/102042/crash?lView=rd&lCategory=8590053278&lRSort=1&lROrder=2&lRFilter=1&lReport=5517601160

Change-Id: If5f0ed6c69e96fe5f3661af913ae1525f8594b75

9 years agoam 7958ad5c: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Fri, 29 May 2015 19:19:11 +0000 (19:19 +0000)]
am 7958ad5c: (-s ours) Import translations. DO NOT MERGE

* commit '7958ad5c113e056de683dfd365b086e660622c8c':
  Import translations. DO NOT MERGE

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Fri, 29 May 2015 14:16:03 +0000 (07:16 -0700)]
Import translations. DO NOT MERGE

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