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
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
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
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
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
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
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
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
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
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
0583f297f8
am b98206c9
: am 01cfaade
: am e9bcef35
: am be4df036
: Fix issue #23037899 : Support for Battery Optimization permission + Dialog
...
* commit 'b98206c99e687d043702df01d6a7a4a4273c82a8':
Fix issue #23037899 : Support for Battery Optimization permission + Dialog
2015-08-11 00:42:51 +00:00
Dianne Hackborn
b98206c99e
am 01cfaade
: am e9bcef35
: am be4df036
: Fix issue #23037899 : Support for Battery Optimization permission + Dialog
...
* commit '01cfaadeeb9eb98f9a772a85ba6c4e1034319fb5':
Fix issue #23037899 : Support for Battery Optimization permission + Dialog
2015-08-11 00:35:12 +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
01cfaadeeb
am e9bcef35
: am be4df036
: Fix issue #23037899 : Support for Battery Optimization permission + Dialog
...
* commit 'e9bcef3541435c1e1a2716d48eb1c1c897841880':
Fix issue #23037899 : Support for Battery Optimization permission + Dialog
2015-08-11 00:28:17 +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
e9bcef3541
am be4df036
: Fix issue #23037899 : Support for Battery Optimization permission + Dialog
...
* commit 'be4df036e1c688a1b7a5fc9d4ab18f09729296b3':
Fix issue #23037899 : Support for Battery Optimization permission + Dialog
2015-08-11 00:19:40 +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
be4df036e1
Fix issue #23037899 : Support for Battery Optimization permission + Dialog
...
New pretty dialog.
Change-Id: I6094b83139beffc407b01049a0d9d1f85a95df07
2015-08-10 17:07:14 -07:00
Dianne Hackborn
ba38155d25
Merge "Fix issue #23037720 : New Battery Optimization Strings" into mnc-dev
2015-08-11 00:06:43 +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
Dianne Hackborn
d638185db9
am 6ae019e7
: am cbfb4c4b
: am fa8a85da
: am 996e285c
: Merge "Fix issue #23037720 : New Battery Optimization Strings" into mnc-dev
...
* commit '6ae019e74b9dcd10fb99fd684c5cd0114cc01ed9':
Fix issue #23037720 : New Battery Optimization Strings
2015-08-10 22:21:22 +00:00
Dianne Hackborn
6ae019e74b
am cbfb4c4b
: am fa8a85da
: am 996e285c
: Merge "Fix issue #23037720 : New Battery Optimization Strings" into mnc-dev
...
* commit 'cbfb4c4bff60c37ca04887a6e9cdd01fcdbf1a67':
Fix issue #23037720 : New Battery Optimization Strings
2015-08-10 22:15:13 +00:00
Dianne Hackborn
cbfb4c4bff
am fa8a85da
: am 996e285c
: Merge "Fix issue #23037720 : New Battery Optimization Strings" into mnc-dev
...
* commit 'fa8a85da05a9deea9b1ae249a490b63e46058eff':
Fix issue #23037720 : New Battery Optimization Strings
2015-08-10 22:07:13 +00:00
Dianne Hackborn
fa8a85da05
am 996e285c
: Merge "Fix issue #23037720 : New Battery Optimization Strings" into mnc-dev
...
* commit '996e285cdcd26ee7251ec80915eeed57541efb6d':
Fix issue #23037720 : New Battery Optimization Strings
2015-08-10 22:02:23 +00:00