OSDN Git Service

android-x86/packages-apps-Camera2.git
8 years agoam 212962d0: (-s ours) am a532005c: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Thu, 27 Aug 2015 11:18:57 +0000 (11:18 +0000)]
am 212962d0: (-s ours) am a532005c: (-s ours) Import translations. DO NOT MERGE

* commit '212962d0e187ac02d7fd6b7bd7c49efea8b78235':

8 years agoam 32360bba: (-s ours) am 2b4101fe: am ad44cda8: Minimum viable Android M runtime...
zafir [Thu, 27 Aug 2015 11:18:55 +0000 (11:18 +0000)]
am 32360bba: (-s ours) am 2b4101fe: am ad44cda8: Minimum viable Android M runtime permissions handling for H.

* commit '32360bbac79e265eeadf607c07f67fa9c8f0825e':

8 years agoam bd9ebc8b: am 256c6777: am 5816ae83: am 431be7f8: am c8594ddf: Check for zero lengt...
Alan Newberger [Sat, 1 Aug 2015 17:15:42 +0000 (17:15 +0000)]
am bd9ebc8b: am 256c6777: am 5816ae83: am 431be7f8: am c8594ddf: Check for zero length array returns

* commit 'bd9ebc8bff594c33fd5d756c75201f44d5622361':
  Check for zero length array returns

8 years agoam ba6e96ae: am 60c84e08: am 65485d40: am ef0b96ce: Change MNC codename to just M.
Dianne Hackborn [Sat, 1 Aug 2015 17:15:42 +0000 (17:15 +0000)]
am ba6e96ae: am 60c84e08: am 65485d40: am ef0b96ce: Change MNC codename to just M.

* commit 'ba6e96ae636ba23188c8cd4210a7b55a9ab6a58d':
  Change MNC codename to just M.

8 years agoam 256c6777: am 5816ae83: am 431be7f8: am c8594ddf: Check for zero length array returns
Alan Newberger [Sat, 1 Aug 2015 16:55:50 +0000 (16:55 +0000)]
am 256c6777: am 5816ae83: am 431be7f8: am c8594ddf: Check for zero length array returns

* commit '256c677704cf5933d224e6177c46db59da5d9819':
  Check for zero length array returns

8 years agoam 60c84e08: am 65485d40: am ef0b96ce: Change MNC codename to just M.
Dianne Hackborn [Sat, 1 Aug 2015 16:55:49 +0000 (16:55 +0000)]
am 60c84e08: am 65485d40: am ef0b96ce: Change MNC codename to just M.

* commit '60c84e082c06df890c2f6af710dde4f83b407ee1':
  Change MNC codename to just M.

8 years agoam 5816ae83: am 431be7f8: am c8594ddf: Check for zero length array returns
Alan Newberger [Sat, 1 Aug 2015 16:36:33 +0000 (16:36 +0000)]
am 5816ae83: am 431be7f8: am c8594ddf: Check for zero length array returns

* commit '5816ae83804d6e3e899becb1c182324cba5d99f9':
  Check for zero length array returns

8 years agoam 65485d40: am ef0b96ce: Change MNC codename to just M.
Dianne Hackborn [Sat, 1 Aug 2015 16:35:58 +0000 (16:35 +0000)]
am 65485d40: am ef0b96ce: Change MNC codename to just M.

* commit '65485d4097b704f4df6a5dcd180873be55d51645':
  Change MNC codename to just M.

8 years agoam 431be7f8: am c8594ddf: Check for zero length array returns
Alan Newberger [Fri, 31 Jul 2015 19:55:34 +0000 (19:55 +0000)]
am 431be7f8: am c8594ddf: Check for zero length array returns

* commit '431be7f85d9693a05b1a1863d75ea44e7b008754':
  Check for zero length array returns

8 years agoam c8594ddf: Check for zero length array returns
Alan Newberger [Fri, 31 Jul 2015 19:45:57 +0000 (19:45 +0000)]
am c8594ddf: Check for zero length array returns

* commit 'c8594ddf504109dc3c17baf9c2448469b28973e9':
  Check for zero length array returns

