Commit Graph

8694 Commits

Author SHA1 Message Date
Geoff Mendal
eea96f22a1 Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 23037720
Change-Id: I2349611e7f02b8e06ac12a4c86573711c6ff6a0e
2015-08-12 21:50:09 -07:00
Dianne Hackborn
ca9433519b am a0b5ab0e: am cd2b9e12: am 2be290cf: am 6a1e1e08: am f67d0785: Merge "Fix issue #23116383: Include security patch level in Settings" into mnc-dev
* commit 'a0b5ab0ef6b9525e4bb68bb0ac6c8f3bfb144c9f':
  Fix issue #23116383: Include security patch level in Settings
2015-08-13 02:10:09 +00:00
Dianne Hackborn
a0b5ab0ef6 am cd2b9e12: am 2be290cf: am 6a1e1e08: am f67d0785: Merge "Fix issue #23116383: Include security patch level in Settings" into mnc-dev
* commit 'cd2b9e1217ef622dcd5127715c9ee5b3db6504ee':
  Fix issue #23116383: Include security patch level in Settings
2015-08-13 01:18:08 +00:00
Dianne Hackborn
cd2b9e1217 am 2be290cf: am 6a1e1e08: am f67d0785: Merge "Fix issue #23116383: Include security patch level in Settings" into mnc-dev
* commit '2be290cf36f06da260e67b430a625422da512609':
  Fix issue #23116383: Include security patch level in Settings
2015-08-13 01:09:10 +00:00
Dianne Hackborn
2be290cf36 am 6a1e1e08: am f67d0785: Merge "Fix issue #23116383: Include security patch level in Settings" into mnc-dev
* commit '6a1e1e08a0b5f671a1054b9a46f1e0c0a90738c4':
  Fix issue #23116383: Include security patch level in Settings
2015-08-13 01:02:23 +00:00
Dianne Hackborn
6a1e1e08a0 am f67d0785: Merge "Fix issue #23116383: Include security patch level in Settings" into mnc-dev
* commit 'f67d0785d006677d2fba3f2192f3f6ea824c5336':
  Fix issue #23116383: Include security patch level in Settings
2015-08-13 00:54:31 +00:00
Dianne Hackborn
f67d0785d0 Merge "Fix issue #23116383: Include security patch level in Settings" into mnc-dev 2015-08-13 00:46:58 +00:00
Dianne Hackborn
b9a8e277d9 Fix issue #23116383: Include security patch level in Settings
Change-Id: I003564376a02a70f0245353472544cde355240ac
2015-08-12 16:11:46 -07:00
Todd Kennedy
c37a80990b Merge "Add force external setting" 2015-08-12 16:53:32 +00:00
Geoff Mendal
42ae7fba5b Import translations. DO NOT MERGE
Change-Id: Id1b064096c8580892f747af1c02e46ad5b897671
Auto-generated-cl: translation import
2015-08-12 07:00:45 -07:00
Geoff Mendal
b094d8e213 Import translations. DO NOT MERGE
Change-Id: I9361c89e61ac3f958dc840806aae88fece5d4aab
Auto-generated-cl: translation import
2015-08-12 06:11:54 -07:00
Dianne Hackborn
0af26c1dce am 5876e309: am 0f440a70: am 540afe77: am e2e76435: am 8500822b: Merge "Fix issue #23079119: Description for write settings permission says..." into mnc-dev
* commit '5876e30931915f3dcfcf044e7ce46ca039ace75a':
  Fix issue #23079119: Description for write settings permission says...
2015-08-12 00:00:20 +00:00
Dianne Hackborn
5876e30931 am 0f440a70: am 540afe77: am e2e76435: am 8500822b: Merge "Fix issue #23079119: Description for write settings permission says..." into mnc-dev
* commit '0f440a701cc32fab7a522fe677ee4c280ca648f8':
  Fix issue #23079119: Description for write settings permission says...
2015-08-11 23:56:35 +00:00
Dianne Hackborn
0f440a701c am 540afe77: am e2e76435: am 8500822b: Merge "Fix issue #23079119: Description for write settings permission says..." into mnc-dev
* commit '540afe774a201dc3a1ab4fff49c340bdb5b1fb8d':
  Fix issue #23079119: Description for write settings permission says...
2015-08-11 23:48:49 +00:00
Maurice Lam
bb26847ba4 am 305c4335: am d2174636: am 4797364d: am a430ac56: am 3d9cb926: Merge "[Fingerprint] Use different ring size for setup" into mnc-dev
* commit '305c4335512f9a9c42b0925e8b23b869348c3d95':
  [Fingerprint] Use different ring size for setup
2015-08-11 23:39:44 +00:00
Dianne Hackborn
540afe774a am e2e76435: am 8500822b: Merge "Fix issue #23079119: Description for write settings permission says..." into mnc-dev
* commit 'e2e76435f4a0604d751b32838409421b072ca25d':
  Fix issue #23079119: Description for write settings permission says...
