OSDN Git Service

android-x86/packages-apps-Settings.git
9 years agoMerge "Move ZoneGetter into SettingsLib" into mnc-dev
Tony Mantler [Fri, 29 May 2015 16:44:28 +0000 (16:44 +0000)]
Merge "Move ZoneGetter into SettingsLib" into mnc-dev

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Fri, 29 May 2015 14:22:09 +0000 (09:22 -0500)]
Import translations. DO NOT MERGE

Change-Id: I317a9af71a1ab755f032066f7239c6e1e2f6e5ec
Auto-generated-cl: translation import

9 years agoMerge "Settings: Migrate zen event conditions to use calendar name." into mnc-dev
John Spurlock [Fri, 29 May 2015 13:22:31 +0000 (13:22 +0000)]
Merge "Settings: Migrate zen event conditions to use calendar name." into mnc-dev

9 years agoSettings: Migrate zen event conditions to use calendar name.
John Spurlock [Fri, 29 May 2015 02:20:44 +0000 (22:20 -0400)]
Settings: Migrate zen event conditions to use calendar name.

And make sure any existing calendar value always appears in the
picker, even before it exists in the calendar provider.

Bug: 17755700
Change-Id: I8aa298a0d5804c288e2596f18c2dc7318f752121

9 years agoMove ZoneGetter into SettingsLib
Tony Mantler [Thu, 28 May 2015 21:48:29 +0000 (14:48 -0700)]
Move ZoneGetter into SettingsLib

Change-Id: Ia998ae0bd7fc4c974e03df7c8fc380d98a3e71de

9 years agoMerge "Disable back button on crypto screen" into mnc-dev
Paul Lawrence [Thu, 28 May 2015 19:37:27 +0000 (19:37 +0000)]
Merge "Disable back button on crypto screen" into mnc-dev

9 years agoMerge "Make use of WifiTracker's WorkerThread support" into mnc-dev
Jason Monk [Thu, 28 May 2015 16:37:38 +0000 (16:37 +0000)]
Merge "Make use of WifiTracker's WorkerThread support" into mnc-dev

9 years agoMake use of WifiTracker's WorkerThread support
Jason Monk [Thu, 28 May 2015 15:42:28 +0000 (11:42 -0400)]
Make use of WifiTracker's WorkerThread support

Let the AccessPoint callbacks come in on a BG thread and do more
of the handling there.

Bug: 21486080
Change-Id: I529152d9f5c429b790a669b75b6d955ce4336caf

9 years agoMerge "More memory updates" into mnc-dev
Jason Monk [Thu, 28 May 2015 14:24:34 +0000 (14:24 +0000)]
Merge "More memory updates" into mnc-dev

9 years agoMore memory updates
Jason Monk [Wed, 27 May 2015 16:58:21 +0000 (12:58 -0400)]
More memory updates

 - Some string changes
 - Make processes in memory details not clickable
 - Put processes in a 'detail' category
 - Hide processes when an app only has 1
 - Add memory item to bottom of app info page

Bug: 20694769
Change-Id: Ifbe2205aeef230e44752d075578524249b30bdf8

9 years agoMerge "Settings: Update icon sizes for zen auto rules." into mnc-dev
John Spurlock [Thu, 28 May 2015 14:11:10 +0000 (14:11 +0000)]
Merge "Settings: Update icon sizes for zen auto rules." into mnc-dev

9 years agoSettings: Update icon sizes for zen auto rules.
John Spurlock [Thu, 28 May 2015 14:07:29 +0000 (10:07 -0400)]
Settings: Update icon sizes for zen auto rules.

Bug: 21474291
Change-Id: I5f2ec0e86f9390ee9c73e4a1be6bc280162b1cab

9 years agoHelp fallbacks and intent work
Jason Monk [Wed, 27 May 2015 20:02:08 +0000 (16:02 -0400)]
Help fallbacks and intent work

 - Handle a backup URI, so that if the specified URI is not available,
   another can be used.
 - Add some data to help intents when they are intent URIs
 - Fill in the context with a classname when it isn't present