8 years agoam ef0b96ce: Change MNC codename to just M.
Dianne Hackborn [Fri, 31 Jul 2015 19:42:15 +0000 (19:42 +0000)]
am ef0b96ce: Change MNC codename to just M.

* commit 'ef0b96ce4571805066c1e0865d41272b066e22e6':
  Change MNC codename to just M.

8 years agoCheck for zero length array returns
Alan Newberger [Fri, 31 Jul 2015 19:37:15 +0000 (12:37 -0700)]
Check for zero length array returns

permissions API may return zero length arrays, check before
access.

Bug: 22871531
Change-Id: I0ebd5feecb24f03fda0350a9ab42efa25127b3dc

8 years agoChange MNC codename to just M.
Dianne Hackborn [Wed, 29 Jul 2015 22:23:08 +0000 (15:23 -0700)]
Change MNC codename to just M.

Change-Id: I1a6d7b269e5b7a1630d29e9f406684175d5bdf7d

8 years agoam 8d9b317a: (-s ours) am 71e31e6b: (-s ours) am 6269e66d: (-s ours) am 822b0367...
Geoff Mendal [Wed, 29 Jul 2015 17:04:16 +0000 (17:04 +0000)]
am 8d9b317a: (-s ours) am 71e31e6b: (-s ours) am 6269e66d: (-s ours) am 822b0367: (-s ours) am 51a59c80: (-s ours) am a94d0f6f: (-s ours) Import translations. DO NOT MERGE

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

8 years agoam 2c2b4bb0: (-s ours) am f1b38f71: (-s ours) am 6b1e2a64: (-s ours) am ff24828e...
Geoff Mendal [Wed, 29 Jul 2015 17:04:15 +0000 (17:04 +0000)]
am 2c2b4bb0: (-s ours) am f1b38f71: (-s ours) am 6b1e2a64: (-s ours) am ff24828e: (-s ours) am 0b9400ac: (-s ours) Import translations. DO NOT MERGE

* commit '2c2b4bb010bf03b96ad541183587923155c67109':
  Import translations. DO NOT MERGE

8 years agoam 71e31e6b: (-s ours) am 6269e66d: (-s ours) am 822b0367: (-s ours) am 51a59c80...
Geoff Mendal [Wed, 29 Jul 2015 16:49:44 +0000 (16:49 +0000)]
am 71e31e6b: (-s ours) am 6269e66d: (-s ours) am 822b0367: (-s ours) am 51a59c80: (-s ours) am a94d0f6f: (-s ours) Import translations. DO NOT MERGE

* commit '71e31e6b1ac3b5cb02497e967ffffc2120544432':
  Import translations. DO NOT MERGE

8 years agoam f1b38f71: (-s ours) am 6b1e2a64: (-s ours) am ff24828e: (-s ours) am 0b9400ac...
Geoff Mendal [Wed, 29 Jul 2015 16:49:43 +0000 (16:49 +0000)]
am f1b38f71: (-s ours) am 6b1e2a64: (-s ours) am ff24828e: (-s ours) am 0b9400ac: (-s ours) Import translations. DO NOT MERGE

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

8 years agoam 6269e66d: (-s ours) am 822b0367: (-s ours) am 51a59c80: (-s ours) am a94d0f6f...
Geoff Mendal [Wed, 29 Jul 2015 16:26:30 +0000 (16:26 +0000)]
am 6269e66d: (-s ours) am 822b0367: (-s ours) am 51a59c80: (-s ours) am a94d0f6f: (-s ours) Import translations. DO NOT MERGE

* commit '6269e66df53113c46918e8f8a46b711e50a9899a':
  Import translations. DO NOT MERGE

8 years agoam 6b1e2a64: (-s ours) am ff24828e: (-s ours) am 0b9400ac: (-s ours) Import translati...
Geoff Mendal [Wed, 29 Jul 2015 16:26:29 +0000 (16:26 +0000)]
am 6b1e2a64: (-s ours) am ff24828e: (-s ours) am 0b9400ac: (-s ours) Import translations. DO NOT MERGE

