Todd Kennedy
c37a80990b
Merge "Add force external setting"
2015-08-12 16:53:32 +00: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
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
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
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
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
Andres Morales
b56324b149
[ConfirmPattern] use correct user id for stealth mode
...
Bug: 23027554
Change-Id: I9582dab3a0355f613d0ce1c943b0eeba2694dddd
2015-08-11 23:17:17 +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
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
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
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
70c52fcbf8
am 0583f297
: am b98206c9
: am 01cfaade
: am e9bcef35
: am be4df036
: Fix issue #23037899 : Support for Battery Optimization permission + Dialog
...
* commit '0583f297f8223cacda71bda5b2b896cc03031b89':
Fix issue #23037899 : Support for Battery Optimization permission + Dialog
2015-08-11 00:50:00 +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
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
ef54ab616a
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:17:11 +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
Julia Reynolds
f4a6994106
am 0b514bdd
: am 415d6a24
: am f47896d2
: am 77dc56bc
: am 2557d8a2
: Merge "Wrap text on long preferences." into mnc-dev
...
* commit '0b514bdd219e28cb1c920265fe36c1c30a6c8d5c':
Wrap text on long preferences.
2015-08-10 21:07:50 +00:00
Julia Reynolds
0b514bdd21
am 415d6a24
: am f47896d2
: am 77dc56bc
: am 2557d8a2
: Merge "Wrap text on long preferences." into mnc-dev
...
* commit '415d6a2411edfd72764bfd82208eff6020d85add':
Wrap text on long preferences.
2015-08-10 20:59:29 +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
Jason Monk
b4b4e2a981
am d1cecdd3
: am 55511dab
: am 9614b503
: am a1f64bf2
: am cf1e22f4
: Merge "Remove extra help & feedback menu from power usage" into mnc-dev
...
* commit 'd1cecdd33e7366e5b23dcc7f05078bde0b43c13c':
Remove extra help & feedback menu from power usage
2015-08-10 20:39:46 +00:00
Julia Reynolds
0a27e57dd9
am 2557d8a2
: Merge "Wrap text on long preferences." into mnc-dev
...
* commit '2557d8a25124b93801bc5de1b1b2d063cad1c3ff':
Wrap text on long preferences.
2015-08-10 20:38:15 +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
Jason Monk
d1cecdd33e
am 55511dab
: am 9614b503
: am a1f64bf2
: am cf1e22f4
: Merge "Remove extra help & feedback menu from power usage" into mnc-dev
...
* commit '55511dab4fcd7410868670a6d39e88a91784d722':
Remove extra help & feedback menu from power usage
2015-08-10 20:34:04 +00:00
Julia Reynolds
2557d8a251
Merge "Wrap text on long preferences." into mnc-dev
2015-08-10 20:32:49 +00:00
Jason Monk
656145a0e0
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:23:14 +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
Roozbeh Pournader
280f26c9e3
Merge "Inline TextUtils.join(Iterable<CharSequence>)."
2015-08-10 18:54:58 +00:00
Roozbeh Pournader
4bbf75d184
Inline TextUtils.join(Iterable<CharSequence>).
...
DataUsageSummary seems to be the only place the deprecated hidden
method is used. This inlines the definition so the deprecated method
could be removed.
Change-Id: I63dc1de74e1df1119ba99f46bed5d016e07c87b5
2015-08-10 11:32:19 -07:00
Pavel Zhamaitsiak
3e16609755
am 10278acc
: am 7381ed0d
: am 05c4a757
: am f48424e1
: am 8cf54264
: Merge "Ensure that listener is removed only if it was added" into mnc-dev
...
* commit '10278acc8b0dee0ee4fa0b04c17749418f382365':
Ensure that listener is removed only if it was added
2015-08-10 18:06:59 +00:00
Pavel Zhamaitsiak
10278acc8b
am 7381ed0d
: am 05c4a757
: am f48424e1
: am 8cf54264
: Merge "Ensure that listener is removed only if it was added" into mnc-dev
...
* commit '7381ed0d9b1e34466fd6486b49a98a002267fcb2':
Ensure that listener is removed only if it was added
2015-08-10 17:58:10 +00: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
667be5d6bf
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:09 +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
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
Jeff Sharkey
fbbefae25c
am 737213fc
: am 0f4465a4
: am 11088b81
: am cb0c0718
: am 67f0739c
: Merge "Block moving when already in progress." into mnc-dev
...
* commit '737213fc8750e8db065a6575b4a15e1b4b19d78b':
Block moving when already in progress.
2015-08-08 02:50:30 +00:00
Billy Lau
4efd2640a4
am c2012bb4
: am 16dc289d
: am 8c26cbd8
: am 5b2c66e4
: am a59f39fc
: Merge "Bug: 21588539 Move CHANGE_NETWORK_STATE to be in SYSTEM_SETTINGS" into mnc-dev
...
* commit 'c2012bb4792299d16ea1c55c40ad18cdfad9a134':
Bug: 21588539 Move CHANGE_NETWORK_STATE to be in SYSTEM_SETTINGS
2015-08-08 02:49:48 +00:00
Jeff Sharkey
737213fc87
am 0f4465a4
: am 11088b81
: am cb0c0718
: am 67f0739c
: Merge "Block moving when already in progress." into mnc-dev
...
* commit '0f4465a4cd84ba8acac52cafc13104b6dc054877':
Block moving when already in progress.
2015-08-08 00:13:16 +00: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
Jeff Sharkey
cb0c07181a
am 67f0739c
: Merge "Block moving when already in progress." into mnc-dev
...
* commit '67f0739ca3a81515975856b09d216debfd090ae9':
Block moving when already in progress.
2015-08-07 23:51:57 +00:00