Bug: 15475009
Change-Id: I7050fa61121901929e650b20bd7a0ae21e8ba207

9 years agoFix Eap method selection on screen rotation.
Sanket Padawe [Thu, 28 May 2015 01:04:23 +0000 (18:04 -0700)]
Fix Eap method selection on screen rotation.

Bug: 19903254
Change-Id: I84322a785f9a4121c7885ada889a04129590e4ed

9 years agoMerge "Honor password visible setting in CryptKeeper" into mnc-dev
Paul Lawrence [Wed, 27 May 2015 22:15:50 +0000 (22:15 +0000)]
Merge "Honor password visible setting in CryptKeeper" into mnc-dev

9 years agoMerge "[ConfirmCredential] fix issue where patterns of length 4 are not checked"...
Andres Morales [Wed, 27 May 2015 20:59:27 +0000 (20:59 +0000)]
Merge "[ConfirmCredential] fix issue where patterns of length 4 are not checked" into mnc-dev

9 years agoDisable back button on crypto screen
Paul Lawrence [Thu, 14 May 2015 22:49:08 +0000 (15:49 -0700)]
Disable back button on crypto screen

The back button cannot do anything from this activity as it is
only ever launched first thing at boot. So do not permit going back.

Note that screens launched from here (emergency dialer, keyboard config)
still work and their back buttons still work.

Bug: 20730074
Change-Id: I939e05450e5fbd61d12890325c4afe9dcad35c1e

9 years agoHonor password visible setting in CryptKeeper
Paul Lawrence [Mon, 18 May 2015 20:25:01 +0000 (13:25 -0700)]
Honor password visible setting in CryptKeeper

Requires matching framework change:
  https://googleplex-android-review.git.corp.google.com/#/c/692822/

Bug: 20184626
Change-Id: I04bfb9ed61a7b40fbc28fbc0b4b10bf848b34a2c

9 years ago[ConfirmCredential] fix issue where patterns of length 4 are not checked
Andres Morales [Wed, 27 May 2015 20:04:38 +0000 (13:04 -0700)]
[ConfirmCredential] fix issue where patterns of length 4 are not checked

Change-Id: I2bfcae01be88001a6a9bafa4908305d464522302

9 years agoMerge "Clear only keystore credential entires" into mnc-dev
Chad Brubaker [Wed, 27 May 2015 20:04:13 +0000 (20:04 +0000)]
Merge "Clear only keystore credential entires" into mnc-dev

9 years agoMerge "[LockSettings] pipe through HW throttle timeout" into mnc-dev
Andres Morales [Wed, 27 May 2015 18:37:21 +0000 (18:37 +0000)]
Merge "[LockSettings] pipe through HW throttle timeout" into mnc-dev

9 years agoMerge "[LockScreen] Setup Wizard pattern lock landscape layout" into mnc-dev
Maurice Lam [Wed, 27 May 2015 18:35:07 +0000 (18:35 +0000)]
Merge "[LockScreen] Setup Wizard pattern lock landscape layout" into mnc-dev

9 years agoMerge "Cancel enrollment when navigating out of enrollment" into mnc-dev
Jorim Jaggi [Wed, 27 May 2015 18:33:25 +0000 (18:33 +0000)]
Merge "Cancel enrollment when navigating out of enrollment" into mnc-dev

9 years agoMerge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Wed, 27 May 2015 15:57:52 +0000 (15:57 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev

9 years agoMerge "Fix transient Next button in confirm screen on orientation change" into mnc-dev
Xiyuan Xia [Wed, 27 May 2015 15:54:34 +0000 (15:54 +0000)]
Merge "Fix transient Next button in confirm screen on orientation change" into mnc-dev

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Wed, 27 May 2015 15:54:34 +0000 (08:54 -0700)]
Import translations. DO NOT MERGE

