Jeff Sharkey
96b09cf59f
am 3538eb24: am 71c89a17: Merge "More storage UI updates." into mnc-dev
...
* commit '3538eb2410808484b8110d83543d6c926fa870c4':
More storage UI updates.
2015-06-16 05:06:00 +00:00
Jeff Sharkey
71c89a171a
Merge "More storage UI updates." into mnc-dev
2015-06-16 04:47:19 +00:00
Jeff Sharkey
2597625fd9
More storage UI updates.
...
Storage volumes now have headers with larger fonts and progress bars
to show used versus free space. Updated Memory to use new formatting
template, and Data Usage to use consistent display logic.
Allocate a unique color for each private volume, and yell when a
volume is running low on space. Update private volume details to
launch into MediaStore-backed storage backends in a management mode,
and only show detailed items when hosting emulated storage. Show
details dialog about "Other" and user storage items.
Shortcut into single private volume when it's the only device. Add
real eject icon.
Bug: 21756698, 20275574, 21326612
Change-Id: If3ecd1d912d3e709c09d3e4da24f368e04dd3f9d
2015-06-15 21:44:21 -07:00
Jim Miller
861a64e8bf
am 6364e0a2: am a4f8aae4: Merge "Limit number of fingerprint templates that can be enrolled per device user" into mnc-dev
...
* commit '6364e0a26a04cc048e8a0ff1dd9c0ed90cd45295':
Limit number of fingerprint templates that can be enrolled per device user
2015-06-16 04:10:57 +00:00
Jim Miller
a4f8aae4be
Merge "Limit number of fingerprint templates that can be enrolled per device user" into mnc-dev
2015-06-16 03:49:01 +00:00
Jim Miller
5adada6083
Limit number of fingerprint templates that can be enrolled per device user
...
This change places an upper limit on the number of fingerprint templates that
can be enrolled per account. This is done primarily for performance reasons, but
may also be imposed by hardware and Trusted Execution Environment (TEE) reasons.
Fixes bug 20731847
Change-Id: I3975290fa8eb2106467493aab6102015697e012c
On branch max_fingerprint
2015-06-15 20:44:45 -07:00
Sean Francis-Lyon
af02ae0fb7
am d1f4be21: am c44d0ef1: show old legal text in backup settings if full data backup is disabled
...
* commit 'd1f4be219d68179c0aea245e7b66d393444688a7':
show old legal text in backup settings if full data backup is disabled
2015-06-16 01:42:58 +00:00
Sean Francis-Lyon
c44d0ef1dc
show old legal text in backup settings if full data backup is disabled
...
Change-Id: Ifc4fa5c4a6180fd4ceb41ca66dc2dd6a58f4f086
2015-06-15 18:11:41 -07:00
Adrian Roos
b57ca0acea
am 5d912c35: am bada978e: Merge "Use AssistUtils.getAssistInfo" into mnc-dev
...
* commit '5d912c353145b893f4175fdff1ab488b0265cd4b':
Use AssistUtils.getAssistInfo
2015-06-16 00:05:17 +00:00
Adrian Roos
bada978ec3
Merge "Use AssistUtils.getAssistInfo" into mnc-dev
2015-06-15 23:49:19 +00:00
Adrian Roos
b627370e85
Use AssistUtils.getAssistInfo
...
Use consistent logic with SystemUI for determining
default assist component.
Bug: 21780590
Change-Id: I1313b79ce3bb75944889e3ceccb4a2e6bb23e824
2015-06-15 16:15:24 -07:00
Amit Mahajan
32d93f3491
am 5282bd71: am be1b22e8: Merge "Change to trigger client initiated OMA-DM session on System update req." into mnc-dev
...
* commit '5282bd71c9128bd53703b3381be0697afc7baf2a':
Change to trigger client initiated OMA-DM session on System update req.
2015-06-15 22:39:02 +00:00
Amit Mahajan
be1b22e88e
Merge "Change to trigger client initiated OMA-DM session on System update req." into mnc-dev
2015-06-15 22:16:38 +00:00
John Spurlock
f2903edadc
am 3fdfabcd: am dddd589d: Merge "Settings: Remove unreachable "Battery Info" screen." into mnc-dev
...
* commit '3fdfabcd4576b27c37608656c277686d73833b57':
Settings: Remove unreachable "Battery Info" screen.
2015-06-15 20:01:55 +00:00
Dianne Hackborn
f4d4440fd4
am f7c184f0: am 3f98c0ce: Fix issue #21813831 : Need API for asking to be added to power whitelist
...
* commit 'f7c184f05e4f2c70835dfb7da48cc1a95e38a6e4':
Fix issue #21813831 : Need API for asking to be added to power whitelist
2015-06-15 19:37:09 +00:00
John Spurlock
dddd589d8f
Merge "Settings: Remove unreachable "Battery Info" screen." into mnc-dev
2015-06-15 19:36:46 +00:00
John Spurlock
dae8c154f0
Settings: Remove unreachable "Battery Info" screen.
...
Bug: 21576824
Change-Id: Ia2bb3b22b7512cd05ceca5798e85e5479e064213
2015-06-15 15:24:16 -04:00
Dianne Hackborn
3f98c0ce51
Fix issue #21813831 : Need API for asking to be added to power whitelist
...
When launching the battery whitelist for a particular app, we now
default to the app being asked to enable adding to the whitelist, and
dismissing the dialog will dismiss the entire whitelist UI.
You can now launch the whitelist without specifying an app to just
get the regular UI.
Change-Id: Idf3840b8a30febe71fbd600969c257d72809643f
2015-06-15 11:54:03 -07:00
Jason Monk
637cb00c9d
am 20a837ea: am 6f229435: Merge "Handle switch of ssid to CharSequence (for spans)" into mnc-dev
...
* commit '20a837ea52a77efa578aef58b7e108f59c3a8bcb':
Handle switch of ssid to CharSequence (for spans)
2015-06-15 14:35:25 +00:00
Jason Monk
6f22943536
Merge "Handle switch of ssid to CharSequence (for spans)" into mnc-dev
2015-06-15 14:14:56 +00:00
Jason Monk
c68b46c1f2
Handle switch of ssid to CharSequence (for spans)
...
Change to reference the string directly for places like search,
etc.
Bug: 20059794
Change-Id: I3305c9833e8aeea52b968c094d0a1881a3e6699e
2015-06-15 10:09:55 -04:00
Paul Jensen
2d3f521fe7
am 020dc2e1: am 04e3fca3: Merge "Remove dead hidden ConnectivityManager and NetworkInfo APIs." into mnc-dev
...
* commit '020dc2e151c49e01da86a7bc597d5d8dd3ef335c':
Remove dead hidden ConnectivityManager and NetworkInfo APIs.
2015-06-15 13:58:58 +00:00
Paul Jensen
04e3fca391
Merge "Remove dead hidden ConnectivityManager and NetworkInfo APIs." into mnc-dev
2015-06-15 13:36:58 +00:00
Jeff Sharkey
89751b0571
am 7384b67e: am edb7b0d9: New storage dialogs.
...
* commit '7384b67e159eed75a6e8744da27ee3eaa2ed308a':
New storage dialogs.
2015-06-15 04:32:54 +00:00
Jeff Sharkey
edb7b0d9a9
New storage dialogs.
...
Show a helpful dialog when a volume is unmounted or unmountable, or
when disk is unsupported. Add both missing private volumes and
unsupported disks in the storage list. Dialog to confirm when
forgetting private volume.
Finish volume detail activities when the volume becomes unmounted.
Show used space instead of free space to match string. When init'ing
a volume on non-adoptable disk, just format as public.
Bug: 21737573, 21666225, 21737666, 21471429
Change-Id: Id60d5a398e2b7923ebebdc5cfaef33248d8d77bb
2015-06-14 21:07:30 -07:00
Nick Kralevich
e10831550e
am bc8985c6: am 9405a81f: Merge "Let UsbDeviceManager choose the appropriate function default" into mnc-dev
...
* commit 'bc8985c6ee49e0feff3a48c399a03d8d882ea6bc':
Let UsbDeviceManager choose the appropriate function default
2015-06-13 03:31:21 +00:00
Nick Kralevich
a864e46b47
am 20a0da89: am 64a8032f: Merge "Fix bad USB configuration under Developer Options" into mnc-dev
...
* commit '20a0da89089984b12805b707c8644bb4413389c4':
Fix bad USB configuration under Developer Options
2015-06-13 03:31:18 +00:00
Nick Kralevich
9405a81f7a
Merge "Let UsbDeviceManager choose the appropriate function default" into mnc-dev
2015-06-13 03:12:27 +00:00
Nick Kralevich
64a8032f44
Merge "Fix bad USB configuration under Developer Options" into mnc-dev
2015-06-13 03:12:08 +00:00
Makoto Onuki
e0115ee572
am 75651de4: am 97d102d9: Merge "Add simple null checks to StorageWizard*, also listen to..." into mnc-dev
...
* commit '75651de4d17200d4aa0ae083303f8214c7b7478b':
Add simple null checks to StorageWizard*, also listen to...
2015-06-13 00:23:15 +00:00
Nick Kralevich
2d0f6a9d36
Let UsbDeviceManager choose the appropriate function default
...
Rather than hardcoding MTP as the appropriate default when the user
selects "Charger Only", call UsbDeviceManager.setCurrentFunction(null).
Null is intended to restore the default function, which is appropriate
for charging only.
Bug: 21429947
Change-Id: I9ee633bcf2f95f9937861c234ab044873202d41b
2015-06-12 17:18:05 -07:00
Makoto Onuki
97d102d9e2
Merge "Add simple null checks to StorageWizard*, also listen to..." into mnc-dev
2015-06-12 23:57:54 +00:00
Nick Kralevich
9cff8cdfe0
Fix bad USB configuration under Developer Options
...
The USB configuration screen under Developer Options hasn't been
updated for the new USB access control changes. Update it.
1) Ensure that the default in Development Settings is "Charger Only".
2) Changing USB mode in developer settings only changes the USB function.
It doesn't unlock any USB data.
Bug: 21258972
Change-Id: I9cbd5099cb55f31f1258e512e5ee7f6f4e303fc9
2015-06-12 16:30:45 -07:00
Makoto Onuki
1d37d0f7fb
Add simple null checks to StorageWizard*, also listen to...
...
the disk destroyed event.
Bug 21336042
Change-Id: I9f53501a6122a4a9046774e3c4c08b5d6d6f8552
2015-06-12 16:28:18 -07:00
Selim Cinek
827c5419fa
am 0abc4fb6: am ee5db351: Merge "Added an introduction to the fingerprint enrollment" into mnc-dev
...
* commit '0abc4fb6e3c055e4107edd5a32466b4f4c90a7a8':
Added an introduction to the fingerprint enrollment
2015-06-12 22:22:27 +00:00
Selim Cinek
ee5db351ac
Merge "Added an introduction to the fingerprint enrollment" into mnc-dev
2015-06-12 21:57:45 +00:00
Makoto Onuki
0b5b05e2f5
am 20468a11: am e0142a67: Merge "Promote "add service" from menu to list item" into mnc-dev
...
* commit '20468a1160eef269b7116535128daeedfbb7811a':
Promote "add service" from menu to list item
2015-06-12 16:40:31 +00:00
Rubin Xu
7d4f7abc28
am 4c5eaae5: am 47d329f7: Merge "Defensively load untrusted icons from account authenticator" into mnc-dev
...
* commit '4c5eaae564f20e47e6c3a4f7906446b195c639da':
Defensively load untrusted icons from account authenticator
2015-06-12 16:40:29 +00:00
Makoto Onuki
e0142a67fd
Merge "Promote "add service" from menu to list item" into mnc-dev
2015-06-12 16:18:31 +00:00
Rubin Xu
47d329f79a
Merge "Defensively load untrusted icons from account authenticator" into mnc-dev
2015-06-12 16:18:16 +00:00
Selim Cinek
ec8500438c
Added an introduction to the fingerprint enrollment
...
Bug: 21468315
Change-Id: Ieb691b0e321f44b9bae2f4f8dfd458c24b98a8d9
2015-06-11 19:02:26 -07:00
Adrian Roos
b52435a963
am 593c1845: am da6e4c47: Merge "Ensure text is visible when choosing pattern" into mnc-dev
...
* commit '593c184584944aed230889a0e736ac484c435683':
Ensure text is visible when choosing pattern
2015-06-12 00:52:07 +00:00
Adrian Roos
da6e4c47aa
Merge "Ensure text is visible when choosing pattern" into mnc-dev
2015-06-12 00:26:07 +00:00
Adrian Roos
ed427af748
Ensure text is visible when choosing pattern
...
Bug: 21639578
Change-Id: Ib948411b3087c752a36ed6f853915e59946c0988
2015-06-11 16:14:40 -07:00
Jorim Jaggi
e750927c70
am 258e709a: am fb535a8e: Merge "Refine fingerprint enrollment experience" into mnc-dev
...
* commit '258e709a32ce69c906bea9e13e999d52e8ff5b32':
Refine fingerprint enrollment experience
Fix crash in battery screen
2015-06-11 23:05:50 +00:00
Amit Mahajan
9d4b548619
Change to trigger client initiated OMA-DM session on System update req.
...
Bug: 21603815
Change-Id: I401099a9aeced578ee914ddbebf1f5982f276780
2015-06-11 15:54:31 -07:00
Jorim Jaggi
fb535a8e49
Merge "Refine fingerprint enrollment experience" into mnc-dev
2015-06-11 22:34:53 +00:00
Jeff Sharkey
a48e4fd9ed
am 41b7468f: am f25fc9cb: Merge "Always round migration times up to 1 second." into mnc-dev
...
* commit '41b7468feb96ac51f494abc5414f7f02e801ed97':
Always round migration times up to 1 second.
2015-06-11 22:17:19 +00:00
Jorim Jaggi
436e02c3d5
Refine fingerprint enrollment experience
...
- Flash fingerprint graphic when enrollment progresses
- Show hint message when not progressing for a few seconds
- Make sure animation is always working
Bug: 21617091
Bug: 21644138
Change-Id: Ic54c10a655e6da914f960cee20f0066b46d87325
2015-06-11 15:13:56 -07:00
Makoto Onuki
0ec96fe64c
Promote "add service" from menu to list item
...
Also show the app icon for each service.
Bug 19914125
Change-Id: I592c526746a3ec9f67e8e8a6c6f1530e7724e310
2015-06-11 14:26:29 -07:00