2015-08-11 23:39:23 +00:00
Maurice Lam
305c433551 am d2174636: am 4797364d: am a430ac56: am 3d9cb926: Merge "[Fingerprint] Use different ring size for setup" into mnc-dev
* commit 'd2174636293e52d4df01f191787df62e96e994d3':
  [Fingerprint] Use different ring size for setup
2015-08-11 23:32:26 +00:00
Maurice Lam
d217463629 am 4797364d: am a430ac56: am 3d9cb926: Merge "[Fingerprint] Use different ring size for setup" into mnc-dev
* commit '4797364d8ac175b3322f7adcb5963602f2bb18d0':
  [Fingerprint] Use different ring size for setup
2015-08-11 23:27:00 +00:00
Dianne Hackborn
e2e76435f4 am 8500822b: Merge "Fix issue #23079119: Description for write settings permission says..." into mnc-dev
* commit '8500822b8e39473e272a0c4e84349aa9dadf763f':
  Fix issue #23079119: Description for write settings permission says...
2015-08-11 23:26:45 +00:00
Dianne Hackborn
8500822b8e Merge "Fix issue #23079119: Description for write settings permission says..." into mnc-dev 2015-08-11 23:17:24 +00:00
Maurice Lam
4797364d8a am a430ac56: am 3d9cb926: Merge "[Fingerprint] Use different ring size for setup" into mnc-dev
* commit 'a430ac56b22da424abeda82ca074ef19d5e9cd56':
  [Fingerprint] Use different ring size for setup
2015-08-11 23:15:33 +00:00
Maurice Lam
a430ac56b2 am 3d9cb926: Merge "[Fingerprint] Use different ring size for setup" into mnc-dev
* commit '3d9cb9261849d8178ce834c8216fe2154db4e5af':
  [Fingerprint] Use different ring size for setup
2015-08-11 22:43:35 +00:00
Maurice Lam
3d9cb92618 Merge "[Fingerprint] Use different ring size for setup" into mnc-dev 2015-08-11 22:35:53 +00:00
Dianne Hackborn
4f8b829b24 Fix issue #23079119: Description for write settings permission says...
...it is for read and write

Just write.

And let's say, modify.

Change-Id: If901bab36888674d5a6e8c5979ec190b64aff18e
2015-08-11 12:17:59 -07:00
Jason Monk
fe7a25f8fe am 1e29e6b9: am 31227bfa: am bce29c8a: am 746886c5: Merge "Add setting to disable camera gesture" into mnc-dr-dev
* commit '1e29e6b9ecb8cadceb6a815464ad3f5e4f6d2138':
  Add setting to disable camera gesture
2015-08-11 14:20:29 +00:00
Jason Monk
1e29e6b9ec am 31227bfa: am bce29c8a: am 746886c5: Merge "Add setting to disable camera gesture" into mnc-dr-dev
* commit '31227bfaf12ede192474bb162f1555215ffa605b':
  Add setting to disable camera gesture
2015-08-11 14:12:00 +00:00
Jason Monk
31227bfaf1 am bce29c8a: am 746886c5: Merge "Add setting to disable camera gesture" into mnc-dr-dev
* commit 'bce29c8a012a27d4cd4ca87892d215e29a793fa7':
  Add setting to disable camera gesture
2015-08-11 14:08:02 +00:00
Jason Monk
bce29c8a01 am 746886c5: Merge "Add setting to disable camera gesture" into mnc-dr-dev
* commit '746886c59a20dc33d62c2dd500fd27edcf0abcca':
  Add setting to disable camera gesture
2015-08-11 14:02:37 +00:00
Jason Monk
746886c59a Merge "Add setting to disable camera gesture" into mnc-dr-dev 2015-08-11 13:55:54 +00:00
Dianne Hackborn
b05082598c am c7fbbf0d: am c262c522: am 6fcacc41: am fc7633ca: am ba38155d: Merge "Fix issue #23037720: New Battery Optimization Strings" into mnc-dev
* commit 'c7fbbf0d7c9b1fd432dd702c2a46f039c463fd85':
  Fix issue #23037720: New Battery Optimization Strings
2015-08-11 00:38:31 +00:00
Dianne Hackborn
c7fbbf0d7c am c262c522: am 6fcacc41: am fc7633ca: am ba38155d: Merge "Fix issue #23037720: New Battery Optimization Strings" into mnc-dev
* commit 'c262c522ae2ae31b5a6d1217efb40cbf81bbef59':
  Fix issue #23037720: New Battery Optimization Strings
2015-08-11 00:33:41 +00:00
Dianne Hackborn
c262c522ae am 6fcacc41: am fc7633ca: am ba38155d: Merge "Fix issue #23037720: New Battery Optimization Strings" into mnc-dev
* commit '6fcacc41273a195dfa0f4cbca93c4eafe32edd1d':
  Fix issue #23037720: New Battery Optimization Strings
2015-08-11 00:27:06 +00:00
Dianne Hackborn
6fcacc4127 am fc7633ca: am ba38155d: Merge "Fix issue #23037720: New Battery Optimization Strings" into mnc-dev
* commit 'fc7633cae2aec30f32adbc26d3e24a8005e773f5':
  Fix issue #23037720: New Battery Optimization Strings