Change-Id: I0a30eee2e063e7246c04a289202d22a9f00dc94e
Auto-generated-cl: translation import

9 years agoAdd no data usage string
Jason Monk [Tue, 26 May 2015 20:11:41 +0000 (16:11 -0400)]
Add no data usage string

Add a no data usage string so we can avoid showing incorrect dates
when no data is available.

Bug: 21076561
Change-Id: I4568cd750fe5f973fed0ff4ffa48412d8c6afd97

9 years agoCancel enrollment when navigating out of enrollment
Jorim Jaggi [Wed, 27 May 2015 00:52:01 +0000 (17:52 -0700)]
Cancel enrollment when navigating out of enrollment

Change-Id: Ifee1572189765cbfa4c23e6176831c8f729bbd2b

9 years agoMerge "No auto soft keyboard when fp is in use" into mnc-dev
Xiyuan Xia [Tue, 26 May 2015 21:05:24 +0000 (21:05 +0000)]
Merge "No auto soft keyboard when fp is in use" into mnc-dev

9 years agoFix transient Next button in confirm screen on orientation change
Xiyuan Xia [Tue, 26 May 2015 20:17:10 +0000 (13:17 -0700)]
Fix transient Next button in confirm screen on orientation change

During orientation change, input method service could have stale
input editor info. The portrait mode password entry allows fullscreen
UI and it is made visible for a glimpse of second during the change.
This CL adds the flagNoFullscreen to portrait mode password entry
so that the transient switch to fullscreen UI does not happen.

Bug:21073469
Change-Id: Ie9d21e46f88ad0395afb8750ab5d19e938685b89

9 years agoMerge "Don't have app info pages load so much info" into mnc-dev
Jason Monk [Tue, 26 May 2015 20:20:38 +0000 (20:20 +0000)]
Merge "Don't have app info pages load so much info" into mnc-dev

9 years agoDon't have app info pages load so much info
Jason Monk [Tue, 26 May 2015 19:56:05 +0000 (15:56 -0400)]
Don't have app info pages load so much info

They don't need to resume the ApplicationsState session because they
only need info for one app, instead just make sure ApplicationsState
can load the info as requested.

Bug: 20696893
Change-Id: I146387438348fad1396ac4528819b2f1a93a97bf

9 years agoMerge "Settings: Display corp profile calendars in event rule selection." into mnc-dev
John Spurlock [Tue, 26 May 2015 19:41:51 +0000 (19:41 +0000)]
Merge "Settings: Display corp profile calendars in event rule selection." into mnc-dev

9 years agoMerge "Fix crash while rotating with app info dialog up" into mnc-dev
Jason Monk [Tue, 26 May 2015 19:22:18 +0000 (19:22 +0000)]
Merge "Fix crash while rotating with app info dialog up" into mnc-dev

9 years agoFix crash while rotating with app info dialog up
Jason Monk [Tue, 26 May 2015 19:09:38 +0000 (15:09 -0400)]
Fix crash while rotating with app info dialog up

Bug: 21037445
Change-Id: Ie5b0f8aa04913d0ab781be334c6c305db97235a0

9 years agoMerge "Fix generation of pin for WPS on screen rotation." into mnc-dev
Sanket Padawe [Tue, 26 May 2015 18:46:04 +0000 (18:46 +0000)]
Merge "Fix generation of pin for WPS on screen rotation." into mnc-dev

9 years ago[LockScreen] Setup Wizard pattern lock landscape layout
Maurice Lam [Thu, 21 May 2015 03:00:36 +0000 (20:00 -0700)]
[LockScreen] Setup Wizard pattern lock landscape layout

Create values-land/setup_choose_lock_pattern to implement the
landscape layout of the lock pattern. Also copied
values/setup_choose_lock_pattern to sw600dp so that this will be used
in tablet landscape.

