OSDN Git Service

android-x86/packages-apps-Camera2.git
7 years agoChange default video quality to medium marshmallow-x86 android-x86-6.0-r3
Chih-Wei Huang [Thu, 10 Nov 2016 05:42:43 +0000 (13:42 +0800)]
Change default video quality to medium

8 years agoImport translations. DO NOT MERGE
Baligh Uddin [Sat, 26 Sep 2015 16:11:39 +0000 (09:11 -0700)]
Import translations. DO NOT MERGE

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

8 years agoImport translations. DO NOT MERGE
Baligh Uddin [Fri, 18 Sep 2015 23:01:09 +0000 (16:01 -0700)]
Import translations. DO NOT MERGE

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

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 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 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 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 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 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 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 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 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 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 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 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 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 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 cc4f1804: am 6bb610be: am ad510fdd: Merge "Set ModeListView to LTR layout" into...
Alan Newberger [Mon, 13 Jul 2015 23:01:40 +0000 (23:01 +0000)]
am cc4f1804: am 6bb610be: am ad510fdd: Merge "Set ModeListView to LTR layout" into ub-camera-haleakala

* commit 'cc4f1804cdd1bd41b1531883db25c28a55326f4c':
  Set ModeListView to LTR layout

8 years agoam f3eb023d: (-s ours) am 50f8944c: (-s ours) am 1ac1ac74: (-s ours) Import translati...
Geoff Mendal [Mon, 13 Jul 2015 23:01:10 +0000 (23:01 +0000)]
am f3eb023d: (-s ours) am 50f8944c: (-s ours) am 1ac1ac74: (-s ours) Import translations. DO NOT MERGE

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

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

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

8 years agoam 0e58fb83: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Mon, 13 Jul 2015 23:01:07 +0000 (23:01 +0000)]
am 0e58fb83: (-s ours) Import translations. DO NOT MERGE

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

8 years agoam 57b4d24e: (-s ours) am 09364eeb: (-s ours) am b980a5be: (-s ours) Import translati...
Geoff Mendal [Mon, 13 Jul 2015 23:00:25 +0000 (23:00 +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 23:00:23 +0000 (23:00 +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 23:00:22 +0000 (23:00 +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 22:30:17 +0000 (22:30 +0000)]
am c9b45d41: am 01c3f7ad: am e25f675a: Shorten location startup dialog string

* commit 'c9b45d41b93f0e31ed88cf22db387006b8219333':
  Shorten location startup dialog string

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 agoImport translations. DO NOT MERGE
Geoff Mendal [Sat, 11 Jul 2015 16:51:55 +0000 (09:51 -0700)]
Import translations. DO NOT MERGE

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

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 ade8896d: am 2fc4970c: am 00720781: Null check when evaluating valid resolution...
Alan Newberger [Fri, 10 Jul 2015 17:06:43 +0000 (17:06 +0000)]
am ade8896d: am 2fc4970c: am 00720781: Null check when evaluating valid resolution size

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

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:21:54 +0000 (01:21 +0000)]
am dfd3ecb1: am 148d0b8e: Launch PermissionsActivity if CameraActivity resume is called without critical permissions.

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

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:07:55 +0000 (20:07 +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:47 +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:24:12 +0000 (13:24 +0000)]
am ccb925b1: (-s ours) am a5380779: (-s ours) Import translations. DO NOT MERGE

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

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

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

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