Jeff Sharkey
eb446accf3
am 96b09cf5
: am 3538eb24
: am 71c89a17
: Merge "More storage UI updates." into mnc-dev
...
* commit '96b09cf59f7554b05004fa7f8ad6da1c73e8f545':
More storage UI updates.
2015-06-16 05:16:43 +00:00
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
3538eb2410
am 71c89a17
: Merge "More storage UI updates." into mnc-dev
...
* commit '71c89a171acb1ddd63d10189c39c07134987bd2f':
More storage UI updates.
2015-06-16 04:57:43 +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
3a5c865292
am 861a64e8
: am 6364e0a2
: am a4f8aae4
: Merge "Limit number of fingerprint templates that can be enrolled per device user" into mnc-dev
...
* commit '861a64e8bfb3b77709a50f2223c355f43bfb867a':
Limit number of fingerprint templates that can be enrolled per device user
2015-06-16 04:22:00 +00: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
6364e0a26a
am a4f8aae4
: Merge "Limit number of fingerprint templates that can be enrolled per device user" into mnc-dev
...
* commit 'a4f8aae4be4040685f88c79006d2cfee42f96504':
Limit number of fingerprint templates that can be enrolled per device user
2015-06-16 04:00:37 +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
09ddca8ffe
am af02ae0f
: am d1f4be21
: am c44d0ef1
: show old legal text in backup settings if full data backup is disabled
...
* commit 'af02ae0fb7d41435531d185031a2e27952c113a4':
show old legal text in backup settings if full data backup is disabled
2015-06-16 01:49:46 +00: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
d1f4be219d
am c44d0ef1
: show old legal text in backup settings if full data backup is disabled
...
* commit 'c44d0ef1dc67466fe59c1a26a657c2f9043c948b':
show old legal text in backup settings if full data backup is disabled
2015-06-16 01:32:02 +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
0bc0352fc9
am b57ca0ac
: am 5d912c35
: am bada978e
: Merge "Use AssistUtils.getAssistInfo" into mnc-dev
...
* commit 'b57ca0aceaed55b67b91e3fc6d610503c2a1ac0b':
Use AssistUtils.getAssistInfo
2015-06-16 00:18:16 +00: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
5d912c3531
am bada978e
: Merge "Use AssistUtils.getAssistInfo" into mnc-dev
...
* commit 'bada978ec3eab48564c29eb4f8169e88975a2da0':
Use AssistUtils.getAssistInfo
2015-06-15 23:56:53 +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
4ff981c536
am 32d93f34
: am 5282bd71
: am be1b22e8
: Merge "Change to trigger client initiated OMA-DM session on System update req." into mnc-dev
...
* commit '32d93f349141ba1be95009dcb7abec121a13595f':
Change to trigger client initiated OMA-DM session on System update req.
2015-06-15 22:50:10 +00: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
5282bd71c9
am be1b22e8
: Merge "Change to trigger client initiated OMA-DM session on System update req." into mnc-dev
...
* commit 'be1b22e88ee24a9d53c1871da360cf7b56f4da0b':
Change to trigger client initiated OMA-DM session on System update req.
2015-06-15 22:29:00 +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
7daab48484
am f2903eda
: am 3fdfabcd
: am dddd589d
: Merge "Settings: Remove unreachable "Battery Info" screen." into mnc-dev
...
* commit 'f2903edadcc785135fb07a26655bf80476da35ab':
Settings: Remove unreachable "Battery Info" screen.
2015-06-15 20:14:24 +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
9c1962845a
am f4d4440f
: am f7c184f0
: am 3f98c0ce
: Fix issue #21813831 : Need API for asking to be added to power whitelist
...
* commit 'f4d4440fd4318a83ce83090a744171e336d6fd65':
Fix issue #21813831 : Need API for asking to be added to power whitelist
2015-06-15 19:49:39 +00:00
John Spurlock
3fdfabcd45
am dddd589d
: Merge "Settings: Remove unreachable "Battery Info" screen." into mnc-dev
...
* commit 'dddd589d8f0de00c192022ea9bd87f32a734343b':
Settings: Remove unreachable "Battery Info" screen.
2015-06-15 19:49:30 +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
f7c184f05e
am 3f98c0ce
: Fix issue #21813831 : Need API for asking to be added to power whitelist
...
* commit '3f98c0ce510ba95f8ecb3d815a4e722002fcf9f2':
Fix issue #21813831 : Need API for asking to be added to power whitelist
2015-06-15 19:24:10 +00: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
Geoff Mendal
431aa064f0
am f665e53c
: (-s ours) am 920a4b62
: (-s ours) am f4d7bd4f
: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
...
* commit 'f665e53c88ebaae27783787c34bead2575c3501a':
Import translations. DO NOT MERGE
2015-06-15 16:08:08 +00:00
Geoff Mendal
f665e53c88
am 920a4b62
: (-s ours) am f4d7bd4f
: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
...
* commit '920a4b62a36ec9a1e64e6a559425ec03ff760801':
Import translations. DO NOT MERGE
2015-06-15 15:59:44 +00:00
Geoff Mendal
920a4b62a3
am f4d7bd4f
: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
...
* commit 'f4d7bd4f49077602c7d3fd096fe32b2b17f76797':
Import translations. DO NOT MERGE
2015-06-15 15:48:55 +00:00
Geoff Mendal
f4d7bd4f49
Merge "Import translations. DO NOT MERGE" into mnc-dev
2015-06-15 15:36:59 +00:00
Jason Monk
b7d220581e
am d6e65040
: am dfe186f5
: am 49ecfcd6
: Merge "Fix bad theming on owner-info" into mnc-dev
...
* commit 'd6e65040f5030a5b2c3db29ca5f5f8735fcdecec':
Fix bad theming on owner-info
2015-06-15 15:36:21 +00:00
Jason Monk
3946f18abd
am 89a770fb
: am f7b0dfd6
: am f0fe5c58
: Merge "Don\'t auto-focus text fields in hotspot dialog" into mnc-dev
...
* commit '89a770fb3bd86e4089e7858664380c7d7f21e578':
Don't auto-focus text fields in hotspot dialog
2015-06-15 15:24:58 +00:00
Jason Monk
d6e65040f5
am dfe186f5
: am 49ecfcd6
: Merge "Fix bad theming on owner-info" into mnc-dev
...
* commit 'dfe186f57c4f8cc04ca3b179e3dcae6d6c76fbc0':
Fix bad theming on owner-info
2015-06-15 15:24:53 +00:00
Jason Monk
89a770fb3b
am f7b0dfd6
: am f0fe5c58
: Merge "Don\'t auto-focus text fields in hotspot dialog" into mnc-dev
...
* commit 'f7b0dfd6aeff9c02e479c2ce6f2ddc97baa09331':
Don't auto-focus text fields in hotspot dialog
2015-06-15 15:12:48 +00:00
Jason Monk
dfe186f57c
am 49ecfcd6
: Merge "Fix bad theming on owner-info" into mnc-dev
...
* commit '49ecfcd690a73112024df188924892772408d170':
Fix bad theming on owner-info
2015-06-15 15:11:59 +00:00
Jason Monk
49ecfcd690
Merge "Fix bad theming on owner-info" into mnc-dev
2015-06-15 15:05:34 +00:00
Jason Monk
39eee0c55c
Fix bad theming on owner-info
...
Bug: 21784828
Change-Id: I18c7ef71efd9549ffb2207b66d04162cd32e35a5
2015-06-15 15:05:11 +00:00
Jason Monk
f7b0dfd6ae
am f0fe5c58
: Merge "Don\'t auto-focus text fields in hotspot dialog" into mnc-dev
...
* commit 'f0fe5c58e2274a550321f936c125c691f7a1646b':
Don't auto-focus text fields in hotspot dialog
2015-06-15 15:00:20 +00:00
Geoff Mendal
b59e4e4df4
Import translations. DO NOT MERGE
...
Change-Id: Ifda55ef8db028d95b618b0a44dbe4d2c3c212f44
Auto-generated-cl: translation import
2015-06-15 07:57:05 -07:00
Jason Monk
f0fe5c58e2
Merge "Don't auto-focus text fields in hotspot dialog" into mnc-dev
2015-06-15 14:51:28 +00:00
Jason Monk
3fd29f0697
am 637cb00c
: am 20a837ea
: am 6f229435
: Merge "Handle switch of ssid to CharSequence (for spans)" into mnc-dev
...
* commit '637cb00c9db191b8052d9aa26e6e873a05d4f1b9':
Handle switch of ssid to CharSequence (for spans)
2015-06-15 14:48:00 +00:00
Jason Monk
6b4a31c219
Don't auto-focus text fields in hotspot dialog
...
Instead focus the parent, so that the fields can be seen on smaller
screens before editing.
Bug: 19095568
Change-Id: Ifeacce3ed64c370ff414e81bd4d25c5d0b26712c
2015-06-15 10:45:46 -04: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
Geoff Mendal
ef7658713f
Merge "Import translations. DO NOT MERGE"
2015-06-15 14:32:29 +00:00