* commit '6b1e2a64def65d34e2faf0118db105e048b3a061':
  Import translations. DO NOT MERGE

8 years agoam 5737c45f: (-s ours) am 97bb1c43: (-s ours) am 14d0c31a: (-s ours) Import translati...
Geoff Mendal [Wed, 29 Jul 2015 16:25:52 +0000 (16:25 +0000)]
am 5737c45f: (-s ours) am 97bb1c43: (-s ours) am 14d0c31a: (-s ours) Import translations. DO NOT MERGE

* commit '5737c45f3a878e0768836922ec9d2ccb0a23c011':
  Import translations. DO NOT MERGE

8 years agoam 822b0367: (-s ours) am 51a59c80: (-s ours) am a94d0f6f: (-s ours) Import translati...
Geoff Mendal [Wed, 29 Jul 2015 16:17:14 +0000 (16:17 +0000)]
am 822b0367: (-s ours) am 51a59c80: (-s ours) am a94d0f6f: (-s ours) Import translations. DO NOT MERGE

* commit '822b0367d41d46a101f5a7b87094718811976517':
  Import translations. DO NOT MERGE

8 years agoam 97bb1c43: (-s ours) am 14d0c31a: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Wed, 29 Jul 2015 16:13:08 +0000 (16:13 +0000)]
am 97bb1c43: (-s ours) am 14d0c31a: (-s ours) Import translations. DO NOT MERGE

* commit '97bb1c4346663d6352a6cc3eb52e912cfd3a65b2':
  Import translations. DO NOT MERGE

8 years agoam ff24828e: (-s ours) am 0b9400ac: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Wed, 29 Jul 2015 16:11:30 +0000 (16:11 +0000)]
am ff24828e: (-s ours) am 0b9400ac: (-s ours) Import translations. DO NOT MERGE

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

8 years agoam 51a59c80: (-s ours) am a94d0f6f: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Wed, 29 Jul 2015 15:55:49 +0000 (15:55 +0000)]
am 51a59c80: (-s ours) am a94d0f6f: (-s ours) Import translations. DO NOT MERGE

* commit '51a59c80a1e60f91e446b0b55282204501cf56a7':
  Import translations. DO NOT MERGE

8 years agoam 14d0c31a: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Wed, 29 Jul 2015 15:47:09 +0000 (15:47 +0000)]
am 14d0c31a: (-s ours) Import translations. DO NOT MERGE

* commit '14d0c31a681c9db803f955a1989fc9a194c94543':
  Import translations. DO NOT MERGE

8 years agoam 0b9400ac: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Wed, 29 Jul 2015 15:45:31 +0000 (15:45 +0000)]
am 0b9400ac: (-s ours) Import translations. DO NOT MERGE

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

8 years agoam a94d0f6f: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Wed, 29 Jul 2015 15:45:30 +0000 (15:45 +0000)]
am a94d0f6f: (-s ours) Import translations. DO NOT MERGE

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

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

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

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

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

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

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

8 years agoam 0ad179cb: am 4c5b76b5: am f2c82590: am 5bbf8748: am 30339719: Remove unused ACCOUN...
Alan Newberger [Fri, 24 Jul 2015 19:02:00 +0000 (19:02 +0000)]
am 0ad179cb: am 4c5b76b5: am f2c82590: am 5bbf8748: am 30339719: Remove unused ACCOUNTS permissions

* commit '0ad179cb4d27c73feadfe29bb8c954e81355d6dd':
  Remove unused ACCOUNTS permissions

8 years agoam 2ef8ffd2: am d7a6172b: am a5c8a7da: am 151f74fc: am 4df3011e: Protect against...
Alan Newberger [Fri, 24 Jul 2015 19:01:57 +0000 (19:01 +0000)]
am 2ef8ffd2: am d7a6172b: am a5c8a7da: am 151f74fc: am 4df3011e: Protect against destroying uncreated values

* commit '2ef8ffd24cec8800467ed2c9192141c1648a47ce':
  Protect against destroying uncreated values

