OSDN Git Service

android-x86/packages-apps-Camera2.git
8 years agoam 30339719: Remove unused ACCOUNTS permissions
Alan Newberger [Fri, 24 Jul 2015 18:08:38 +0000 (18:08 +0000)]
am 30339719: Remove unused ACCOUNTS permissions

* commit '30339719b7ff523b1ab8e6c953b269a870c1181c':
  Remove unused ACCOUNTS permissions

8 years agoam 4df3011e: Protect against destroying uncreated values
Alan Newberger [Fri, 24 Jul 2015 18:08:36 +0000 (18:08 +0000)]
am 4df3011e: Protect against destroying uncreated values

* commit '4df3011e2f3680a80ecc89c817ba528b2a578f0f':
  Protect against destroying uncreated values

8 years agoRemove unused ACCOUNTS permissions
Alan Newberger [Fri, 24 Jul 2015 17:57:56 +0000 (10:57 -0700)]
Remove unused ACCOUNTS permissions

BUG=22716720

Change-Id: Id465f3cf55f41d7ebf90e4feecfa38824b66faa4

8 years agoProtect against destroying uncreated values
Alan Newberger [Fri, 24 Jul 2015 17:47:55 +0000 (10:47 -0700)]
Protect against destroying uncreated values

Though we attempt to minimize lifecycle impact by exiting onCreate
early due to inadequate permissions, we need to protect against
touching fields in onDestroy that we did not initialize in onCreate.

BUG=22718094

Change-Id: I49adcbbed005c4efa785458aa398e61488cfceb0

8 years agoam ae474d0b: [Haleakala] Change JPEG compression thread priority to BACKGROUND - 1.
Sascha Haeberling [Thu, 23 Jul 2015 18:34:33 +0000 (18:34 +0000)]
am ae474d0b: [Haleakala] Change JPEG compression thread priority to BACKGROUND - 1.

* commit 'ae474d0b2967b3995a4e1e334d6689b0cd9a38c9':
  [Haleakala] Change JPEG compression thread priority to BACKGROUND - 1.

8 years ago[Haleakala] Change JPEG compression thread priority to BACKGROUND - 1.
Sascha Haeberling [Wed, 22 Jul 2015 23:52:31 +0000 (16:52 -0700)]
[Haleakala] Change JPEG compression thread priority to BACKGROUND - 1.

  Bug: 22670310

Change-Id: Ic2ee7e2de141d7df2a316733b465daa354b2d517

8 years agoam ac0e2425: Fixes to M permissions.
zafir [Sat, 18 Jul 2015 00:13:59 +0000 (00:13 +0000)]
am ac0e2425: Fixes to M permissions.

* commit 'ac0e2425e77a9b69e76d2f31876798825ea44584':
  Fixes to M permissions.

8 years agoFixes to M permissions.
zafir [Wed, 15 Jul 2015 08:14:10 +0000 (01:14 -0700)]
Fixes to M permissions.

Previously, we called PermissionsActivity with startActivityForResult().
However, this creates race conditions as we check for permissions
and the CameraActivity continues to operate. Now, we end CameraActivity
and launch a new instance upon successful permissions resolution.
We can also put the preload filmstrip logic back in its original
place in onCreate. The checks for permissions happen in both
onCreate and onResume.

Bug: 224427452247814422497152
Change-Id: I82e9125a46581db44aa61d4ee94aec5a820e9df0

8 years agoam dd334be9: Camera M permissions: lockscreen improvements
zafir [Fri, 17 Jul 2015 18:23:26 +0000 (18:23 +0000)]
am dd334be9: Camera M permissions: lockscreen improvements

* commit 'dd334be92c5513a06c809ee3ea25e411dfad0589':
  Camera M permissions: lockscreen improvements

8 years agoCamera M permissions: lockscreen improvements
zafir [Wed, 15 Jul 2015 08:14:10 +0000 (01:14 -0700)]
Camera M permissions: lockscreen improvements

This CL now just provides some improvements for lockscreen independent
of any onCreate/onResume lifecycle adjustments. Fixes include:

* add a black content view to Permissions Activity -- noticed screen
  junk opening from lockscreen due to unpainted regions, the whole
  activity needs to paint the screen not just the dialog.

* use FLAG_SHOW_WHEN_LOCKED to show permissions screen over lockscreen,
  per bug discussion in this case force failure, don't prompt for
  permission grants.

* fun double onResumes induce flicker jank in the dialog UI. Inherit
  QuickActivity to automatically pick up the workarounds for double
  onResumes from lockscreens, no more flicker in the permission
  dialog.

* also borrow from CameraActivity, broadcast receives to shut down
  the permissions dialog when screen goes off or user hits home on
  top of lockscreen. Actually apply this more broadly so that even
  below lockscreen, we finish this activity on screen off, IMO it
  is jarring to go in through lockscreen and see our permission
  dialog again without context of having just opened camera.

* tweak permission dialog to not be cancelable, and to finish
  activity on back button press.

* excludeFromRecents on the activity to prevent dual recents
  for Camera to show up when opening both via SecureCameraActivity
  and CameraActivity.

