Commit Graph

8788 Commits

Author SHA1 Message Date
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
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
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
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
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
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
04e3fca391 Merge "Remove dead hidden ConnectivityManager and NetworkInfo APIs." into mnc-dev 2015-06-15 13:36:58 +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
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
Sanket Padawe
2ef44c5e5d Add PBAP checkbox for BT pairing consent dialog.
Bug: 20488109
Change-Id: Ib6c98c27e6d2b8e59fa4b640df15214a6b197853
2015-06-12 18:09:45 -07: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
ee5db351ac Merge "Added an introduction to the fingerprint enrollment" into mnc-dev 2015-06-12 21:57:45 +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
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
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
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
Jeff Sharkey
f25fc9cb67 Merge "Always round migration times up to 1 second." into mnc-dev 2015-06-11 20:45:09 +00:00
Jeff Sharkey
5693274d2a Always round migration times up to 1 second.
Bug: 21755250
Change-Id: I4e5eef493f2f923d0bcf110133e862c4a4a7db8b
2015-06-11 13:43:56 -07:00
Jason Monk
0011604fd1 Merge "Clean up settings shortcuts" into mnc-dev 2015-06-11 19:56:50 +00:00
Jason Monk
2acff556c2 Clean up settings shortcuts
- Remove some bad entries
 - Fix icons to be top-level item specific
 - Add memory

Bug: 20632230
Change-Id: I067b467b9ee354b52ef61b312dc5a89fd7eae2ac
2015-06-11 15:47:29 -04:00
Paul Jensen
6953eea28b Remove dead hidden ConnectivityManager and NetworkInfo APIs.
Change-Id: Ifa44c7553c7c45ebe261a2a124d9bf8d6f96c690
2015-06-11 10:26:33 -04:00
John Spurlock
fca81cd233 Merge "Settings: Follow frameworks change to volume sliders." into mnc-dev 2015-06-11 14:08:46 +00:00
John Spurlock
f82154de8c Settings: Follow frameworks change to volume sliders.
Bug: 21267436
Change-Id: I72c6411346429ebf428662d1c6d6d8a7529c0d67
2015-06-11 10:06:30 -04:00
Sanket Padawe
1d220f6242 Merge "Fix SimPreference dialog from closing on orientation change." into mnc-dev 2015-06-11 01:41:21 +00:00
Sanket Padawe
f6f43e4c45 Fix SimPreference dialog from closing on orientation change.
Bug: 19041463
Change-Id: I8c91fd6f01bbeb7561365dbb76ba3d4c05b76efc
2015-06-10 17:46:31 -07:00
Jeff Sharkey
680329f10c Follow string refactoring.
Change-Id: Ib450724a20283a3bf356593e487b8ee6e9c8de5c
2015-06-10 17:27:44 -07:00
Lajos Molnar
63504d8326 Merge "developer settings: remove "Use deprecated AwesomePlayer" settings" into mnc-dev 2015-06-10 23:23:49 +00:00
Jorim Jaggi
ed76e59e49 Merge "Animations/success state for external confirm device credentials (2/2)" into mnc-dev 2015-06-10 23:10:08 +00:00
Lucky Zhang
34450932b2 Merge "[Settings] Pass lock type extra back to SUW" into mnc-dev 2015-06-10 23:01:26 +00:00
Jorim Jaggi
ff41a9a5a6 Animations/success state for external confirm device credentials (2/2)
Bug: 20929186
Change-Id: I4489dd37f1148fb03315ec337a546eee04660cb5
2015-06-10 15:17:24 -07:00
Lajos Molnar
ee55eac297 developer settings: remove "Use deprecated AwesomePlayer" settings
Bug: 17108024
Change-Id: I602eba3214cacef7435ce6347e885c040d5c443c
2015-06-10 15:00:13 -07:00
Nick Kralevich
8da8e52874 Merge "Fix USB access control when adb is disabled." into mnc-dev 2015-06-10 21:11:35 +00:00
Jason Monk
a576d55a0e Merge "Hide tap to wake on devices that don't support it" into mnc-dev 2015-06-10 20:26:12 +00:00
Jason Monk
181e0e9ec0 Hide tap to wake on devices that don't support it
Bug: 21650579
Change-Id: I3fbcccc80b5773c74d8398f1d23b4762a5bf54ed
2015-06-10 16:16:10 -04:00