8 years agoam 4c5b76b5: am f2c82590: am 5bbf8748: am 30339719: Remove unused ACCOUNTS permissions
Alan Newberger [Fri, 24 Jul 2015 18:50:50 +0000 (18:50 +0000)]
am 4c5b76b5: am f2c82590: am 5bbf8748: am 30339719: Remove unused ACCOUNTS permissions

* commit '4c5b76b553a81ba1916bae9b669285e01e682039':
  Remove unused ACCOUNTS permissions

8 years agoam d7a6172b: am a5c8a7da: am 151f74fc: am 4df3011e: Protect against destroying uncrea...
Alan Newberger [Fri, 24 Jul 2015 18:50:49 +0000 (18:50 +0000)]
am d7a6172b: am a5c8a7da: am 151f74fc: am 4df3011e: Protect against destroying uncreated values

* commit 'd7a6172bfa8b889a290f6623de53bbf41943a373':
  Protect against destroying uncreated values

8 years agoam f2c82590: am 5bbf8748: am 30339719: Remove unused ACCOUNTS permissions
Alan Newberger [Fri, 24 Jul 2015 18:33:33 +0000 (18:33 +0000)]
am f2c82590: am 5bbf8748: am 30339719: Remove unused ACCOUNTS permissions

* commit 'f2c82590b1ea264578b6cbd87a51b031afd7662b':
  Remove unused ACCOUNTS permissions

8 years agoam a5c8a7da: am 151f74fc: am 4df3011e: Protect against destroying uncreated values
Alan Newberger [Fri, 24 Jul 2015 18:33:31 +0000 (18:33 +0000)]
am a5c8a7da: am 151f74fc: am 4df3011e: Protect against destroying uncreated values

* commit 'a5c8a7daefe8fadb37ec4f5508eb458a52582013':
  Protect against destroying uncreated values

8 years agoam 5bbf8748: am 30339719: Remove unused ACCOUNTS permissions
Alan Newberger [Fri, 24 Jul 2015 18:19:11 +0000 (18:19 +0000)]
am 5bbf8748: am 30339719: Remove unused ACCOUNTS permissions

* commit '5bbf8748046e59b5633d42c84ff687fa22405ea5':
  Remove unused ACCOUNTS permissions

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

* commit '151f74fca138df5d3c6f83b86e3b6e8d9748a7e3':
  Protect against destroying uncreated values

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 e5f7f883: am 471cd0b4: am f0c8509b: am 1aaec6c0: am ae474d0b: [Haleakala] Change...
Sascha Haeberling [Fri, 24 Jul 2015 04:07:43 +0000 (04:07 +0000)]
am e5f7f883: am 471cd0b4: am f0c8509b: am 1aaec6c0: am ae474d0b: [Haleakala] Change JPEG compression thread priority to BACKGROUND - 1.

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

8 years agoam 471cd0b4: am f0c8509b: am 1aaec6c0: am ae474d0b: [Haleakala] Change JPEG compressi...
Sascha Haeberling [Fri, 24 Jul 2015 03:39:55 +0000 (03:39 +0000)]
am 471cd0b4: am f0c8509b: am 1aaec6c0: am ae474d0b: [Haleakala] Change JPEG compression thread priority to BACKGROUND - 1.

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

8 years agoam f0c8509b: am 1aaec6c0: am ae474d0b: [Haleakala] Change JPEG compression thread...
Sascha Haeberling [Fri, 24 Jul 2015 03:08:55 +0000 (03:08 +0000)]
am f0c8509b: am 1aaec6c0: am ae474d0b: [Haleakala] Change JPEG compression thread priority to BACKGROUND - 1.

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

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

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

8 years agoam 42efa85d: Merge "Use build number from file"
Colin Cross [Thu, 23 Jul 2015 19:11:28 +0000 (19:11 +0000)]
am 42efa85d: Merge "Use build number from file"