Bug: 22502696
Change-Id: Ib545d3baa2d83b52604eec5517047b0c6278cd92

8 years agoam 34663b0f: (-s ours) am 36c35f23: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Wed, 15 Jul 2015 14:14:54 +0000 (14:14 +0000)]
am 34663b0f: (-s ours) am 36c35f23: (-s ours) Import translations. DO NOT MERGE

* commit '34663b0fd4a21a6c107c6df313bcbd1548235fd5':
  Import translations. DO NOT MERGE

8 years agoam 62f7a266: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Wed, 15 Jul 2015 14:07:43 +0000 (14:07 +0000)]
am 62f7a266: (-s ours) Import translations. DO NOT MERGE

* commit '62f7a266f8862fbec21a97c3a73e74871170296d':
  Import translations. DO NOT MERGE

8 years agoam 36c35f23: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Wed, 15 Jul 2015 14:06:56 +0000 (14:06 +0000)]
am 36c35f23: (-s ours) Import translations. DO NOT MERGE

* commit '36c35f23f17ecfc47d1e2ef5d36b6516251b9018':
  Import translations. DO NOT MERGE

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

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

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

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

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

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

8 years agoam ca7f4ce9: (-s ours) am ec5a5213: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Tue, 14 Jul 2015 21:19:22 +0000 (21:19 +0000)]
am ca7f4ce9: (-s ours) am ec5a5213: (-s ours) Import translations. DO NOT MERGE

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

8 years agoam ec5a5213: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Tue, 14 Jul 2015 21:06:00 +0000 (21:06 +0000)]
am ec5a5213: (-s ours) Import translations. DO NOT MERGE

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

8 years agoam 4c77d6a7: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Tue, 14 Jul 2015 20:53:48 +0000 (20:53 +0000)]
am 4c77d6a7: (-s ours) Import translations. DO NOT MERGE

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

8 years agoImport translations. DO NOT MERGE
Geoff Mendal [Tue, 14 Jul 2015 20:46:35 +0000 (13:46 -0700)]
Import translations. DO NOT MERGE

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

8 years agoImport translations. DO NOT MERGE
Geoff Mendal [Tue, 14 Jul 2015 20:40:25 +0000 (13:40 -0700)]
Import translations. DO NOT MERGE

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

8 years agoam 6bb610be: am ad510fdd: Merge "Set ModeListView to LTR layout" into ub-camera-haleakala
Alan Newberger [Mon, 13 Jul 2015 16:31:48 +0000 (16:31 +0000)]
am 6bb610be: am ad510fdd: Merge "Set ModeListView to LTR layout" into ub-camera-haleakala

* commit '6bb610be1aa27864d4049732f330e277623a9381':
  Set ModeListView to LTR layout

8 years agoam ad510fdd: Merge "Set ModeListView to LTR layout" into ub-camera-haleakala
Alan Newberger [Mon, 13 Jul 2015 16:25:21 +0000 (16:25 +0000)]
am ad510fdd: Merge "Set ModeListView to LTR layout" into ub-camera-haleakala

* commit 'ad510fddb124d1e02fd1e135d672ab1f14923e56':
  Set ModeListView to LTR layout

8 years agoMerge "Set ModeListView to LTR layout" into ub-camera-haleakala
Alan Newberger [Mon, 13 Jul 2015 16:17:35 +0000 (16:17 +0000)]
Merge "Set ModeListView to LTR layout" into ub-camera-haleakala

8 years agoam 50f8944c: (-s ours) am 1ac1ac74: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Mon, 13 Jul 2015 12:54:37 +0000 (12:54 +0000)]
am 50f8944c: (-s ours) am 1ac1ac74: (-s ours) Import translations. DO NOT MERGE

* commit '50f8944c200e20e6a387e2cade03865ae95368ec':
  Import translations. DO NOT MERGE

8 years agoam 45289c3d: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Mon, 13 Jul 2015 12:48:26 +0000 (12:48 +0000)]
am 45289c3d: (-s ours) Import translations. DO NOT MERGE

* commit '45289c3d39d24b7530e4478af0120da4a21e2744':
  Import translations. DO NOT MERGE

8 years agoam 1ac1ac74: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Mon, 13 Jul 2015 12:47:42 +0000 (12:47 +0000)]
am 1ac1ac74: (-s ours) Import translations. DO NOT MERGE

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

8 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 13 Jul 2015 12:20:38 +0000 (05:20 -0700)]
Import translations. DO NOT MERGE

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

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

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

8 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 13 Jul 2015 12:17:44 +0000 (05:17 -0700)]
Import translations. DO NOT MERGE

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

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 agoSet ModeListView to LTR layout
Alan Newberger [Sat, 11 Jul 2015 01:22:20 +0000 (18:22 -0700)]
Set ModeListView to LTR layout

Mode list is LTR layout at all times. But without being marked as
such, subitems like SettingsCling had their getLeft View property
adjusted for RTL layout. SettingsCling had a ~800 pixel left
property under RTL vs 0 in LTR, causing it to set itself off
screen.

BUG=22206761

