Commit Graph

8858 Commits

Author SHA1 Message Date
Maurice Lam
537b5d6eae am 4d06defe: am d809de88: Merge "[Fingerprint] Smaller enrolling ring" into mnc-dr-dev
* commit '4d06defe88b46ec877e0bb6e1ac095bd650ab9df':
  [Fingerprint] Smaller enrolling ring
2015-08-20 00:08:43 +00:00
Maurice Lam
4d06defe88 am d809de88: Merge "[Fingerprint] Smaller enrolling ring" into mnc-dr-dev
* commit 'd809de884761f290a94f01f21b5c94e262ec22ea':
  [Fingerprint] Smaller enrolling ring
2015-08-19 23:59:13 +00:00
Maurice Lam
d809de8847 Merge "[Fingerprint] Smaller enrolling ring" into mnc-dr-dev 2015-08-19 23:51:30 +00:00
Geoff Mendal
d401a062c7 Import translations. DO NOT MERGE
Change-Id: I9ab62b9e28b5dd6f8cd2a54e1ae7e015b8730e03
Auto-generated-cl: translation import
2015-08-19 07:08:00 -07:00
Geoff Mendal
1ca2c0d362 Import translations. DO NOT MERGE
Change-Id: I45f139d94c0d59401f7438b8913c8bbd1f338e94
Auto-generated-cl: translation import
2015-08-19 06:14:20 -07:00
Maurice Lam
27fa865db7 [Fingerprint] Smaller enrolling ring
Make the enrolling progress ring smaller in sw400dp during setup.

Bug: 23216520
Change-Id: I01a862baf9ea3e75e2164d12b7ef13dee5f28c5a
2015-08-18 18:30:36 -07:00
Zachary Kuznia
5adcb3d353 Allow manual to be read from disk
b/22891924

Change-Id: I6014690735403b772f273addba01706441898e23
2015-08-17 18:20:37 -07:00
Geoff Mendal
3c27420773 Import translations. DO NOT MERGE
Change-Id: Ic048bcec759963a76125600eb86b952a2aec5759
Auto-generated-cl: translation import
2015-08-17 07:05:00 -07:00
Geoff Mendal
e8a03d224d Import translations. DO NOT MERGE
Change-Id: I43b55b016758b18892141f67662f8b435212e8ca
Auto-generated-cl: translation import
2015-08-17 06:16:08 -07:00
Julia Reynolds
ab60fe2a14 Use a button style that visibly shows when the button is disabled.
Bug: 21199007
Change-Id: I5bcfa4cfcc7b39eaadae8b8af4c13591f497fee8
2015-08-14 09:55:37 -04:00
Todd Kennedy
9b47830a2d Merge "Fix string for translation" 2015-08-13 19:57:37 +00:00
Todd Kennedy
344c1b8a47 Fix string for translation
Increase character limit and help provide some additional context for
the strings

Bug: 23175115
Bug: 23173307
Bug: 23172615
Change-Id: I27c67f39323f359744ae3791ea538030820dc0d0
2015-08-13 12:56:48 -07:00
Julia Reynolds
fcfe3d82d2 Merge "Switch font size from a dialog to dropdown preference." 2015-08-13 14:42:39 +00:00
Julia Reynolds
a02bc9991d Switch font size from a dialog to dropdown preference.
Bug: 16634975
Change-Id: I8edaf63afe3f43e0bb152428c6ca0c6b1ccd0eb4
2015-08-13 10:40:29 -04:00
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