* commit '42efa85dc19e6c105012d67e7a331ec0b64609e4':
  Use build number from file

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 agoMerge "Use build number from file"
Colin Cross [Thu, 23 Jul 2015 18:23:52 +0000 (18:23 +0000)]
Merge "Use build number from file"

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 219d4082: am 56199571: am 63704a16: am 2506ff92: am ac0e2425: Fixes to M permissions.
zafir [Sat, 18 Jul 2015 01:04:46 +0000 (01:04 +0000)]
am 219d4082: am 56199571: am 63704a16: am 2506ff92: am ac0e2425: Fixes to M permissions.

* commit '219d40829535d7b9d5a7f8d0e9cca9ba1f39f49a':
  Fixes to M permissions.

8 years agoam 56199571: am 63704a16: am 2506ff92: am ac0e2425: Fixes to M permissions.
zafir [Sat, 18 Jul 2015 00:51:48 +0000 (00:51 +0000)]
am 56199571: am 63704a16: am 2506ff92: am ac0e2425: Fixes to M permissions.

* commit '5619957164de0211e7a8fde5cae199ae4e4cb874':
  Fixes to M permissions.

8 years agoam 63704a16: am 2506ff92: am ac0e2425: Fixes to M permissions.
zafir [Sat, 18 Jul 2015 00:40:10 +0000 (00:40 +0000)]
am 63704a16: am 2506ff92: am ac0e2425: Fixes to M permissions.

* commit '63704a163384b4e9c610e81a7eab4c6a634dbd36':
  Fixes to M permissions.

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

* commit '2506ff92df39152e2ea0cb9070fa08db05262e2a':
  Fixes to M permissions.

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 agoUse build number from file
Colin Cross [Fri, 17 Jul 2015 17:26:47 +0000 (10:26 -0700)]
Use build number from file

Improve incremental ninja builds by keeping the command line the same
across builds.

Change-Id: Ifb9ff4c8284af762a4f7b487a3d7a07640dc733c

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 902cf20b: am e972aa8f: am 8ec15d5f: am e65f51f5: am dd334be9: Camera M permissions...
zafir [Fri, 17 Jul 2015 19:23:30 +0000 (19:23 +0000)]
am 902cf20b: am e972aa8f: am 8ec15d5f: am e65f51f5: am dd334be9: Camera M permissions: lockscreen improvements

* commit '902cf20b4379a57946bc7d522337191e7f476473':
  Camera M permissions: lockscreen improvements

8 years agoam e972aa8f: am 8ec15d5f: am e65f51f5: am dd334be9: Camera M permissions: lockscreen...
zafir [Fri, 17 Jul 2015 19:00:51 +0000 (19:00 +0000)]
am e972aa8f: am 8ec15d5f: am e65f51f5: am dd334be9: Camera M permissions: lockscreen improvements

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

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

* commit '8ec15d5fe95c9851a4fcbe94a627f927639d19ff':
  Camera M permissions: lockscreen improvements

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

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

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 eaff847e: (-s ours) am e5c66661: (-s ours) am 5559d54b: (-s ours) am ede11beb...
Geoff Mendal [Wed, 15 Jul 2015 15:03:32 +0000 (15:03 +0000)]
am eaff847e: (-s ours) am e5c66661: (-s ours) am 5559d54b: (-s ours) am ede11beb: (-s ours) am 34663b0f: (-s ours) am 36c35f23: (-s ours) Import translations. DO NOT MERGE

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

8 years agoam 788248b1: (-s ours) am 3f10b42f: (-s ours) am 684332f2: (-s ours) am 5449f0fd...
Geoff Mendal [Wed, 15 Jul 2015 15:03:31 +0000 (15:03 +0000)]
am 788248b1: (-s ours) am 3f10b42f: (-s ours) am 684332f2: (-s ours) am 5449f0fd: (-s ours) am 62f7a266: (-s ours) Import translations. DO NOT MERGE

* commit '788248b1c10ff677b6b0fd6aa6cdadcf64db361b':
  Import translations. DO NOT MERGE

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

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