Change-Id: I356e464a1121069def71c350902c032833542c29

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

8 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

8 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

8 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

8 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

8 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

8 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

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

8 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

8 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

8 years agoam e6b00bf3: Fix for unusable camera after quick pause/resume and HDR+ switch (camera...
Gabriel Nava [Fri, 29 May 2015 00:07:42 +0000 (00:07 +0000)]
am e6b00bf3: Fix for unusable camera after quick pause/resume and HDR+ switch (camera-Haleakala)

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

8 years agoFix for unusable camera after quick pause/resume and HDR+ switch (camera-Haleakala)
Gabriel Nava [Thu, 28 May 2015 16:36:23 +0000 (09:36 -0700)]
Fix for unusable camera after quick pause/resume and HDR+ switch (camera-Haleakala)

- Removing the hack for b/18854352
- Running the camera reopen camera operations and onReadyForCapture callback in a non-UI thread to avoid dead-locks

Bug: 21025113
Change-Id: I5545148769d92e5a87ffa9b693397fd7737edee6

8 years agoam dad39b12: Add logging for when a session knowingly failed.
Sascha Haeberling [Thu, 28 May 2015 00:27:21 +0000 (00:27 +0000)]
am dad39b12: Add logging for when a session knowingly failed.

* commit 'dad39b12816f05468476804b7caf3ef39a4aa682':
  Add logging for when a session knowingly failed.

8 years agoAdd logging for when a session knowingly failed.
Sascha Haeberling [Thu, 28 May 2015 00:04:28 +0000 (17:04 -0700)]
Add logging for when a session knowingly failed.

 Bug: 21169512

Change-Id: Ic1dc499785a97f7344e517f555fa5f7b3a1c7ea9

8 years agoam 14d92c34: Merge "Log capture session canceled events." into ub-camera-haleakala
Paul Rohde [Wed, 27 May 2015 23:47:34 +0000 (23:47 +0000)]
am 14d92c34: Merge "Log capture session canceled events." into ub-camera-haleakala

* commit '14d92c346e1890cf3eeb0fb9c846d834e2c59179':
  Log capture session canceled events.

8 years agoMerge "Log capture session canceled events." into ub-camera-haleakala
Paul Rohde [Wed, 27 May 2015 23:36:28 +0000 (23:36 +0000)]
Merge "Log capture session canceled events." into ub-camera-haleakala

8 years agoLog capture session canceled events.
Paul Rohde [Wed, 27 May 2015 22:14:59 +0000 (15:14 -0700)]
Log capture session canceled events.

This will handle the edgecase where capture sessions may be
canceled inbetween the time the button is pressed and the capture
actually starts so that it is possible to subtract these cases
out of the unsaved image data.

Bug: 21169512
Change-Id: Ie226d81bb10acd90dc1297230d4b024b7cd2d4d6

8 years agoam d927492a: Handling the GcamService timeout due to application in paused state...
Gabriel Nava [Wed, 27 May 2015 20:50:21 +0000 (20:50 +0000)]
am d927492a: Handling the GcamService timeout due to application in paused state (camera-Haleakala)

* commit 'd927492ade2e253ccc620effd5602582eaa6dd2d':
  Handling the GcamService timeout due to application in paused state (camera-Haleakala)

8 years agoHandling the GcamService timeout due to application in paused state (camera-Haleakala)
Gabriel Nava [Wed, 27 May 2015 17:42:03 +0000 (10:42 -0700)]
Handling the GcamService timeout due to application in paused state (camera-Haleakala)

- When GcamService times out due to a pause state, all resources are released.
- Releasing the gcam resources without showing the error dialog allows next resume operation to open the camera

Bug: 21025113
Change-Id: I95a89fbf6ce2498c1323cd4d06383141cc7cb913

9 years agoam 7ca4f1a4: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Thu, 21 May 2015 14:22:06 +0000 (14:22 +0000)]
am 7ca4f1a4: (-s ours) Import translations. DO NOT MERGE

* commit '7ca4f1a488c01a649bf39fae1848cd31b1dfaa65':
  Import translations. DO NOT MERGE

9 years agoMerge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Thu, 21 May 2015 14:09:50 +0000 (14:09 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Thu, 21 May 2015 13:42:33 +0000 (06:42 -0700)]
Import translations. DO NOT MERGE

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

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Thu, 21 May 2015 13:41:30 +0000 (06:41 -0700)]
Import translations. DO NOT MERGE

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

9 years agoImport translations. DO NOT MERGE
Baligh Uddin [Thu, 21 May 2015 04:21:54 +0000 (21:21 -0700)]
Import translations. DO NOT MERGE

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

9 years agoam 090f2fce: Fill out more EXIF data, closer parity to Nexus HAL bug: 21277434
Spike Sprague [Thu, 21 May 2015 01:20:59 +0000 (01:20 +0000)]
am 090f2fce: Fill out more EXIF data, closer parity to Nexus HAL bug: 21277434

* commit '090f2fce636d45d8e32d3e8cb665c0880d5a9e70':
  Fill out more EXIF data, closer parity to Nexus HAL bug: 21277434