Julia Reynolds
646bee6157
Merge "Add null check when loading restricted profile apps."
2015-08-17 17:15:34 +00:00
Julia Reynolds
d7faba5c25
Add null check when loading restricted profile apps.
...
In case the profile is being deleted.
Bug: 22235449
Change-Id: Ia67deb4e578edf79079ddc308b0750327c1ff85d
2015-08-17 13:09:47 -04:00
Jason Monk
38d1b86e09
am 12a4d031: am 51ba8b47: am 99df2376: am 9d59a244: Merge "Fix Usb-C dialog issues" into mnc-dr-dev
...
* commit '12a4d0313f8e964b727484448bd9b4ed8af1dc5f':
Fix Usb-C dialog issues
2015-08-17 16:26:46 +00:00
Geoff Mendal
281a97fd06
am 4c36f443: (-s ours) am f1ad264c: (-s ours) am 7533cd47: (-s ours) am 3c274207: (-s ours) Import translations. DO NOT MERGE
...
* commit '4c36f443a368a0409203612a331cbc928d2485dd':
Import translations. DO NOT MERGE
2015-08-17 16:26:28 +00:00
Jason Monk
12a4d0313f
am 51ba8b47: am 99df2376: am 9d59a244: Merge "Fix Usb-C dialog issues" into mnc-dr-dev
...
* commit '51ba8b47f501d5fe5915a997507aba2fc246012e':
Fix Usb-C dialog issues
2015-08-17 15:49:39 +00:00
Jason Monk
51ba8b47f5
am 99df2376: am 9d59a244: Merge "Fix Usb-C dialog issues" into mnc-dr-dev
...
* commit '99df2376a161d1a1328b64dfd2451aeb2c50e532':
Fix Usb-C dialog issues
2015-08-17 15:41:16 +00:00
Jason Monk
99df2376a1
am 9d59a244: Merge "Fix Usb-C dialog issues" into mnc-dr-dev
...
* commit '9d59a2441ee59b0fe74f49cb12de3af2cab89da1':
Fix Usb-C dialog issues
2015-08-17 15:35:45 +00:00
Jason Monk
9d59a2441e
Merge "Fix Usb-C dialog issues" into mnc-dr-dev
2015-08-17 15:29:52 +00:00
Geoff Mendal
4c36f443a3
am f1ad264c: (-s ours) am 7533cd47: (-s ours) am 3c274207: (-s ours) Import translations. DO NOT MERGE
...
* commit 'f1ad264cf8ee8e0ca2f79c13618f4218bab560b1':
Import translations. DO NOT MERGE
2015-08-17 14:27:25 +00:00
Geoff Mendal
f1ad264cf8
am 7533cd47: (-s ours) am 3c274207: (-s ours) Import translations. DO NOT MERGE
...
* commit '7533cd473df2acf79c874f40123865d554434b90':
Import translations. DO NOT MERGE
2015-08-17 14:19:03 +00:00
Geoff Mendal
7533cd473d
am 3c274207: (-s ours) Import translations. DO NOT MERGE
...
* commit '3c27420773e35c753e9d4f0114886a68da953469':
Import translations. DO NOT MERGE
2015-08-17 14:12:28 +00:00
Geoff Mendal
3c27420773
Import translations. DO NOT MERGE
...
Change-Id: Ic048bcec759963a76125600eb86b952a2aec5759
Auto-generated-cl: translation import
2015-08-17 07:05:00 -07:00
Geoff Mendal
e8a03d224d
Import translations. DO NOT MERGE
...
Change-Id: I43b55b016758b18892141f67662f8b435212e8ca
Auto-generated-cl: translation import
2015-08-17 06:16:08 -07:00
Adam Lesinski
516ee46c48
Merge commit 'f34d3111' into manualmerge
...
Change-Id: I4bc1b449c4b48b6f295035457b66b95e180c6ddd
2015-08-14 14:22:48 -07:00
Jeff Sharkey
edf038205e
am a334d530: am b38493cc: am b0f9e9d4: am 82fee7bd: am b4158f0e: Merge "Only offer migration between private volumes." into mnc-dev
...
* commit 'a334d53025fbbf187f5aad5abf61091f9c994e01':
Only offer migration between private volumes.
2015-08-14 21:12:58 +00:00
Julia Reynolds
6987152c47
Merge "Allow admins to remove users."
2015-08-14 20:23:23 +00:00
Julia Reynolds
2ed24d3db6
Merge "Fix crash creating notification lockscreen setting."
2015-08-14 20:20:39 +00:00
Julia Reynolds
32f1fe5b8a
Allow admins to remove users.
...
(Instead of only letting non-admins do that)
Bug: 23220408
Change-Id: Ia27906eba9217fae104f24d227920782e1a27c5f
2015-08-14 16:13:10 -04:00
Christopher Tate
07298fbc3e
resolved conflicts for merge of b1840567 to master
...
Change-Id: Ieb83bd61e624609ce3c339ed0c33c691cb4b38bb
2015-08-14 13:08:32 -07:00
Adam Lesinski
f34d31110f
am b5ca40c6: am 11d1caed: am e3ddd117: am 3cc05c9d: Merge "BatteryStats: Fix coalescing of shared app GIDs and system UIDs" into mnc-dev
...
* commit 'b5ca40c6442c4f30b79dcd202bb9fecc65ba436c':
BatteryStats: Fix coalescing of shared app GIDs and system UIDs
2015-08-14 20:01:51 +00:00
Julia Reynolds
94a5bdcb44
Fix crash creating notification lockscreen setting.
...
Bug: 23210434
Change-Id: Ic214b34cb540e226c9e871fcda8432460cf3a46f
2015-08-14 15:55:08 -04:00
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
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
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
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
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