8 years agoam 3f10b42f: (-s ours) am 684332f2: (-s ours) am 5449f0fd: (-s ours) am 62f7a266...
Geoff Mendal [Wed, 15 Jul 2015 14:47:31 +0000 (14:47 +0000)]
am 3f10b42f: (-s ours) am 684332f2: (-s ours) am 5449f0fd: (-s ours) am 62f7a266: (-s ours) Import translations. DO NOT MERGE

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

8 years agoam 07d04ef5: (-s ours) am 45e0aa09: (-s ours) am 13688c8b: (-s ours) am a95faf78...
Geoff Mendal [Wed, 15 Jul 2015 14:40:34 +0000 (14:40 +0000)]
am 07d04ef5: (-s ours) am 45e0aa09: (-s ours) am 13688c8b: (-s ours) am a95faf78: (-s ours) Import translations. DO NOT MERGE

* commit '07d04ef575a8b5cffc200277aa91292fe2f4f10a':
  Import translations. DO NOT MERGE

8 years agoam 4c875ca0: (-s ours) am 9ef51ffc: (-s ours) am d8296c0e: (-s ours) Import translati...
Geoff Mendal [Wed, 15 Jul 2015 14:40:33 +0000 (14:40 +0000)]
am 4c875ca0: (-s ours) am 9ef51ffc: (-s ours) am d8296c0e: (-s ours) Import translations. DO NOT MERGE

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

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

* commit '5559d54b4472979a423ed7b94f6d4803107b9c86':
  Import translations. DO NOT MERGE

8 years agoam 684332f2: (-s ours) am 5449f0fd: (-s ours) am 62f7a266: (-s ours) Import translati...
Geoff Mendal [Wed, 15 Jul 2015 14:35:28 +0000 (14:35 +0000)]
am 684332f2: (-s ours) am 5449f0fd: (-s ours) am 62f7a266: (-s ours) Import translations. DO NOT MERGE

* commit '684332f23fc40b49452c7ee4f8f53aafbecb0e0a':
  Import translations. DO NOT MERGE

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

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

8 years agoam 45e0aa09: (-s ours) am 13688c8b: (-s ours) am a95faf78: (-s ours) Import translati...
Geoff Mendal [Wed, 15 Jul 2015 14:24:59 +0000 (14:24 +0000)]
am 45e0aa09: (-s ours) am 13688c8b: (-s ours) am a95faf78: (-s ours) Import translations. DO NOT MERGE

* commit '45e0aa097a92d5019e69002871ccb337a9b3d7b1':
  Import translations. DO NOT MERGE

8 years agoam 9ef51ffc: (-s ours) am d8296c0e: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Wed, 15 Jul 2015 14:24:58 +0000 (14:24 +0000)]
am 9ef51ffc: (-s ours) am d8296c0e: (-s ours) Import translations. DO NOT MERGE

* commit '9ef51ffc17e2cdfe21311a89558c31633e3c1d6d':
  Import translations. DO NOT MERGE

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

* commit '5449f0fdc0fe0eceb106e4d4554cdfe729103f84':
  Import translations. DO NOT MERGE

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 13688c8b: (-s ours) am a95faf78: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Wed, 15 Jul 2015 14:09:40 +0000 (14:09 +0000)]
am 13688c8b: (-s ours) am a95faf78: (-s ours) Import translations. DO NOT MERGE

* commit '13688c8b7e84a2ff8017c33db35559b5d0fb878a':
  Import translations. DO NOT MERGE

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

* commit 'd8296c0e192b71603b3a473cfc696ccfffb04162':
  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 agoam a95faf78: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Wed, 15 Jul 2015 14:02:38 +0000 (14:02 +0000)]
am a95faf78: (-s ours) Import translations. DO NOT MERGE

* commit 'a95faf780471afea65bb4e5f2b2570e4d9a4e7b9':
  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:51:19 +0000 (06:51 -0700)]
Import translations. DO NOT MERGE