Bug: 20916604
Change-Id: I6a2193c74dd10d79ed9e212cf51a625763d87e1a

9 years agoSettings: Display corp profile calendars in event rule selection.
John Spurlock [Wed, 20 May 2015 12:57:01 +0000 (08:57 -0400)]
Settings: Display corp profile calendars in event rule selection.

And sort the accounts by display name.

Bug: 21155107
Change-Id: I8789022535ba7c66d950f5ec6f93c40ffb8106d3

9 years agoMerge "Unbanish memory screen and new UX" into mnc-dev
Jason Monk [Tue, 26 May 2015 16:55:42 +0000 (16:55 +0000)]
Merge "Unbanish memory screen and new UX" into mnc-dev

9 years agoUnbanish memory screen and new UX
Jason Monk [Thu, 21 May 2015 19:24:37 +0000 (15:24 -0400)]
Unbanish memory screen and new UX

Give memory screen a makeover so that it looks nice enough to be
restored to its rightful home.

Bug: 20694769
Change-Id: I2f6933037b3fbbfb0d9fe5e3ca821ef59e171faa

9 years ago[LockSettings] pipe through HW throttle timeout
Andres Morales [Fri, 15 May 2015 22:20:33 +0000 (15:20 -0700)]
[LockSettings] pipe through HW throttle timeout

Bug: 21118563
Change-Id: I23f5af2ebef9dac981281fb04c055a02f3b159b8

9 years agoAdd permission summaries back in
Jason Monk [Wed, 20 May 2015 20:44:28 +0000 (16:44 -0400)]
Add permission summaries back in

Use broadcasts to ask the PackageInstaller about the number of
granted permissions.

Bug: 21078474
Change-Id: I91d88d145a803f5f6c3f3163ba1f4500d39b1943

9 years agomerge in mnc-release history after reset to mnc-dev
The Android Automerger [Tue, 26 May 2015 08:03:14 +0000 (01:03 -0700)]
merge in mnc-release history after reset to mnc-dev

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 25 May 2015 15:57:08 +0000 (08:57 -0700)]
Import translations. DO NOT MERGE

Change-Id: I60153a0868ea5ec670c3c3517ac032e616a1a0ef
Auto-generated-cl: translation import

9 years agomerge in mnc-release history after reset to mnc-dev
The Android Automerger [Sat, 23 May 2015 08:06:19 +0000 (01:06 -0700)]
merge in mnc-release history after reset to mnc-dev

9 years agoString changes for app links in settings
Jason Monk [Fri, 22 May 2015 17:41:48 +0000 (13:41 -0400)]
String changes for app links in settings

Bug: 21372846
Change-Id: I76cc684c8f8f42555af36f754291d6ba99acb4e4

9 years agoMerge "DO NOT MERGE show correct backup status" into mnc-dev
Sean Francis-Lyon [Fri, 22 May 2015 20:38:39 +0000 (20:38 +0000)]
Merge "DO NOT MERGE show correct backup status" into mnc-dev

9 years agoMerge "[WifiSetup] Align to mac address to locale start" into mnc-dev
Maurice Lam [Fri, 22 May 2015 19:33:19 +0000 (19:33 +0000)]
Merge "[WifiSetup] Align to mac address to locale start" into mnc-dev

9 years agoMerge "[WifiSetup] Update phone illustrations" into mnc-dev
Maurice Lam [Fri, 22 May 2015 19:27:10 +0000 (19:27 +0000)]
Merge "[WifiSetup] Update phone illustrations" into mnc-dev

9 years ago[WifiSetup] Align to mac address to locale start
Maurice Lam [Fri, 22 May 2015 18:59:43 +0000 (11:59 -0700)]
[WifiSetup] Align to mac address to locale start

Set the textDirection of the mac address view to "locale" instead of
the inherited default of "firstStrong", so that the address itself is
always aligned with the label.

Bug: 21396886
Change-Id: I143ec069bde56d34484e8839c60386de268bb930

