Sanket Padawe
620374492f
am 3be6d0b4
: Merge "Avoid new network to connect by using "Add Network" instead only Save it." into mnc-dev
...
* commit '3be6d0b44bf1152be0bc11bf6bacf750e1028b49':
Avoid new network to connect by using "Add Network" instead only Save it.
2015-08-24 17:59:41 +00:00
Sanket Padawe
3be6d0b44b
Merge "Avoid new network to connect by using "Add Network" instead only Save it." into mnc-dev
2015-08-24 17:52:51 +00:00
Sanket Padawe
e0ece963c6
Avoid new network to connect by using "Add Network" instead only Save it.
...
Bug: 23422433
Change-Id: I49aabff91ba127bf2a3b0aa25c8163ee4097bf4d
2015-08-21 16:45:30 -07:00
Christopher Tate
356e5b585c
am ffe701dc
: Present the security patch date in a human-friendly format
...
* commit 'ffe701dc0e52ee95bf6c54291ed1b574d389019c':
Present the security patch date in a human-friendly format
2015-08-21 19:26:32 +00:00
Christopher Tate
ffe701dc0e
Present the security patch date in a human-friendly format
...
For example, for an ISO date of 2015-08-01, this now displays
"August 1, 2015" in enUS, and "1 August 2015" in enUK, and
"2015年8月1日" in jpJP.
Bug 23358065
Change-Id: Iaa920ec88d765a222f0b589123665b689bf41978
2015-08-20 17:16:08 -07:00
Julia Reynolds
42f2b35435
am 0ece6a32
: String update for battery details page.
...
* commit '0ece6a3241062842db991ad63add899369ce1853':
String update for battery details page.
2015-08-17 17:24:56 +00:00
Julia Reynolds
0ece6a3241
String update for battery details page.
...
Bug: 22978210
Change-Id: I87d231868d6116c3f0d88a6a6d3ca5fac1ce8c90
2015-08-17 13:14:38 -04:00
Adam Lesinski
f71fbbffb5
am 3cc05c9d
: Merge "BatteryStats: Fix coalescing of shared app GIDs and system UIDs" into mnc-dev
...
* commit '3cc05c9d7e290b7e6ff10c3428c471b8e2529f2c':
BatteryStats: Fix coalescing of shared app GIDs and system UIDs
2015-08-14 19:45:45 +00:00
Adam Lesinski
3cc05c9d7e
Merge "BatteryStats: Fix coalescing of shared app GIDs and system UIDs" into mnc-dev
2015-08-14 19:38:34 +00:00
Jeff Sharkey
08fe57cbbb
am b4158f0e
: Merge "Only offer migration between private volumes." into mnc-dev
...
* commit 'b4158f0e15bdc55de40a4e5f5a17c9e4a6325b61':
Only offer migration between private volumes.
2015-08-14 18:31:46 +00:00
Jeff Sharkey
b4158f0e15
Merge "Only offer migration between private volumes." into mnc-dev
2015-08-14 18:23:39 +00:00
Chris Tate
71efd816e6
am 7e36d33c
: Merge "Make "Ask every time" actually work that way" into mnc-dev
...
* commit '7e36d33c00458a5f74b69963723c6e06f3f6ccf3':
Make "Ask every time" actually work that way
2015-08-14 17:19:37 +00:00
Chris Tate
7e36d33c00
Merge "Make "Ask every time" actually work that way" into mnc-dev
2015-08-14 17:11:48 +00:00
Jeff Sharkey
6f52ed3332
Only offer migration between private volumes.
...
Without this change, there is a confusing option to migrate a public
SD card volume to internal storage, which will always fail if the
user picks it, since it's not supported under the hood.
Bug: 22966671
Change-Id: Id7cad07eea6583aace398a6d64383bf7d884ae9e
2015-08-14 09:46:03 -07:00
Adam Lesinski
8f743471d5
BatteryStats: Fix coalescing of shared app GIDs and system UIDs
...
UIDs that consumed power and were actually shared app GIDs are now
coelsced for system apps as well as regular applications. In addition,
system UIDs like logd, NFC, DRM, etc are coalesced into Android System.
Bug:23189342
Change-Id: I6c8eb4baec66fba3d1f71a155d8ea1fe920ffec9
2015-08-13 22:12:47 -07:00
Jeff Sharkey
38c819072c
am ae531f1f
: Merge "Show storage slow dialog allowing state loss." into mnc-dev
...
* commit 'ae531f1f613fb1a94fade18e5e92fc842a2a9016':
Show storage slow dialog allowing state loss.
2015-08-14 01:24:29 +00:00
Jeff Sharkey
ae531f1f61
Merge "Show storage slow dialog allowing state loss." into mnc-dev
2015-08-14 01:18:18 +00:00
Jeff Sharkey
0814827e8f
Show storage slow dialog allowing state loss.
...
We're not picky about losing state here, since the adoption actually
finished under the hood and we're just warning the user that it's
slow.
Without this change, we could end up throwing and re-adopting the
same device twice, which causes issues on sprout-style devices that
only migrate primary storage once.
Bug: 22867250
Change-Id: I1491679ab802f19fe25b82e9b452ca3dabdfec0d
2015-08-13 16:57:48 -07:00
Christopher Tate
970291e20c
Make "Ask every time" actually work that way
...
..in link-opening behavior. If a candidate is marked as "ask
every time," then the user is guaranteed to get a disambiguation
prompt including that candidate even when some other candidate
app is in the "always prefer this over a browser" state.
Bug 23147746
Change-Id: I73d8893ab74ea0356b757ab836349243cda2e307
2015-08-13 16:34:10 -07: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
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
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
Andres Morales
b56324b149
[ConfirmPattern] use correct user id for stealth mode
...
Bug: 23027554
Change-Id: I9582dab3a0355f613d0ce1c943b0eeba2694dddd
2015-08-11 23:17:17 +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
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
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
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
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
Jeff Sharkey
e56724ba46
am 67f0739c
: Merge "Block moving when already in progress." into mnc-dev
...
* commit '67f0739ca3a81515975856b09d216debfd090ae9':
Block moving when already in progress.
2015-08-07 23:46:42 +00:00
Jeff Sharkey
67f0739ca3
Merge "Block moving when already in progress." into mnc-dev
2015-08-07 23:38:44 +00:00
Jeff Sharkey
16634fd0ff
Block moving when already in progress.
...
Use frozen state as a proxy for knowing if a package is currently
being moved, and block any new move requests until the current move
is finished.
Bug: 22069486
Change-Id: I50a70353132c1035b969982f0b7779f5dcb2251d
2015-08-07 15:59:28 -07:00
Billy Lau
2cbb3c868d
am a59f39fc
: Merge "Bug: 21588539 Move CHANGE_NETWORK_STATE to be in SYSTEM_SETTINGS" into mnc-dev
...
* commit 'a59f39fca65d0828b0e4ade95a8404282e858ba9':
Bug: 21588539 Move CHANGE_NETWORK_STATE to be in SYSTEM_SETTINGS
2015-08-07 22:22:11 +00:00
Billy Lau
a59f39fca6
Merge "Bug: 21588539 Move CHANGE_NETWORK_STATE to be in SYSTEM_SETTINGS" into mnc-dev
2015-08-07 22:15:32 +00:00
Pavel Zhamaitsiak
2fe4b3cb9e
Ensure that listener is removed only if it was added
...
Bug: 23016088
Change-Id: Ia6f17739ffc841ce8483e9c6c8132a94ecd62200
2015-08-07 12:02:38 -07:00
Julia Reynolds
a9490b6860
am 5ab0e183
: Merge "Hide optimization control on battery details page for non whitelisted apps." into mnc-dev
...
* commit '5ab0e183abdd4008c5591011804d0bc770851a7f':
Hide optimization control on battery details page for non whitelisted apps.
2015-08-07 16:35:56 +00:00
Julia Reynolds
5ab0e183ab
Merge "Hide optimization control on battery details page for non whitelisted apps." into mnc-dev
2015-08-07 16:29:41 +00:00
Andres Morales
af2ea2f4dd
am 4897fa87
: Merge "fix CC for work profiles" into mnc-dev
...
* commit '4897fa87a55173f45bfddb2480a2e34eb412b8ef':
fix CC for work profiles
2015-08-06 22:30:57 +00:00
Andres Morales
4897fa87a5
Merge "fix CC for work profiles" into mnc-dev
2015-08-06 22:22:17 +00:00
Julia Reynolds
89a7a88124
Wrap text on long preferences.
...
Bug: 22987590
Change-Id: Iaef2c7d7d4581372a381d537f6d85a64d94bdf12
2015-08-06 14:23:47 -04:00
Julia Reynolds
2f01c5f5b5
Hide optimization control on battery details page for non whitelisted apps.
...
Bug: 22978210
Change-Id: If532960478dccf6ef9bea08a27167e1850749277
2015-08-06 11:42:40 -04:00
Andres Morales
7bdffd85eb
fix CC for work profiles
...
Bug: 22257554
Change-Id: I09f62956d01f91d3014d9fa250aaff68ab5e1a9b
2015-08-05 19:57:51 -07:00
Jason Monk
aceedc73ae
am 888673bd
: Hide show/hide system from battery optimizations list
...
* commit '888673bd51acf9263163acfebdd0680358deabaa':
Hide show/hide system from battery optimizations list
2015-08-05 20:31:58 +00:00
Jason Monk
888673bd51
Hide show/hide system from battery optimizations list
...
Bug: 22977820
Change-Id: I1741bfe3e8703bae8ce10503879adfd12e9eb4fc
2015-08-05 16:08:00 -04:00
Ajay Panicker
8c0139b1c8
am cd8acb22
: Merge "Implement Bluetooth settings factory reset (5/5)" into mnc-dev
...
* commit 'cd8acb2256ca37ac4d1b71c513bac4e541c67c6d':
Implement Bluetooth settings factory reset (5/5)
2015-08-05 18:00:54 +00:00
Ajay Panicker
cd8acb2256
Merge "Implement Bluetooth settings factory reset (5/5)" into mnc-dev
2015-08-05 17:49:08 +00:00