Change-Id: Icc30bb057630e9fde4214259ba5407d99475c3b8
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 dc185a9b: (-s ours) am 6bee46a1: (-s ours) am ec281039: (-s ours) am 498af6a5...
Geoff Mendal [Tue, 14 Jul 2015 22:19:39 +0000 (22:19 +0000)]
am dc185a9b: (-s ours) am 6bee46a1: (-s ours) am ec281039: (-s ours) am 498af6a5: (-s ours) am ca7f4ce9: (-s ours) am ec5a5213: (-s ours) Import translations. DO NOT MERGE

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

8 years agoam cf38f8a7: (-s ours) am 04312d09: (-s ours) am 15579b8d: (-s ours) am 4e3575eb...
Geoff Mendal [Tue, 14 Jul 2015 22:05:51 +0000 (22:05 +0000)]
am cf38f8a7: (-s ours) am 04312d09: (-s ours) am 15579b8d: (-s ours) am 4e3575eb: (-s ours) am 4c77d6a7: (-s ours) Import translations. DO NOT MERGE

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

8 years agoam 6bee46a1: (-s ours) am ec281039: (-s ours) am 498af6a5: (-s ours) am ca7f4ce9...
Geoff Mendal [Tue, 14 Jul 2015 22:04:15 +0000 (22:04 +0000)]
am 6bee46a1: (-s ours) am ec281039: (-s ours) am 498af6a5: (-s ours) am ca7f4ce9: (-s ours) am ec5a5213: (-s ours) Import translations. DO NOT MERGE

* commit '6bee46a1b4cbfc420d9c020bbab3d7821de7acbe':
  Import translations. DO NOT MERGE

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

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

8 years agoam 04312d09: (-s ours) am 15579b8d: (-s ours) am 4e3575eb: (-s ours) am 4c77d6a7...
Geoff Mendal [Tue, 14 Jul 2015 21:48:51 +0000 (21:48 +0000)]
am 04312d09: (-s ours) am 15579b8d: (-s ours) am 4e3575eb: (-s ours) am 4c77d6a7: (-s ours) Import translations. DO NOT MERGE

* commit '04312d09bcc42332cd582c659ee483f52e1eae12':
  Import translations. DO NOT MERGE

8 years agoam 15579b8d: (-s ours) am 4e3575eb: (-s ours) am 4c77d6a7: (-s ours) Import translati...
Geoff Mendal [Tue, 14 Jul 2015 21:37:52 +0000 (21:37 +0000)]
am 15579b8d: (-s ours) am 4e3575eb: (-s ours) am 4c77d6a7: (-s ours) Import translations. DO NOT MERGE

* commit '15579b8d972cc0b986d8fd39debaede674ae0bce':
  Import translations. DO NOT MERGE

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

* commit '498af6a5693cde49419f3a9abcfeb572d3a461e2':
  Import translations. DO NOT MERGE

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 4e3575eb: (-s ours) am 4c77d6a7: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Tue, 14 Jul 2015 21:18:38 +0000 (21:18 +0000)]
am 4e3575eb: (-s ours) am 4c77d6a7: (-s ours) Import translations. DO NOT MERGE

* commit '4e3575eb98e1b60600a9146862ab190491eec035':
  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 bf74bf11: am 33fc1716: am 801d5289: am cc4f1804: am 6bb610be: am ad510fdd: Merge...
Alan Newberger [Tue, 14 Jul 2015 17:15:32 +0000 (17:15 +0000)]
am bf74bf11: am 33fc1716: am 801d5289: am cc4f1804: am 6bb610be: am ad510fdd: Merge "Set ModeListView to LTR layout" into ub-camera-haleakala

* commit 'bf74bf11cd6a59fd3f393d850071e1b079fb2eee':
  Set ModeListView to LTR layout

8 years agoam 42bef58d: (-s ours) am f962ec00: (-s ours) am c3b7039c: (-s ours) am f3eb023d...
Geoff Mendal [Tue, 14 Jul 2015 17:15:31 +0000 (17:15 +0000)]
am 42bef58d: (-s ours) am f962ec00: (-s ours) am c3b7039c: (-s ours) am f3eb023d: (-s ours) am 50f8944c: (-s ours) am 1ac1ac74: (-s ours) Import translations. DO NOT MERGE

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