2015-08-11 00:19:07 +00:00
Dianne Hackborn
fc7633cae2 am ba38155d: Merge "Fix issue #23037720: New Battery Optimization Strings" into mnc-dev
* commit 'ba38155d257aa00e0dabb9cf9eefc1a281278a14':
  Fix issue #23037720: New Battery Optimization Strings
2015-08-11 00:11:09 +00:00
Dianne Hackborn
9bedd25c77 Fix issue #23037720: New Battery Optimization Strings
No, really, these are the strings.

Change-Id: Ibe94b5251934a1d855974d846f3de6bdb314c7e9
2015-08-10 17:03:38 -07:00
Jorim Jaggi
9a2af1ad7a Fix fingerprint string descriptions
Change-Id: I83d4c89d9a060871117f8ec8cd72f36c1f3cf3a4
2015-08-10 23:08:27 +00:00
Todd Kennedy
97162821f9 Add force external setting
Adds a developer setting that overrides the package's storage
preference. This allows any [non-system] package to be moved
to external storage.

Bug: 22282121
Change-Id: Ie21bc13b1d92fe0972f789a2187e11d2e413f040
2015-08-10 09:50:28 -07:00
Geoff Mendal
41abf66362 Import translations. DO NOT MERGE
Change-Id: If91d4ed788fe61f16f68cdc2fb8c1d1a6ca39721
Auto-generated-cl: translation import
2015-08-10 07:03:46 -07:00
Geoff Mendal
3331e42988 Import translations. DO NOT MERGE
Change-Id: I130f6c876b53c8ea6b6244556ed564e43b95beaa
Auto-generated-cl: translation import
2015-08-10 06:11:47 -07:00
Geoff Mendal
3ca58bbda3 Import translations. DO NOT MERGE
Change-Id: I49911941b08daff0dce1d0ec3ca9b21ae209650b
Auto-generated-cl: translation import
2015-08-08 07:26:58 -07:00
Geoff Mendal
7d4610e905 Import translations. DO NOT MERGE
Change-Id: I501f43a2a13a2acbbc36e9533abaef1eea7e3758
Auto-generated-cl: translation import
2015-08-08 06:37:16 -07:00
Dianne Hackborn
eb8d922c37 am 81a3ef13: am a3e66576: am 1ded4413: am 7a3a4533: am e7a5966a: Merge "Fix issue #23037720: New Battery Optimization Strings" into mnc-dev
* commit '81a3ef139b3f607562b784430fe2748f3eff9713':
  Fix issue #23037720: New Battery Optimization Strings
2015-08-08 02:49:34 +00:00
Dianne Hackborn
81a3ef139b am a3e66576: am 1ded4413: am 7a3a4533: am e7a5966a: Merge "Fix issue #23037720: New Battery Optimization Strings" into mnc-dev
* commit 'a3e665765882c7919d8d41dc5caa42d1e17b6044':
  Fix issue #23037720: New Battery Optimization Strings
2015-08-07 22:25:36 +00:00
Dianne Hackborn
a3e6657658 am 1ded4413: am 7a3a4533: am e7a5966a: Merge "Fix issue #23037720: New Battery Optimization Strings" into mnc-dev
* commit '1ded441390e79dc46d576dadbbf1a69da12d399d':
  Fix issue #23037720: New Battery Optimization Strings
2015-08-07 22:20:50 +00:00
Dianne Hackborn
1ded441390 am 7a3a4533: am e7a5966a: Merge "Fix issue #23037720: New Battery Optimization Strings" into mnc-dev
* commit '7a3a453349fb51043d84adc21f87472ba34c49a8':
  Fix issue #23037720: New Battery Optimization Strings
2015-08-07 22:12:58 +00:00
Dianne Hackborn
7a3a453349 am e7a5966a: Merge "Fix issue #23037720: New Battery Optimization Strings" into mnc-dev
* commit 'e7a5966aa72a7a64358e4092fa3fe2b46b28c420':
  Fix issue #23037720: New Battery Optimization Strings
2015-08-07 22:05:56 +00:00
Dianne Hackborn
f5497aa93c Fix issue #23037720: New Battery Optimization Strings
Thar be strings.

Change-Id: Ieb43d041912cc5d2cc181d3232e01dbfce6cbc0e
2015-08-07 14:43:55 -07:00
Maurice Lam
d62aabf10d [Fingerprint] Use different ring size for setup
Follow-up on ag/741340, to split the size of the fingerprint ring
during setup vs in settings. The ring in settings is slightly bigger
because the header is smaller and the error text will not be cropped.

Bug: 22924280
Change-Id: I4b9a817c85a3683924a01e41552ca80c85423f29
2015-08-07 10:48:48 -07:00
Geoff Mendal
2d546b77b9 Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 22879473
Bug: 22719051
Change-Id: Ic6f0352135604d3a4d02ecfc9713f21191b046fd
2015-08-07 04:21:22 +00:00
Geoff Mendal
90c2297645 Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 22390723
Change-Id: I2098bcc385398b9e2ac2be40f18e98819d52dc7c
2015-08-05 18:24:49 -07:00