9 years agoString changes for app links in settings
Jason Monk [Fri, 22 May 2015 17:41:48 +0000 (13:41 -0400)]
String changes for app links in settings

Bug: 21372846
Change-Id: I76cc684c8f8f42555af36f754291d6ba99acb4e4

9 years agoClear only keystore credential entires
Chad Brubaker [Thu, 21 May 2015 22:57:24 +0000 (15:57 -0700)]
Clear only keystore credential entires

Instead of reseting the whole user only clear the uids that are used
for credential storage. These are limited to only WIFI, VPN, ROOT and
System. This prevents applications that use keystore for crypto keys
from losing their keys when the user clears credentials.

Previously when reset was called the next time the user unlocked the
keystore it would be reinitialized with the user's password however this
behavior was removed from keystore causing a loop of unlock prompts from
CredentialStorage when trying to install a new certificate after clearing
the storage.

Additionally this makes clear credentials clear any managed profiles as
well, previously it only cleared the current user.

Bug:21373935
Change-Id: Id86ec0bc66a4f6c0d5e649bead007007e2fc8268

9 years ago[WifiSetup] Update phone illustrations
Maurice Lam [Fri, 22 May 2015 18:30:51 +0000 (11:30 -0700)]
[WifiSetup] Update phone illustrations

Update illustrations in phone layout, to move the buildings up so
that they are not shown when the header is sticky.

Bug: 20954868
Change-Id: I3db4ac19901b5e5fdaeef3bdabe94e81e40b159c

9 years agoNo auto soft keyboard when fp is in use
Xiyuan Xia [Thu, 21 May 2015 18:12:19 +0000 (11:12 -0700)]
No auto soft keyboard when fp is in use

Bug:20861013
Change-Id: Ia788e4c5dbabef374d08c7cb063ef2c07bbdb078

9 years agoMerge "Fix crash in fingerprint settings." into mnc-dev
Jim Miller [Fri, 22 May 2015 01:42:23 +0000 (01:42 +0000)]
Merge "Fix crash in fingerprint settings." into mnc-dev

9 years agoFix crash in fingerprint settings.
Jim Miller [Thu, 21 May 2015 01:14:55 +0000 (18:14 -0700)]
Fix crash in fingerprint settings.

Fixes bug 21333219
Fixes bug 21336059

Change-Id: I3e5c9257affd10ace6b55f6d0b2ddbf3babf30f1

9 years agoRemove data item from app info when not supported
Jason Monk [Wed, 20 May 2015 17:35:43 +0000 (13:35 -0400)]
Remove data item from app info when not supported

Bug: 21207963
Change-Id: I91693d9a85c0905cbb021181967fa16aac61d3ea

9 years agoMerge "Banish Theme setting to developer options" into mnc-dev
Dave Langemak [Thu, 21 May 2015 23:56:25 +0000 (23:56 +0000)]
Merge "Banish Theme setting to developer options" into mnc-dev

9 years agoDO NOT MERGE show correct backup status
Sean Francis-Lyon [Thu, 21 May 2015 01:30:00 +0000 (18:30 -0700)]
DO NOT MERGE show correct backup status

show correct backup status after dismissing are-you-sure dialog
for turnning off backup and restore in settings

Change-Id: I31c4106cab58f84b77568356188e5ce49ca3430b
(cherry picked from commit f833588dae5ff7e1e6ed0723ee28b5f7684e8077)

9 years agoMerge "[LockScreenSetup] Move retry button to top" into mnc-dev
Maurice Lam [Thu, 21 May 2015 21:55:48 +0000 (21:55 +0000)]
Merge "[LockScreenSetup] Move retry button to top" into mnc-dev

9 years agoMerge "Fix string for fingerprint settings" into mnc-dev
Jorim Jaggi [Thu, 21 May 2015 21:23:56 +0000 (21:23 +0000)]
Merge "Fix string for fingerprint settings" into mnc-dev

