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
df85a4fc21
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:57:45 +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
Jason Monk
4b0e84d667
Merge "Make DropDownPreference extend ListPreference"
2015-08-12 18:23:13 +00:00
Jason Monk
94e460fd45
Fix Usb-C dialog issues
...
- Fix theme
- Fix PTP bug introduced in initial USB-C support
Bug: 21615151
Change-Id: I577f06929b028fe3f50ef5b9adcfa9507fd1df0e
2015-08-12 14:14:33 -04:00
Sanket Padawe
28c78cc854
am f974b78d
: am 8d425a52
: am d0513282
: am 1d29bde1
: Merge "Avoid sending identity along with EAP sim, aka & aka\'." into mnc-dr-dev
...
* commit 'f974b78d36f7bd449d3dbfc7c7c64e273cb16c78':
Avoid sending identity along with EAP sim, aka & aka'.
2015-08-12 18:09:32 +00:00
Sanket Padawe
f974b78d36
am 8d425a52
: am d0513282
: am 1d29bde1
: Merge "Avoid sending identity along with EAP sim, aka & aka\'." into mnc-dr-dev
...
* commit '8d425a526b383c1e0c2d60fd3c27f7a5dd5e5e2f':
Avoid sending identity along with EAP sim, aka & aka'.
2015-08-12 18:03:56 +00:00
Sanket Padawe
8d425a526b
am d0513282
: am 1d29bde1
: Merge "Avoid sending identity along with EAP sim, aka & aka\'." into mnc-dr-dev
...
* commit 'd0513282f81d8218eb0fef93a7316a6699d087f7':
Avoid sending identity along with EAP sim, aka & aka'.
2015-08-12 17:50:54 +00:00
Sanket Padawe
d0513282f8
am 1d29bde1
: Merge "Avoid sending identity along with EAP sim, aka & aka\'." into mnc-dr-dev
...
* commit '1d29bde1f5369b5cb5b24adbad662ef33524f4e2':
Avoid sending identity along with EAP sim, aka & aka'.
2015-08-12 17:34:42 +00:00
Sanket Padawe
1d29bde1f5
Merge "Avoid sending identity along with EAP sim, aka & aka'." into mnc-dr-dev
2015-08-12 17:17:31 +00:00
Jason Monk
49b6103b56
Make DropDownPreference extend ListPreference
...
Lots of updates to handle static setting of entries/values
Callbacks are now through preference changes
Fix weird inconsistencies in callback return values...
Change-Id: I2ebe02c3492ce543162efcd55bdae3f2c4039287
2015-08-12 13:01:38 -04:00
Todd Kennedy
c37a80990b
Merge "Add force external setting"
2015-08-12 16:53:32 +00:00
Geoff Mendal
306258dad2
am 0c49d5b9
: (-s ours) am ce821387
: (-s ours) am 699ef29e
: (-s ours) am 42ae7fba
: (-s ours) Import translations. DO NOT MERGE
...
* commit '0c49d5b9d08ad352af78d1e943623585f49a7f3f':
Import translations. DO NOT MERGE
2015-08-12 14:24:56 +00:00
Geoff Mendal
0c49d5b9d0
am ce821387
: (-s ours) am 699ef29e
: (-s ours) am 42ae7fba
: (-s ours) Import translations. DO NOT MERGE
...
* commit 'ce821387ba6b6745a99c2a3231a5c0b2e42a34fc':
Import translations. DO NOT MERGE
2015-08-12 14:18:59 +00:00
Geoff Mendal
ce821387ba
am 699ef29e
: (-s ours) am 42ae7fba
: (-s ours) Import translations. DO NOT MERGE
...
* commit '699ef29e9fcf59eb1023c767cceab4de4f64ae13':
Import translations. DO NOT MERGE
2015-08-12 14:11:11 +00:00
Geoff Mendal
699ef29e9f
am 42ae7fba
: (-s ours) Import translations. DO NOT MERGE
...
* commit '42ae7fba5b6570cfa36d2132ce30bb23bd91d2e9':
Import translations. DO NOT MERGE
2015-08-12 14:06:27 +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
Sanket Padawe
f1165c14c5
Avoid sending identity along with EAP sim, aka & aka'.
...
Bug: 22358498
Change-Id: I829b3f9fe688efc933483506e1b5944195e1975f
2015-08-11 18:42:36 -07:00
Andres Morales
270418980a
am 9ee3a615
: am f1808dca
: am e5d64684
: am a7bdde58
: am 9f879ef0
: Merge "[ConfirmPattern] use correct user id for stealth mode" into mnc-dev
...
* commit '9ee3a615463faec08d4dfb9b045f9211c93d742e':
[ConfirmPattern] use correct user id for stealth mode
2015-08-12 00:00:22 +00: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
Andres Morales
9ee3a61546
am f1808dca
: am e5d64684
: am a7bdde58
: am 9f879ef0
: Merge "[ConfirmPattern] use correct user id for stealth mode" into mnc-dev
...
* commit 'f1808dcafc45fea92e27b5300f4d6cc742bb3105':
[ConfirmPattern] use correct user id for stealth mode
2015-08-11 23:56:36 +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
Andres Morales
f1808dcafc
am e5d64684
: am a7bdde58
: am 9f879ef0
: Merge "[ConfirmPattern] use correct user id for stealth mode" into mnc-dev
...
* commit 'e5d646841d62484939c660e078c712866c64f244':
[ConfirmPattern] use correct user id for stealth mode
2015-08-11 23:48:50 +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
Andres Morales
e5d646841d
am a7bdde58
: am 9f879ef0
: Merge "[ConfirmPattern] use correct user id for stealth mode" into mnc-dev
...
* commit 'a7bdde58856c7cf776cb326b7a1a9c58d649b3f8':
[ConfirmPattern] use correct user id for stealth mode
2015-08-11 23:43:51 +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
Andres Morales
a7bdde5885
am 9f879ef0
: Merge "[ConfirmPattern] use correct user id for stealth mode" into mnc-dev
...
* commit '9f879ef009863a0674e891ad0e51b1b216da5beb':
[ConfirmPattern] use correct user id for stealth mode
2015-08-11 23:35:59 +00:00
Andres Morales
af48dffe4f
am 9f879ef0
: Merge "[ConfirmPattern] use correct user id for stealth mode" into mnc-dev
...
* commit '9f879ef009863a0674e891ad0e51b1b216da5beb':
[ConfirmPattern] use correct user id for stealth mode
2015-08-11 23:35:46 +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
Andres Morales
9f879ef009
Merge "[ConfirmPattern] use correct user id for stealth mode" into mnc-dev
2015-08-11 23:31:23 +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
7f45b55dd8
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:52 +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
Paul Lawrence
517b83beb6
am ce555844
: am a66240fd
: am 550f66ed
: am 68f79718
: Merge "Gray out confirm button on pattern/pin/password set dialog" into mnc-dr-dev
...
* commit 'ce55584478ee3f7e2a50c718efd79b834f326741':
Gray out confirm button on pattern/pin/password set dialog
2015-08-11 23:23:48 +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
Andres Morales
b56324b149
[ConfirmPattern] use correct user id for stealth mode
...
Bug: 23027554
Change-Id: I9582dab3a0355f613d0ce1c943b0eeba2694dddd
2015-08-11 23:17:17 +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
Paul Lawrence
ce55584478
am a66240fd
: am 550f66ed
: am 68f79718
: Merge "Gray out confirm button on pattern/pin/password set dialog" into mnc-dr-dev
...
* commit 'a66240fd94cb458cb1e938419abad676b8132ca5':
Gray out confirm button on pattern/pin/password set dialog
2015-08-11 23:03:18 +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
ef90693895
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:15 +00:00
Maurice Lam
3d9cb92618
Merge "[Fingerprint] Use different ring size for setup" into mnc-dev
2015-08-11 22:35:53 +00:00
Paul Lawrence
a66240fd94
am 550f66ed
: am 68f79718
: Merge "Gray out confirm button on pattern/pin/password set dialog" into mnc-dr-dev
...
* commit '550f66edfe5ebafde3afc3ba3fd7e4160373df36':
Gray out confirm button on pattern/pin/password set dialog
2015-08-11 22:35:26 +00:00
Paul Lawrence
550f66edfe
am 68f79718
: Merge "Gray out confirm button on pattern/pin/password set dialog" into mnc-dr-dev
...
* commit '68f79718f7c4f648533e1ecd7f66d0b30f161b64':
Gray out confirm button on pattern/pin/password set dialog
2015-08-11 22:25:31 +00:00
Paul Lawrence
68f79718f7
Merge "Gray out confirm button on pattern/pin/password set dialog" into mnc-dr-dev
2015-08-11 22:20:53 +00:00
Paul Lawrence
cff37ecbdd
Gray out confirm button on pattern/pin/password set dialog
...
Setting a pin/pattern/password can take a second. Gray out the confirm
button to avoid multiple submissions.
Note that this requires async tasks so that the button is shown as gray
in a timely way.
Also don't add another stage - this causes a11y to repeat the title.
Bug: 22882174
Change-Id: Ib8047fde9e12afa25e82ebfa3a1e799a4b7043f2
2015-08-11 15:17:04 -07: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