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
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
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
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
Andres Morales
9f879ef009
Merge "[ConfirmPattern] use correct user id for stealth mode" into mnc-dev
2015-08-11 23:31:23 +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
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
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
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
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
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
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
Dianne Hackborn
996e285cdc
Merge "Fix issue #23037720 : New Battery Optimization Strings" into mnc-dev
2015-08-10 21:55:23 +00:00
Julia Reynolds
f47896d223
am 77dc56bc
: am 2557d8a2
: Merge "Wrap text on long preferences." into mnc-dev
...
* commit '77dc56bc4ce29016820dc90fea933324dc57f4be':
Wrap text on long preferences.
2015-08-10 20:45:56 +00:00
Julia Reynolds
77dc56bc4c
am 2557d8a2
: Merge "Wrap text on long preferences." into mnc-dev
...
* commit '2557d8a25124b93801bc5de1b1b2d063cad1c3ff':
Wrap text on long preferences.
2015-08-10 20:37:34 +00:00
Julia Reynolds
2557d8a251
Merge "Wrap text on long preferences." into mnc-dev
2015-08-10 20:32:49 +00:00
Jason Monk
9614b50319
am a1f64bf2
: am cf1e22f4
: Merge "Remove extra help & feedback menu from power usage" into mnc-dev
...
* commit 'a1f64bf207c452f9b0e6a558538d9614ca2bf655':
Remove extra help & feedback menu from power usage
2015-08-10 20:21:53 +00:00
Jason Monk
a1f64bf207
am cf1e22f4
: Merge "Remove extra help & feedback menu from power usage" into mnc-dev
...
* commit 'cf1e22f4471f39f4cf3c134006ecf9ffedb91e36':
Remove extra help & feedback menu from power usage
2015-08-10 20:14:46 +00:00
Jason Monk
cf1e22f447
Merge "Remove extra help & feedback menu from power usage" into mnc-dev
2015-08-10 20:09:20 +00:00
Jason Monk
3006c377c2
Remove extra help & feedback menu from power usage
...
Bug: 23044354
Change-Id: Ic722655a50eddbf4f8e53a2b73ed49b5cf6426a4
2015-08-10 15:58:09 -04:00
Pavel Zhamaitsiak
05c4a75701
am f48424e1
: am 8cf54264
: Merge "Ensure that listener is removed only if it was added" into mnc-dev
...
* commit 'f48424e17caf6d4e890154d45c70a125802e1682':
Ensure that listener is removed only if it was added
2015-08-10 17:41:22 +00:00
Pavel Zhamaitsiak
f48424e17c
am 8cf54264
: Merge "Ensure that listener is removed only if it was added" into mnc-dev
...
* commit '8cf54264995aea65d77c25b5050cb3aac0196c59':
Ensure that listener is removed only if it was added
2015-08-10 17:35:16 +00:00
Pavel Zhamaitsiak
8cf5426499
Merge "Ensure that listener is removed only if it was added" into mnc-dev
2015-08-10 17:29:38 +00:00
Geoff Mendal
23127a6123
am 41abf663
: (-s ours) Import translations. DO NOT MERGE
...
* commit '41abf66362ccf9f75dc67142b48d0f31c13f1d3d':
Import translations. DO NOT MERGE
2015-08-10 14:12:22 +00: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
c064ecdf79
am 3ca58bbd
: (-s ours) Import translations. DO NOT MERGE
...
* commit '3ca58bbda3d1daacc6750a1502a775641b2d0961':
Import translations. DO NOT MERGE
2015-08-08 14:36:30 +00: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
Jeff Sharkey
11088b815b
am cb0c0718
: am 67f0739c
: Merge "Block moving when already in progress." into mnc-dev
...
* commit 'cb0c07181a77ef134310c0e037345f33e7a46d9e':
Block moving when already in progress.
2015-08-07 23:58:46 +00:00