9 years agoBanish Theme setting to developer options
Jason Monk [Thu, 21 May 2015 20:46:24 +0000 (16:46 -0400)]
Banish Theme setting to developer options

Bug: 21320576
Change-Id: I7e3fd7437409ac2dd061a36803e082eada5b30b1

9 years agoMerge "Fix loading screen one more time" into mnc-dev
Jason Monk [Thu, 21 May 2015 20:13:37 +0000 (20:13 +0000)]
Merge "Fix loading screen one more time" into mnc-dev

9 years agoFix loading screen one more time
Jason Monk [Thu, 21 May 2015 20:03:37 +0000 (16:03 -0400)]
Fix loading screen one more time

Don't rebuild the app list until the entry load is complete to avoid
having a slowly populating list shown to the user.

Bug: 21086054
Change-Id: I801ab292fdbf6801c1b9c8f957336660810da5f6

9 years agoMerge "Do not show soft keyboard when locked out" into mnc-dev
Xiyuan Xia [Thu, 21 May 2015 16:16:06 +0000 (16:16 +0000)]
Merge "Do not show soft keyboard when locked out" into mnc-dev

9 years agoMerge "Remove data item from app info when not supported" into mnc-dev
Jason Monk [Thu, 21 May 2015 12:55:31 +0000 (12:55 +0000)]
Merge "Remove data item from app info when not supported" into mnc-dev

9 years agoRemove data item from app info when not supported
Jason Monk [Wed, 20 May 2015 17:35:43 +0000 (13:35 -0400)]
Remove data item from app info when not supported

Bug: 21207963
Change-Id: I91693d9a85c0905cbb021181967fa16aac61d3ea

9 years agomerge in mnc-release history after reset to mnc-dev
The Android Automerger [Thu, 21 May 2015 08:04:45 +0000 (01:04 -0700)]
merge in mnc-release history after reset to mnc-dev

9 years agoMerge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Thu, 21 May 2015 03:26:56 +0000 (03:26 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Thu, 21 May 2015 03:20:56 +0000 (20:20 -0700)]
Import translations. DO NOT MERGE

Change-Id: Ibf8eea922fe4322ec29f6837bfb399c85b4cfbcf
Auto-generated-cl: translation import

9 years agoMerge "Settings: Auto-capitalize edit text for zen autorule names." into mnc-dev
John Spurlock [Thu, 21 May 2015 03:19:19 +0000 (03:19 +0000)]
Merge "Settings: Auto-capitalize edit text for zen autorule names." into mnc-dev

9 years agoSettings: Auto-capitalize edit text for zen autorule names.
John Spurlock [Thu, 21 May 2015 03:14:49 +0000 (23:14 -0400)]
Settings: Auto-capitalize edit text for zen autorule names.

Bug: 21337479
Change-Id: I424adf94a0717cb4ca75576e2047cbaf387bb947

9 years ago[LockScreenSetup] Move retry button to top
Maurice Lam [Thu, 21 May 2015 00:54:00 +0000 (17:54 -0700)]
[LockScreenSetup] Move retry button to top

Move retry button to top, under the subheader, and change the label
to "Clear". Also hide the footer textView since all footer labels are
currently empty.

Bug: 20916604
Change-Id: I7915a132945687815dbb16ce0a60207cc02eed2b

9 years agoDo not show soft keyboard when locked out
Xiyuan Xia [Wed, 20 May 2015 21:26:15 +0000 (14:26 -0700)]
Do not show soft keyboard when locked out

- Remove stateVisible for ConfirmLockPassword activity so that
  soft keyboard does not auto show up when the activity starts;
- Programatically show/hide soft keyboard when ConfirmLockPassword
  activity window gains focus;

Bug:20542149
Change-Id: I3faa20312d2d25752bd35b70dc8ed785e7687f0a

