Adam Lesinski
b5ca40c644
am 11d1caed: am e3ddd117: am 3cc05c9d: Merge "BatteryStats: Fix coalescing of shared app GIDs and system UIDs" into mnc-dev
...
* commit '11d1caede255fe9643692974031fb93448adbd97':
BatteryStats: Fix coalescing of shared app GIDs and system UIDs
2015-08-14 19:55:05 +00:00
Adam Lesinski
11d1caede2
am e3ddd117: am 3cc05c9d: Merge "BatteryStats: Fix coalescing of shared app GIDs and system UIDs" into mnc-dev
...
* commit 'e3ddd117a6bd6f25ea345349fe59be6a4ada3161':
BatteryStats: Fix coalescing of shared app GIDs and system UIDs
2015-08-14 19:47:43 +00: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
Chris Wren
1b8d5ffb47
instrument fingerprint settings
...
instrument visibility on all fingerprint views
rename and delete action
add fingerprint action is implicit in flow
Bug: 22951001
Change-Id: I53f048f479e24754972b801598d5da393ba9d716
2015-08-14 15:44:16 -04:00
Adam Lesinski
e3ddd117a6
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:43:40 +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
a334d53025
am b38493cc: am b0f9e9d4: am 82fee7bd: am b4158f0e: Merge "Only offer migration between private volumes." into mnc-dev
...
* commit 'b38493cc6c52346edbcb045a67b1f4831a80290e':
Only offer migration between private volumes.
2015-08-14 18:47:12 +00:00
Jeff Sharkey
b38493cc6c
am b0f9e9d4: am 82fee7bd: am b4158f0e: Merge "Only offer migration between private volumes." into mnc-dev
...
* commit 'b0f9e9d49fb9cf0c4ffada36dc129b7899f16ffb':
Only offer migration between private volumes.
2015-08-14 18:40:03 +00:00
Jeff Sharkey
b0f9e9d49f
am 82fee7bd: am b4158f0e: Merge "Only offer migration between private volumes." into mnc-dev
...
* commit '82fee7bd0a82a48e204bcaf5480701b36c857276':
Only offer migration between private volumes.
2015-08-14 18:34:36 +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
82fee7bd0a
am b4158f0e: Merge "Only offer migration between private volumes." into mnc-dev
...
* commit 'b4158f0e15bdc55de40a4e5f5a17c9e4a6325b61':
Only offer migration between private volumes.
2015-08-14 18:29:15 +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
b184056727
am 95a3e220: am 7c8cb46f: am 36e2d32d: am 7e36d33c: Merge "Make "Ask every time" actually work that way" into mnc-dev
...
* commit '95a3e2200c8e2662999bf2453ca8312d6c5312c0':
Make "Ask every time" actually work that way
2015-08-14 17:41:11 +00:00
Chris Tate
95a3e2200c
am 7c8cb46f: am 36e2d32d: am 7e36d33c: Merge "Make "Ask every time" actually work that way" into mnc-dev
...
* commit '7c8cb46fe383956830a04e079a13ded56f7c2154':
Make "Ask every time" actually work that way
2015-08-14 17:35:13 +00:00
Chris Tate
7c8cb46fe3
am 36e2d32d: am 7e36d33c: Merge "Make "Ask every time" actually work that way" into mnc-dev
...
* commit '36e2d32dab47f9d46c0234202c2a799c43b67c9e':
Make "Ask every time" actually work that way
2015-08-14 17:27:02 +00:00
Chris Tate
36e2d32dab
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:20:18 +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
Julia Reynolds
ab60fe2a14
Use a button style that visibly shows when the button is disabled.
...
Bug: 21199007
Change-Id: I5bcfa4cfcc7b39eaadae8b8af4c13591f497fee8
2015-08-14 09:55:37 -04: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
5f2194855f
am 6dcc2004: am ffe642ed: am fa620435: am c73287b9: am ae531f1f: Merge "Show storage slow dialog allowing state loss." into mnc-dev
...
* commit '6dcc2004ad49c7b2cbdb5fc87a9b83d1be1cccaf':
Show storage slow dialog allowing state loss.
2015-08-14 03:27:38 +00:00
Jeff Sharkey
6dcc2004ad
am ffe642ed: am fa620435: am c73287b9: am ae531f1f: Merge "Show storage slow dialog allowing state loss." into mnc-dev
...
* commit 'ffe642ed030277d2e065b6ad55596c35b1daff39':
Show storage slow dialog allowing state loss.
2015-08-14 03:18:55 +00:00
Jeff Sharkey
ffe642ed03
am fa620435: am c73287b9: am ae531f1f: Merge "Show storage slow dialog allowing state loss." into mnc-dev
...
* commit 'fa62043590d5ae99008aa1ddbd1e8b1f052fc0a1':
Show storage slow dialog allowing state loss.
2015-08-14 01:37:59 +00:00
Jeff Sharkey
fa62043590
am c73287b9: am ae531f1f: Merge "Show storage slow dialog allowing state loss." into mnc-dev
...
* commit 'c73287b9dbfe63ddde24ac1e0975f50382f24e71':
Show storage slow dialog allowing state loss.
2015-08-14 01:31:27 +00:00
Jeff Sharkey
c73287b9db
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:41 +00: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
Todd Kennedy
9b47830a2d
Merge "Fix string for translation"
2015-08-13 19:57:37 +00:00
Todd Kennedy
344c1b8a47
Fix string for translation
...
Increase character limit and help provide some additional context for
the strings
Bug: 23175115
Bug: 23173307
Bug: 23172615
Change-Id: I27c67f39323f359744ae3791ea538030820dc0d0
2015-08-13 12:56:48 -07:00
Julia Reynolds
fcfe3d82d2
Merge "Switch font size from a dialog to dropdown preference."
2015-08-13 14:42:39 +00:00
Julia Reynolds
a02bc9991d
Switch font size from a dialog to dropdown preference.
...
Bug: 16634975
Change-Id: I8edaf63afe3f43e0bb152428c6ca0c6b1ccd0eb4
2015-08-13 10:40:29 -04:00
Geoff Mendal
36fe2c6a13
am eea96f22: (-s ours) Import translations. DO NOT MERGE
...
* commit 'eea96f22a1ec156d78374f49352341c46c219ca0':
Import translations. DO NOT MERGE
2015-08-13 06:58:22 +00:00
Geoff Mendal
6b60287ff9
am 06d14c52: (-s ours) am b3852044: (-s ours) am 93d1612d: (-s ours) am 8a12d17b: (-s ours) am eea96f22: (-s ours) Import translations. DO NOT MERGE
...
* commit '06d14c5243af84dfb2ba1a9027c9215b6d751d1e':
Import translations. DO NOT MERGE
2015-08-13 06:55:08 +00:00
Geoff Mendal
06d14c5243
am b3852044: (-s ours) am 93d1612d: (-s ours) am 8a12d17b: (-s ours) am eea96f22: (-s ours) Import translations. DO NOT MERGE
...
* commit 'b38520448f52683130a01728eab67018929775b2':
Import translations. DO NOT MERGE
2015-08-13 06:43:03 +00:00
Geoff Mendal
b38520448f
am 93d1612d: (-s ours) am 8a12d17b: (-s ours) am eea96f22: (-s ours) Import translations. DO NOT MERGE
...
* commit '93d1612d160f3e71c6dead490a36a334f6abb25f':
Import translations. DO NOT MERGE
2015-08-13 05:09:45 +00:00
Geoff Mendal
93d1612d16
am 8a12d17b: (-s ours) am eea96f22: (-s ours) Import translations. DO NOT MERGE
...
* commit '8a12d17b09281f09adaf6685680f7cb991aef049':
Import translations. DO NOT MERGE
2015-08-13 05:04:41 +00:00
Geoff Mendal
8a12d17b09
am eea96f22: (-s ours) Import translations. DO NOT MERGE
...
* commit 'eea96f22a1ec156d78374f49352341c46c219ca0':
Import translations. DO NOT MERGE
2015-08-13 04:59:17 +00:00
Geoff Mendal
eea96f22a1
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 23037720
Change-Id: I2349611e7f02b8e06ac12a4c86573711c6ff6a0e
2015-08-12 21:50:09 -07:00
Jorim Jaggi
c03459cd05
am 90ca1b67: am 0cae8ad7: am e9639b1d: am 5dd0e27f: Merge "Wait with finishing until fingerprints are removed" into mnc-dr-dev
...
* commit '90ca1b67cfa1507126c6b74b2de059d3bf579734':
Wait with finishing until fingerprints are removed
2015-08-13 03:18:43 +00:00
Dianne Hackborn
ca9433519b
am a0b5ab0e: am cd2b9e12: am 2be290cf: am 6a1e1e08: am f67d0785: Merge "Fix issue #23116383 : Include security patch level in Settings" into mnc-dev
...
* commit 'a0b5ab0ef6b9525e4bb68bb0ac6c8f3bfb144c9f':
Fix issue #23116383 : Include security patch level in Settings
2015-08-13 02:10:09 +00:00
Jorim Jaggi
90ca1b67cf
am 0cae8ad7: am e9639b1d: am 5dd0e27f: Merge "Wait with finishing until fingerprints are removed" into mnc-dr-dev
...
* commit '0cae8ad78170d56beaafcb18015e25421895ac50':
Wait with finishing until fingerprints are removed
2015-08-13 01:42:13 +00:00
Jorim Jaggi
0cae8ad781
am e9639b1d: am 5dd0e27f: Merge "Wait with finishing until fingerprints are removed" into mnc-dr-dev
...
* commit 'e9639b1d0141ce25548105a17eab3e30b6341f1a':
Wait with finishing until fingerprints are removed
2015-08-13 01:35:51 +00:00
Jorim Jaggi
e9639b1d01
am 5dd0e27f: Merge "Wait with finishing until fingerprints are removed" into mnc-dr-dev
...
* commit '5dd0e27fbbc8207ca9c8e05e60cf8f9ea5c0c88a':
Wait with finishing until fingerprints are removed
2015-08-13 01:28:21 +00:00
Dianne Hackborn
a0b5ab0ef6
am cd2b9e12: am 2be290cf: am 6a1e1e08: am f67d0785: Merge "Fix issue #23116383 : Include security patch level in Settings" into mnc-dev
...
* commit 'cd2b9e1217ef622dcd5127715c9ee5b3db6504ee':
Fix issue #23116383 : Include security patch level in Settings
2015-08-13 01:18:08 +00:00
Jorim Jaggi
5dd0e27fbb
Merge "Wait with finishing until fingerprints are removed" into mnc-dr-dev
2015-08-13 01:18:03 +00:00
Jorim Jaggi
f92fbc1c49
Wait with finishing until fingerprints are removed
...
Bug: 22863210
Change-Id: I490157cc2f9b52ac87cc52e13c7eb57cb4a4a377
2015-08-12 18:12:58 -07:00
Dianne Hackborn
cd2b9e1217
am 2be290cf: am 6a1e1e08: am f67d0785: Merge "Fix issue #23116383 : Include security patch level in Settings" into mnc-dev
...
* commit '2be290cf36f06da260e67b430a625422da512609':
Fix issue #23116383 : Include security patch level in Settings
2015-08-13 01:09:10 +00:00
