Yorke Lee
610413d307
Merge "Send broadcast when default dialer changes" into mnc-dev
2015-06-16 19:30:14 +00:00
Jason Monk
d0eab40a57
Merge "Don't show work apps in ignore optimizations list" into mnc-dev
2015-06-16 19:26:41 +00:00
Jason Monk
7c866c51cd
Guard against callbacks when no list view created
...
Bug: 21762925
Change-Id: If4bdaa6cf107c4b890a8ebeb56ba4ef222a340ad
2015-06-16 15:11:41 -04:00
Jason Monk
6ecca51254
Don't show work apps in ignore optimizations list
...
The setting is global, so we only ever need one of each app.
Bug: 21847753
Change-Id: Ib04061d87b9deb81a579ad110451f2f55ec7aeff
2015-06-16 14:18:26 -04:00
Jason Monk
455cea62eb
Merge "Add warning for disabling usage access on prof owners" into mnc-dev
2015-06-16 16:46:48 +00:00
Jason Monk
ec1c45c25d
Add warning for disabling usage access on prof owners
...
Bug: 20751702
Change-Id: Id0f54f06c3bf05c32a973ad805c116cbae96028a
2015-06-16 11:26:26 -04:00
Sanket Padawe
7171d6864f
Merge "Add PBAP checkbox for BT pairing consent dialog." into mnc-dev
2015-06-16 15:24:05 +00:00
Jason Monk
6e61347242
Start all help intents as startActivityForResult
...
So that the receiver may verify identity if they so desire...
Bug: 21849741
Change-Id: I2e2c3f674a8be88f22e051e2affb54df2f1c3eed
2015-06-16 10:31:38 -04:00
Jason Monk
744f2adb56
Merge "Layout refinement for app lists" into mnc-dev
2015-06-16 13:17:02 +00:00
Jason Monk
2cdafc6be3
Layout refinement for app lists
...
Make all app lists (or at least all current app lists) use the same
base layout for icon, label, and sizing/padding. This way they
should look the same.
Bug: 21727125
Bug: 21726922
Bug: 21853632
Change-Id: I3cffadb9e7b5184d4209deacd4ea70ec1d4f71b4
2015-06-16 09:15:39 -04:00
Jeff Sharkey
23ba5d357f
am 57922a1e: am a26765c4: am 9a5550e9: Check new user restriction.
...
* commit '57922a1ed4caa8b062ad0781aa52c38a59b8d8a7':
Check new user restriction.
2015-06-16 05:40:30 +00:00
Jeff Sharkey
57922a1ed4
am a26765c4: am 9a5550e9: Check new user restriction.
...
* commit 'a26765c461168f745913d505d6e993181e896a19':
Check new user restriction.
2015-06-16 05:28:40 +00:00
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
9a5550e9e6
Check new user restriction.
...
Change-Id: I8891a4347478c243a3f1a14cf8cdf9b4784c9fab
2015-06-15 21:51:16 -07: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
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
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
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
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
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
Yorke Lee
63fc740356
Send broadcast when default dialer changes
...
Bug: 21846308
Change-Id: Ic92c3e39fa23dc1f2e08aa5d1dd1b27835c325cf
2015-06-15 12:11:05 -07: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
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
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
Paul Jensen
e6ccd96efe
am 2d3f521f: am 020dc2e1: am 04e3fca3: Merge "Remove dead hidden ConnectivityManager and NetworkInfo APIs." into mnc-dev
...
* commit '2d3f521fe7fc8880c3fe0d9d19d471d9be8b15a3':
Remove dead hidden ConnectivityManager and NetworkInfo APIs.
2015-06-15 14:11:13 +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
1d3f9bccdf
am 89751b05: am 7384b67e: am edb7b0d9: New storage dialogs.
...
* commit '89751b0571f37d5eaea5b0c2e34a333ec8f638cc':
New storage dialogs.
2015-06-15 04:44:40 +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
Brian Carlstrom
6588a82823
dex2oat should show something friendlier in Settings -> Battery
...
Bug: 13161823
Change-Id: If68d91900c88f33f5656a9e336633d53a5e900ce
2015-06-12 20:54:16 -07:00