9 years agoMerge "Follow up for I8050df3177b6d540829c3f0989a4e4b1381c87ec (2/2)" into mnc-dev
Jorim Jaggi [Wed, 20 May 2015 19:01:49 +0000 (19:01 +0000)]
Merge "Follow up for I8050df3177b6d540829c3f0989a4e4b1381c87ec (2/2)" into mnc-dev

9 years agoMerge "Address TODOs in WifiNoInternetDialog." into mnc-dev
Lorenzo Colitti [Wed, 20 May 2015 08:04:42 +0000 (08:04 +0000)]
Merge "Address TODOs in WifiNoInternetDialog." into mnc-dev

9 years agomerge in mnc-release history after reset to mnc-dev
The Android Automerger [Wed, 20 May 2015 08:04:36 +0000 (01:04 -0700)]
merge in mnc-release history after reset to mnc-dev

9 years agoMerge "[LockScreen] Update initial string in choose lock screens" into mnc-dev
Maurice Lam [Wed, 20 May 2015 01:42:42 +0000 (01:42 +0000)]
Merge "[LockScreen] Update initial string in choose lock screens" into mnc-dev

9 years ago[LockScreen] Update initial string in choose lock screens
Maurice Lam [Wed, 20 May 2015 00:27:12 +0000 (17:27 -0700)]
[LockScreen] Update initial string in choose lock screens

In choose password and PIN screens, change the initial string from
duplicate of the title ("Choose your password/PIN") to the
verification string ("PIN must be at least ? digits" / "Password must
be at least ? characters").

Bug: 20948877
Change-Id: I635ec625f2820e522cdfc983e13ee71706e7004e

9 years agoMerge "Added SearchIndexProvider for UserSettings" into mnc-dev
Fyodor Kupolov [Tue, 19 May 2015 21:44:17 +0000 (21:44 +0000)]
Merge "Added SearchIndexProvider for UserSettings" into mnc-dev

9 years agoFix string for fingerprint settings
Jorim Jaggi [Tue, 19 May 2015 21:10:05 +0000 (14:10 -0700)]
Fix string for fingerprint settings

Also adjust fingerprint enrollment animation to spec.

Bug: 21030545
Change-Id: I937e4ea7ab4a51fa0b57b8b4c6b3038453d8f05e

9 years agoFollow up for I8050df3177b6d540829c3f0989a4e4b1381c87ec (2/2)
Jorim Jaggi [Tue, 19 May 2015 21:02:05 +0000 (14:02 -0700)]
Follow up for I8050df3177b6d540829c3f0989a4e4b1381c87ec (2/2)

Change-Id: I7623488349209248596827d03fd77cd128f8b2b4

9 years agoMonkey should not be allowed to switch USB mode
Guang Zhu [Tue, 19 May 2015 18:08:39 +0000 (11:08 -0700)]
Monkey should not be allowed to switch USB mode

Change-Id: Ifb4865d234e0d9e6453f88d37c12744b9daefa62

9 years agoMerge "Warn user when adopted device is slow." into mnc-dev
Jeff Sharkey [Tue, 19 May 2015 19:03:34 +0000 (19:03 +0000)]
Merge "Warn user when adopted device is slow." into mnc-dev

9 years agoWarn user when adopted device is slow.
Jeff Sharkey [Tue, 19 May 2015 18:22:33 +0000 (11:22 -0700)]
Warn user when adopted device is slow.

For now, warn user if benchmark takes longer than a simple threshold
of 2 seconds.

Bug: 21172095
Change-Id: I6d43ee93ac2ff669115519e6a856f8c314915a47

9 years agoAdded SearchIndexProvider for UserSettings
Fyodor Kupolov [Sat, 16 May 2015 00:16:15 +0000 (17:16 -0700)]
Added SearchIndexProvider for UserSettings

It enables customizations for certain cases like whether the user is able to
create restricted profiles or multiuser UI is disabled.

Bug: 21197002
Change-Id: Ia672c0f9bb451877f8debe04438b46cb2b7e9242

9 years agoMerge "No input instead of disabling password/pin entry" into mnc-dev
Xiyuan Xia [Tue, 19 May 2015 18:30:19 +0000 (18:30 +0000)]
Merge "No input instead of disabling password/pin entry" into mnc-dev

9 years agoMerge "Monkey should not be allowed to switch USB mode" into mnc-dev
Guang Zhu [Tue, 19 May 2015 18:14:45 +0000 (18:14 +0000)]
Merge "Monkey should not be allowed to switch USB mode" into mnc-dev

9 years agoMonkey should not be allowed to switch USB mode
Guang Zhu [Tue, 19 May 2015 18:08:39 +0000 (11:08 -0700)]
Monkey should not be allowed to switch USB mode

Change-Id: Ifb4865d234e0d9e6453f88d37c12744b9daefa62

9 years agoMerge "Remove the check hasMultipleUsers in Settings." into mnc-dev
Nicolas Prevot [Tue, 19 May 2015 17:58:45 +0000 (17:58 +0000)]
Merge "Remove the check hasMultipleUsers in Settings." into mnc-dev

9 years agoMerge "Default ignore optimizations to show system apps" into mnc-dev
Jason Monk [Tue, 19 May 2015 17:57:13 +0000 (17:57 +0000)]
Merge "Default ignore optimizations to show system apps" into mnc-dev

9 years agoDefault ignore optimizations to show system apps
Jason Monk [Tue, 19 May 2015 17:08:39 +0000 (13:08 -0400)]
Default ignore optimizations to show system apps

Bug: 21211422
Change-Id: Ied526cffa86406b8b81824cf2cdb03cc37bb7433

9 years agoAddress TODOs in WifiNoInternetDialog.
Lorenzo Colitti [Tue, 19 May 2015 15:37:38 +0000 (00:37 +0900)]
Address TODOs in WifiNoInternetDialog.

Bug: 20081183
Change-Id: I30a4f04ca892796a674ff0306aafaed485126092

9 years agoMerge "Badge managed WiFi networks" into mnc-dev
Robin Lee [Tue, 19 May 2015 13:22:09 +0000 (13:22 +0000)]
Merge "Badge managed WiFi networks" into mnc-dev

9 years agoMerge "VPN: UI for forgetting disconnected VPNs" into mnc-dev
Robin Lee [Tue, 19 May 2015 10:14:55 +0000 (10:14 +0000)]
Merge "VPN: UI for forgetting disconnected VPNs" into mnc-dev

9 years agomerge in mnc-release history after reset to mnc-dev
The Android Automerger [Tue, 19 May 2015 08:03:45 +0000 (01:03 -0700)]
merge in mnc-release history after reset to mnc-dev

9 years agoMerge "Add setting to disable assist data (2/2)." into mnc-dev
Jorim Jaggi [Tue, 19 May 2015 04:40:08 +0000 (04:40 +0000)]
Merge "Add setting to disable assist data (2/2)." into mnc-dev

9 years agoAdd setting to disable assist data (2/2).
Jorim Jaggi [Tue, 19 May 2015 00:36:50 +0000 (17:36 -0700)]
Add setting to disable assist data (2/2).

Bug: 20944446
Change-Id: I3c518176cab88ce9b5031a0241bee30240e6f896

9 years agoUpdate Backup/reset UI
Matthew Williams [Sat, 16 May 2015 04:14:14 +0000 (21:14 -0700)]
Update Backup/reset UI

BUG: 20489775
Change-Id: I2c97fdf240ddd3e9f0a518478d5da91b91abe394

9 years agoMerge "LocationSettings javadoc describes what's in the UI" into mnc-dev
Tom O'Neill [Tue, 19 May 2015 00:44:36 +0000 (00:44 +0000)]
Merge "LocationSettings javadoc describes what's in the UI" into mnc-dev