OSDN Git Service

android-x86/packages-apps-Settings.git
8 years agoMerge "[Settings] Don't allow apps on external storage to be active admin" into nyc-dev
Makoto Onuki [Wed, 17 Feb 2016 22:48:42 +0000 (22:48 +0000)]
Merge "[Settings] Don't allow apps on external storage to be active admin" into nyc-dev

8 years ago[Settings] Don't allow apps on external storage to be active admin
Makoto Onuki [Wed, 17 Feb 2016 19:15:04 +0000 (11:15 -0800)]
[Settings] Don't allow apps on external storage to be active admin

Bug 27149287

Change-Id: I7e0905228812fbc326cf4ac4984e7f59003996a8

8 years agoMerge "Fix inconsistent use of screenlock" into nyc-dev
Kenny Guy [Wed, 17 Feb 2016 21:51:53 +0000 (21:51 +0000)]
Merge "Fix inconsistent use of screenlock" into nyc-dev

8 years agoMerge "Home default setting should not shown in managed profile settings" into nyc-dev
Tony Mak [Wed, 17 Feb 2016 21:43:02 +0000 (21:43 +0000)]
Merge "Home default setting should not shown in managed profile settings" into nyc-dev

8 years agoFix inconsistent use of screenlock
Kenny Guy [Wed, 17 Feb 2016 20:49:45 +0000 (20:49 +0000)]
Fix inconsistent use of screenlock

Change screenlock to screen lock
to be consistent.

Bug: 26635057
Change-Id: I4cb06cd2dcea0499a232ed3f28a7dbbf3598c9e9

8 years agoMerge "Create messenger preview screen for magnification gesture settings screen...
Noah Wang [Wed, 17 Feb 2016 20:20:01 +0000 (20:20 +0000)]
Merge "Create messenger preview screen for magnification gesture settings screen" into nyc-dev

8 years agoMerge "Add a Developer option of "Disable automatic update"." into nyc-dev
Tao Bao [Wed, 17 Feb 2016 20:06:51 +0000 (20:06 +0000)]
Merge "Add a Developer option of "Disable automatic update"." into nyc-dev

8 years agoCreate messenger preview screen for magnification gesture
Noah Wang [Fri, 5 Feb 2016 03:11:33 +0000 (19:11 -0800)]
Create messenger preview screen for magnification gesture
settings screen

Change-Id: I4824c370388c4996e233c87005879d4818cfd59e

8 years agoAdd a Developer option of "Disable automatic update".
Tao Bao [Tue, 16 Feb 2016 04:03:22 +0000 (20:03 -0800)]
Add a Developer option of "Disable automatic update".

For devices using A/B update or update-on-boot feature, we need a
Developer option to prevent the system updates from being installed
automatically.

We store the "disabled" status internally to turn on the automatic
update by default. But we show the opposite "enabled" status on screen
based on UX comments.

Bug: 27193001
Change-Id: I36a08a2a08fd1ba0f8f3c4b3ae5a08dc50829cd2

8 years agoImport translations. DO NOT MERGE
Geoff Mendal [Wed, 17 Feb 2016 17:35:03 +0000 (17:35 +0000)]
Import translations. DO NOT MERGE
am: 7efa356849  -s ours

* commit '7efa356849411f4c4562c9c84b4e9f5c68fa9e13':
  Import translations. DO NOT MERGE

8 years agoHome default setting should not shown in managed profile settings
Tony Mak [Wed, 17 Feb 2016 17:08:02 +0000 (17:08 +0000)]
Home default setting should not shown in managed profile settings

Each default preference needs to have its corresponding
PreferenceAvailabilityProvider to provide us the availability of it.
If no corresponding provider is found, it is considered to be not
available. So it encourages other developers who will add new default app
preference later to consider the availability of it.

Bug:27143673
Change-Id: I073b7122dddc579504f397c5de2bdd4df3826269

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-dev
Geoff Mendal [Wed, 17 Feb 2016 15:39:28 +0000 (15:39 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev

8 years agoMerge "Alarm can end time-based rule." into nyc-dev
Julia Reynolds [Wed, 17 Feb 2016 15:34:48 +0000 (15:34 +0000)]
Merge "Alarm can end time-based rule." into nyc-dev

8 years agoImport translations. DO NOT MERGE
Geoff Mendal [Wed, 17 Feb 2016 15:33:57 +0000 (07:33 -0800)]
Import translations. DO NOT MERGE

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

8 years agoImport translations. DO NOT MERGE
Geoff Mendal [Wed, 17 Feb 2016 15:15:28 +0000 (07:15 -0800)]
Import translations. DO NOT MERGE

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

8 years agoAlarm can end time-based rule.
Julia Reynolds [Thu, 11 Feb 2016 18:58:48 +0000 (13:58 -0500)]
Alarm can end time-based rule.

Bug: 21069008
Change-Id: I83527f787b7daaf936029674202a27900550b652

8 years agoresolve merge conflicts of c408ab3de6 to nyc-dev
Lorenzo Colitti [Wed, 17 Feb 2016 13:27:56 +0000 (22:27 +0900)]
resolve merge conflicts of c408ab3de6 to nyc-dev

Change-Id: I647195694e4c2c8dd886246143ef9f9ac7a79a62

8 years agoHide the legacy DHCP client option, since it no longer works.
Lorenzo Colitti [Wed, 17 Feb 2016 13:06:10 +0000 (22:06 +0900)]
Hide the legacy DHCP client option, since it no longer works.

This only removes the option from the Developer Settings screen.
Future changes will need to:

- Remove the localized strings.
- Remove the settings constants in SettingsLib.

Bug: 26991160
Change-Id: I1770bb1c206818317845ff5aa340b2a9a76118b5

8 years agoMerge "Fixes for fingerprint profile challenge" into nyc-dev
Mahaver Chopra [Wed, 17 Feb 2016 10:29:45 +0000 (10:29 +0000)]
Merge "Fixes for fingerprint profile challenge" into nyc-dev

8 years agoMerge "Fixes autoadvance on find sensor page for fingerprint." into nyc-dev
Udam Saini [Wed, 17 Feb 2016 01:15:02 +0000 (01:15 +0000)]
Merge "Fixes autoadvance on find sensor page for fingerprint." into nyc-dev

8 years agoUpdate BandMode Names to support full list, fix off-by-one UI error.
Nathan Harold [Wed, 17 Feb 2016 00:51:20 +0000 (00:51 +0000)]
Update BandMode Names to support full list, fix off-by-one UI error.
am: 575fe1af95

* commit '575fe1af95864819d457c08e169b1af5c269bcfb':
  Update BandMode Names to support full list, fix off-by-one UI error.

8 years agoMerge "Remove switching from Users menu" into nyc-dev
Fyodor Kupolov [Wed, 17 Feb 2016 00:29:00 +0000 (00:29 +0000)]
Merge "Remove switching from Users menu" into nyc-dev

8 years agoUpdate BandMode Names to support full list, fix off-by-one UI error.
Nathan Harold [Fri, 12 Feb 2016 18:03:36 +0000 (10:03 -0800)]
Update BandMode Names to support full list, fix off-by-one UI error.

-Added support for all the currently defined band modes.
-Fixed an off-by-one error in the UI that prevented single-band
 phones from being able to select a valid band.

Bug: 27145805
Change-Id: If7366294086e28ebb51aa2f4b89c881c38deacc2

8 years agoRemove switching from Users menu
Fyodor Kupolov [Sat, 30 Jan 2016 01:29:54 +0000 (17:29 -0800)]
Remove switching from Users menu

Bug: 26562786
Change-Id: Id0f26621b8356c3161dee861b0215b01d48007c9

8 years agoMerge "Removes tap continue when done text" into nyc-dev
Udam Saini [Tue, 16 Feb 2016 21:00:06 +0000 (21:00 +0000)]
Merge "Removes tap continue when done text" into nyc-dev

8 years agoRemoves tap continue when done text
Udam Saini [Tue, 16 Feb 2016 18:47:39 +0000 (10:47 -0800)]
Removes tap continue when done text

This text is hidden by the keyboard, and the continue/keyboard done
button seem more intuitive than with this text.

bug:27063940
Change-Id: I1a4dca31fbf1c1cf9c00a68f0bb00df760992cda

8 years agoFixing the sections not getting created the first time
Sunny Goyal [Thu, 11 Feb 2016 22:55:47 +0000 (14:55 -0800)]
Fixing the sections not getting created the first time

Change-Id: I9b8888d1633eba29e9ec79924d26cff0fce33ead

8 years agoFixes for fingerprint profile challenge
Mahaver Chopra [Mon, 15 Feb 2016 21:35:14 +0000 (21:35 +0000)]
Fixes for fingerprint profile challenge

"Remove all fingerprints?" dialog should only be shown when removing the
last finger print. Fixed.
Changed the Dialog description for the same.

Bug: 26903306
Change-Id: I11b11a9173fa9b09e3fb20bb8a8e7a64594a7d81

8 years agoMerge "Fix package-enabled check in Developer Settings." into nyc-dev
Gustav Sennton [Tue, 16 Feb 2016 15:18:13 +0000 (15:18 +0000)]
Merge "Fix package-enabled check in Developer Settings." into nyc-dev

8 years agoMerge "Make the screen zoom preview app icon bigger to match Launcher" into nyc-dev
Alan Viverette [Mon, 15 Feb 2016 20:02:00 +0000 (20:02 +0000)]
Merge "Make the screen zoom preview app icon bigger to match Launcher" into nyc-dev

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-dev
Geoff Mendal [Mon, 15 Feb 2016 16:45:08 +0000 (16:45 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev

8 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 15 Feb 2016 15:33:11 +0000 (07:33 -0800)]
Import translations. DO NOT MERGE

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

8 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 15 Feb 2016 15:19:55 +0000 (15:19 +0000)]
Import translations. DO NOT MERGE
am: f99586c789  -s ours

* commit 'f99586c789bf2c531721f121b5b08425cc14ded5':
  Import translations. DO NOT MERGE

8 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 15 Feb 2016 15:15:03 +0000 (07:15 -0800)]
Import translations. DO NOT MERGE

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

8 years agoFix package-enabled check in Developer Settings.
Gustav Sennton [Mon, 15 Feb 2016 14:27:38 +0000 (14:27 +0000)]
Fix package-enabled check in Developer Settings.

The enabled-state of a package is already being accounted for when
creating an ApplicationInfo from the package manager, so checking it
again in Developer Settings to figure out whether a package is enabled
is unnecessary.

Change-Id: I1b057a28bb33fc2bbc5ea750bfa04a75860ff1d1

8 years agoDO NOT MERGE Modify system settings: incorrect UI state am: 2c02228ad0 am: 5527ac9cf2
Svetoslav [Sun, 14 Feb 2016 22:50:34 +0000 (22:50 +0000)]
DO NOT MERGE Modify system settings: incorrect UI state am: 2c02228ad0 am: 5527ac9cf2
am: 59495dd42a  -s ours

* commit '59495dd42a7d613b67af0b579c70b90368e9ce9f':
  DO NOT MERGE Modify system settings: incorrect UI state

8 years agoDO NOT MERGE Modify system settings: incorrect UI state am: 2c02228ad0
Svetoslav [Sun, 14 Feb 2016 22:38:52 +0000 (22:38 +0000)]
DO NOT MERGE Modify system settings: incorrect UI state am: 2c02228ad0
am: 5527ac9cf2

* commit '5527ac9cf215fb894153bae8c3bb06fb5264d146':
  DO NOT MERGE Modify system settings: incorrect UI state

8 years agoDO NOT MERGE Modify system settings: incorrect UI state
Svetoslav [Sun, 14 Feb 2016 22:28:25 +0000 (22:28 +0000)]
DO NOT MERGE Modify system settings: incorrect UI state
am: 2c02228ad0

* commit '2c02228ad0cd7b9d86050647c679843e829819d4':
  DO NOT MERGE Modify system settings: incorrect UI state

8 years agoFixes autoadvance on find sensor page for fingerprint.
Udam Saini [Fri, 12 Feb 2016 21:42:18 +0000 (13:42 -0800)]
Fixes autoadvance on find sensor page for fingerprint.

OnStop gets called after an activity behind it on the stack is resumed
when the user pressed the back button on the navigation bar. Because of
this, we need to disable the cancelEnrollment call inside onBackPressed
instead of onStop so that on the find sensor page, the auto next advance
on pressing the fingerprint sensor will still work.

bug:27151472
Change-Id: I1e440f1f7cd91c0711dd31b8bf65a567d4d39f8b

8 years agoFix incorrectly sized app prefs
Jason Monk [Fri, 12 Feb 2016 21:31:43 +0000 (16:31 -0500)]
Fix incorrectly sized app prefs

Bug: 27066871
Change-Id: I0a1a4847532243c27ec5f9d96d8079c417bae91e

8 years agoDO NOT MERGE Modify system settings: incorrect UI state
Svetoslav [Tue, 24 Nov 2015 19:31:13 +0000 (11:31 -0800)]
DO NOT MERGE Modify system settings: incorrect UI state

The privilege for an app to write to the system settings is protected
by an app-op signature permission. App-op permissions are special: if
the app-op is deny/allow we deny/allow write access; if the app-op is
default holding the permission determies write access. The settings
code assumes that CHANGE_NETWORK_STATE is an app op permission
(system|appop) while it is a normal permission which any app gets by
declaring it used in the manifest.

The side effect is that the state of the toggle in the UI for write
system settings will initially be in the wrong state if the app uses
both WRITE_SETTINGS and CHANGE_NETWORK_STATE. However, the code in
the public API an app uses to check write settings access would return
the opposite since it checks the WRITE_SETTINGS permission and its
app op. Hence, if an app requires write settings to start the user
will see in the settings UI it has access but the app will not have
access, so the app would prompt the user to allow write settings.
The non-obvious fix is for the user to toggle the setting off and on
to get the app op in the right state and be able to launch the app.

bug:25843134

Change-Id: I3d726a66c7f9857bc7dbd5946fdbb8f340c6eb4d
(cherry picked from commit 356fb2d10d9f4c236b0f10d0e2facb93028b9f3c)
(cherry picked from commit 119d589ea5aa9c2ccc5164279d718a20d0865f20)

8 years agoMake the screen zoom preview app icon bigger to match Launcher
Alan Viverette [Thu, 11 Feb 2016 23:56:53 +0000 (15:56 -0800)]
Make the screen zoom preview app icon bigger to match Launcher

Bug: 27060024
Change-Id: I0eb58facefa8618331b5109f034d6e0134ad32d8

8 years agoMerge "Revert "Use SetupWizardPreferenceLayout"" into nyc-dev
Udam Saini [Thu, 11 Feb 2016 23:32:16 +0000 (23:32 +0000)]
Merge "Revert "Use SetupWizardPreferenceLayout"" into nyc-dev

8 years agoRevert "Use SetupWizardPreferenceLayout"
Udam Saini [Thu, 11 Feb 2016 23:16:27 +0000 (23:16 +0000)]
Revert "Use SetupWizardPreferenceLayout"

This reverts commit a95e7c3c09d8939c77c50450d8aaf23e9915a793.
This causes a bug where you cannot access fingerprint from settings.

bug:27152471
Change-Id: I4f3078a81b66d44bb6f29ed3afc501e0b56a369e

8 years agoMerge "Use DPM.uninstallPackageWithActiveAdmins()" into nyc-dev
Makoto Onuki [Thu, 11 Feb 2016 19:42:56 +0000 (19:42 +0000)]
Merge "Use DPM.uninstallPackageWithActiveAdmins()" into nyc-dev

8 years agoRemove 'Higher speech rate' button based on the results of the speech
shwetachahar [Mon, 8 Feb 2016 12:00:35 +0000 (12:00 +0000)]
Remove 'Higher speech rate' button based on the results of the speech
rate slider a11y UX study.

Also, group speech rate, sample sentence synthesis and default language
status into a single preference category as they all fall under the
general TTS settings category.

Bug: 24527715
Change-Id: If7253e2e8a468393afcb4c24f5a775cb9af79db9

8 years agoMerge "Disable clear credential option when disallowed by admin." into nyc-dev
Sudheer Shanka [Thu, 11 Feb 2016 14:21:05 +0000 (14:21 +0000)]
Merge "Disable clear credential option when disallowed by admin." into nyc-dev

8 years agoMerge "Use SetupWizardPreferenceLayout" into nyc-dev
Maurice Lam [Thu, 11 Feb 2016 01:07:24 +0000 (01:07 +0000)]
Merge "Use SetupWizardPreferenceLayout" into nyc-dev

8 years agoMerge "Fixes stack overflow on some settings preferences" into nyc-dev
Udam Saini [Thu, 11 Feb 2016 00:36:13 +0000 (00:36 +0000)]
Merge "Fixes stack overflow on some settings preferences" into nyc-dev

8 years agoFixes stack overflow on some settings preferences
Udam Saini [Thu, 11 Feb 2016 00:07:41 +0000 (16:07 -0800)]
Fixes stack overflow on some settings preferences

bug:27130222
Change-Id: If273720591ca9a4d10143b36b63eb839e4fa0a4a

8 years agoUse SetupWizardPreferenceLayout
Maurice Lam [Tue, 9 Feb 2016 05:20:50 +0000 (21:20 -0800)]
Use SetupWizardPreferenceLayout

Update SetupChooseLockGeneric to use SetupWizardPreferenceLayout,
which is a layout designed to be used with Preference v14.

Change-Id: I31f372b5f70382a9f6502c790cb8981277a8d5e1

8 years agoUse DPM.uninstallPackageWithActiveAdmins()
Makoto Onuki [Thu, 11 Feb 2016 00:21:18 +0000 (16:21 -0800)]
Use DPM.uninstallPackageWithActiveAdmins()

... so that uninstall won't fail even if the package has
other active admins.

It's pretty much an edge case, so we don't show the
deactivation confirmation in this case.

Bug 27107878

Change-Id: I7e8b0843ac6e39e3db3bfc643eed6940e8577417

8 years agoDevice Admin activation screen: Show buttons vertically.
Makoto Onuki [Wed, 10 Feb 2016 00:31:00 +0000 (16:31 -0800)]
Device Admin activation screen: Show buttons vertically.

Bug 25392386

Change-Id: Ie7e7ff107af3c307d99818b4c9a5e1b95fa329f2

8 years agoMerge "Adding an easy uninstall for active device admin" into nyc-dev
Suprabh Shukla [Wed, 10 Feb 2016 22:58:29 +0000 (22:58 +0000)]
Merge "Adding an easy uninstall for active device admin" into nyc-dev

8 years agoAdding an easy uninstall for active device admin
Suprabh Shukla [Wed, 27 Jan 2016 21:00:10 +0000 (13:00 -0800)]
Adding an easy uninstall for active device admin

Currently the uninstall button is disabled for a package
with an active device admin. This change enables the button,
which when clicked gives the user an option to deactivate
all the DAs in the package and then uninstall the package.

Bug: b/22359208

cherry pick of I8b955305927751185a4c982dadb5b1b6b07efe5e

Change-Id: Ib2ab0e35b74fc8dba7168174b2bc8fd383fe94fe

8 years agoUX fixes for the language draggable cell
Mihai Nita [Fri, 5 Feb 2016 19:55:45 +0000 (11:55 -0800)]
UX fixes for the language draggable cell

This should bring things closer to the recommended UX guidelines.

It changes the way the checkbox / label play together,
and changes the "localization missing" warning icon to a string.
Also some cleanup of hard-coded styles and sizes.

Bug: 26758865
Bug: 26707846
Change-Id: I07a78a1e4a41122b91e895e363a217d3e9cacd40

8 years agoMerge "Fixes showing learn more screen from fingerprint intro page" into nyc-dev
Udam Saini [Wed, 10 Feb 2016 21:36:55 +0000 (21:36 +0000)]
Merge "Fixes showing learn more screen from fingerprint intro page" into nyc-dev

8 years agoDisable clear credential option when disallowed by admin.
Sudheer Shanka [Wed, 10 Feb 2016 21:35:54 +0000 (21:35 +0000)]
Disable clear credential option when disallowed by admin.

Bug: 27119114
Change-Id: I0f60880b125149cd1a9aa5f4e9a5340f49042367

8 years agoModify emergency info subtitle
mariagpuyol [Wed, 10 Feb 2016 19:11:59 +0000 (11:11 -0800)]
Modify emergency info subtitle

Change-Id: Iaa2ba23a1c0a74552e0f9b71d1e45711126a711c

8 years agoFixes showing learn more screen from fingerprint intro page
Udam Saini [Wed, 10 Feb 2016 19:22:32 +0000 (11:22 -0800)]
Fixes showing learn more screen from fingerprint intro page

bug:27063484
Change-Id: I2413ddff4953dc171aabbb0e9a6beb2f8d04552f

8 years agoMerge "Change style of Preview screens (dark borders with "preview" on the bottom...
Anna Galusza [Wed, 10 Feb 2016 17:59:08 +0000 (17:59 +0000)]
Merge "Change style of Preview screens (dark borders with "preview" on the bottom)." into nyc-dev

8 years agoMerge "Fix activity weirdness by doing the right thing" into nyc-dev
Jason Monk [Wed, 10 Feb 2016 17:57:28 +0000 (17:57 +0000)]
Merge "Fix activity weirdness by doing the right thing" into nyc-dev

8 years agoFix activity weirdness by doing the right thing
Jason Monk [Wed, 10 Feb 2016 17:55:37 +0000 (12:55 -0500)]
Fix activity weirdness by doing the right thing

Bug: 27091837
Change-Id: I983bcae15871b184e670a6baa819263e0ad58973

8 years agoMerge "Reworks lock screen flows." into nyc-dev
Udam Saini [Wed, 10 Feb 2016 17:54:58 +0000 (17:54 +0000)]
Merge "Reworks lock screen flows." into nyc-dev

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-dev
Geoff Mendal [Wed, 10 Feb 2016 16:43:32 +0000 (16:43 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev

8 years agoImport translations. DO NOT MERGE
Geoff Mendal [Wed, 10 Feb 2016 15:48:36 +0000 (07:48 -0800)]
Import translations. DO NOT MERGE

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

8 years agoImport translations. DO NOT MERGE
Geoff Mendal [Wed, 10 Feb 2016 15:43:33 +0000 (15:43 +0000)]
Import translations. DO NOT MERGE
am: a27cd9d033  -s ours

* commit 'a27cd9d033b557d3ff791260eb51f090d8370218':
  Import translations. DO NOT MERGE

8 years agoImport translations. DO NOT MERGE
Geoff Mendal [Wed, 10 Feb 2016 15:23:28 +0000 (07:23 -0800)]
Import translations. DO NOT MERGE

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

8 years agoMerge "Remove PM query for silent provisioning BroadcastReceiver." into nyc-dev
Jeremy Klein [Wed, 10 Feb 2016 02:40:04 +0000 (02:40 +0000)]
Merge "Remove PM query for silent provisioning BroadcastReceiver." into nyc-dev

8 years agoAdd Developer menu entry to disable Bluetooth absolute volume
Andre Eisenbach [Mon, 8 Feb 2016 23:40:23 +0000 (15:40 -0800)]
Add Developer menu entry to disable Bluetooth absolute volume

NOTE: Original CL updated: Developer-related settings in
res/values/strings.xml are now in SettingsLib .

Bug: 27078729
Change-Id: I8a029baeb25b449446ae9bcc8cb220d5ec8e44a9

8 years agoRemove PM query for silent provisioning BroadcastReceiver.
Jeremy Klein [Tue, 9 Feb 2016 21:11:25 +0000 (13:11 -0800)]
Remove PM query for silent provisioning BroadcastReceiver.

This fixes TetherService unit tests.

Change-Id: I404d0e9322d14242997576e30ba75941423b331b
(cherry picked from commit f19aa5574b3ee89e9e7c38c6a2d8a625e3c7811e)

8 years agoFix crash in Settings on devices without fingerprint.
Jim Miller [Tue, 9 Feb 2016 23:15:32 +0000 (15:15 -0800)]
Fix crash in Settings on devices without fingerprint.

Fixes bug 27060816

Change-Id: I3b45d3bfa6e47abb4a43ca95c15fd3614f9478dd

8 years agoReworks lock screen flows.
Udam Saini [Thu, 4 Feb 2016 01:31:11 +0000 (17:31 -0800)]
Reworks lock screen flows.

This also adds frp warning dialogs in case the user skips lock
screen setup initially.

bug:26880444
Change-Id: I732b6a806e139fb6c1c1b334b8d1608c229f217c

8 years agoMerge "Adds the headers for choose lock generic inside onCreate" into nyc-dev
Udam Saini [Tue, 9 Feb 2016 18:47:13 +0000 (18:47 +0000)]
Merge "Adds the headers for choose lock generic inside onCreate" into nyc-dev

8 years agoAdds the headers for choose lock generic inside onCreate
Udam Saini [Tue, 9 Feb 2016 18:32:56 +0000 (10:32 -0800)]
Adds the headers for choose lock generic inside onCreate

This will make sure the headers are set before the underlying
RecyclerView has made its first layout, and prevents an animation
from playing when rotating to landscape.

bug:26990364
Change-Id: I2838a07a145b4d6136e88125ab955006d84d135c

8 years agoAllow trusted system certificates to be used in EAP network configs
Samuel Tan [Tue, 9 Feb 2016 18:24:20 +0000 (18:24 +0000)]
Allow trusted system certificates to be used in EAP network configs
am: 2b16cd3920

* commit '2b16cd3920f95b2cd5c2426d81b5e1584ffc682d':
  Allow trusted system certificates to be used in EAP network configs

8 years agoChange style of Preview screens (dark borders with "preview" on the bottom).
Anna Galusza [Sat, 6 Feb 2016 01:52:49 +0000 (17:52 -0800)]
Change style of Preview screens (dark borders with "preview" on the bottom).

Change-Id: I754a3fd4de47ef74a3a79e410890133de9e0d095
(cherry picked from commit 206a8457102c1a442b95609137998d32cc637974)

8 years agoMerge "Fix security level display" into nyc-dev
Tony Mantler [Mon, 8 Feb 2016 22:05:07 +0000 (22:05 +0000)]
Merge "Fix security level display" into nyc-dev

8 years agoFix security level display
Tony Mantler [Mon, 8 Feb 2016 22:02:05 +0000 (14:02 -0800)]
Fix security level display

b/26979319

Change-Id: I049a7f8f7c7917fdc2739234077247116dd8159d

8 years agoUpdate strings for A11y SUW.
Anna Galusza [Mon, 8 Feb 2016 17:57:24 +0000 (09:57 -0800)]
Update strings for A11y SUW.

Change-Id: I1cd15ca81ffd258edf683d69a50261a403f97d42

8 years agoFix crash in ConfirmCredentials due to missing fp service.
Jim Miller [Mon, 8 Feb 2016 20:29:25 +0000 (12:29 -0800)]
Fix crash in ConfirmCredentials due to missing fp service.

Fixes bug 27060816

Change-Id: I25fa1ffc65247360f58473f5bc1745abbabb1e33
(cherry picked from commit 0918e5d650119aed5221b8ed3ac378f273216b45)

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-dev
Geoff Mendal [Mon, 8 Feb 2016 16:57:24 +0000 (16:57 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev

8 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 8 Feb 2016 16:55:50 +0000 (17:55 +0100)]
Import translations. DO NOT MERGE

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

8 years agoAllow trusted system certificates to be used in EAP network configs
Samuel Tan [Tue, 2 Feb 2016 23:54:37 +0000 (15:54 -0800)]
Allow trusted system certificates to be used in EAP network configs

Add an option to the "CA certificate" field of the EAP network
configuration menu, "Use system certificates". Choosing this option
will cause the trusted, pre-installed, system CA certificates
to be used to validate EAP servers during the authentication process.
This only applies to EAP-TLS, EAP-TTLS, and EAP-PEAP network
configurations, where the CA certificate option is available.

If the user selects "Use system certificates" and leaves the
"Domain" field empty, display a warning and prevent the
EAP network configuration from being saved. Such a configuration
would be insecure--the user should constrain the domain that
the system certificates can be used to validate.

BUG: 26879191
TEST: 1)  Set up AP connected to test RADIUS server.
TEST: 2)  Generate a self-signed cert (Cert 1)
TEST: 3)  Use Cert 1 to sign another cert (Cert 2) with common name
          "sub1.sub2.domain.com"
TEST: 4)  Setup RADIUS server, and configure it to present Cert 2 to EAP peer.
TEST: 5)  Build angler image with Cert 1 installed in
          /system/etc/security/cacerts/
TEST: 6)  Set up an AP connected to the RADIUS server to broadcast
          a WPA-Enterprise network.
TEST: 7)  On Angler, connect to this WPA-Enterprise network with settings:
            Network name: (AP SSID)
            Security: 802.1x EAP
            EAP method: TLS
            CA certificate: Use system certificates
            Domain: domain.com
            User certificate: (test certificate from RADIUS setup)
            Identity: (identity used for RADIUS setup)
TEST: 8)  Verify that we connect successfully to the AP.
TEST: 9)  Verify that connection still succeeds if Domain is set to
          "sub2.domain.com" and "sub1.sub2.domain.com".
TEST: 10) Verify that connection fails if Domain is set to
          "sub0.sub1.domain.com" and "otherdomain.com".
TEST: 11) Verify that network configuration cannot be saved, and an
          warning message "Must specify a domain" is displayed if Domain
          is left blank in the configuration in step 7
TEST: 12) Verify that the "Do not validate" option still appears in the
          CA certificate dropdown menu.

Change-Id: I346d4d301305719033b84ec4599bf3d57d9d4ee5

8 years agoUpdate DND visual interruption choices.
Julia Reynolds [Fri, 5 Feb 2016 20:26:24 +0000 (15:26 -0500)]
Update DND visual interruption choices.

Change-Id: I9313052d60a9fbd88546c1478ac9b830ae6fc40c

8 years agoMake ChooseLockGeneric read the userId extra from the activitie's extras if there...
Clara Bayarri [Fri, 5 Feb 2016 17:37:02 +0000 (17:37 +0000)]
Make ChooseLockGeneric read the userId extra from the activitie's extras if there's no arguments

Some invocations of ChooseLockGeneric are done with arguments, but
when invoking it from FingerprintEnrollIntroduction we add the extra
to the activity intent so we need to support both.

Bug: 26901625
Change-Id: Iaabad18bf17160578f6b6d807dc6acfead1ba419

8 years agoDo not unify locks when Work lock is set to None
Clara Bayarri [Fri, 5 Feb 2016 17:17:19 +0000 (17:17 +0000)]
Do not unify locks when Work lock is set to None

Bug: 2684580526892601
Change-Id: Ie78ef417a59b29246d4d3dde5dfe434ad49b195c

8 years agoMerge "Update FakeUid interface to match BatteryStats.Uid"
Adam Lesinski [Sat, 6 Feb 2016 00:52:39 +0000 (00:52 +0000)]
Merge "Update FakeUid interface to match BatteryStats.Uid"

8 years agoMerge "Reject all touch events in TouchBlockingFrameLayout"
Alan Viverette [Fri, 5 Feb 2016 21:28:58 +0000 (21:28 +0000)]
Merge "Reject all touch events in TouchBlockingFrameLayout"

8 years agoReject all touch events in TouchBlockingFrameLayout
Alan Viverette [Fri, 5 Feb 2016 21:13:27 +0000 (16:13 -0500)]
Reject all touch events in TouchBlockingFrameLayout

Bug: 27042494
Change-Id: Ie1400f4c47d812b1f664abc955ee3dfdd03fa4a5

8 years agoCorrectly load saved EAP CA cert and user cert options
Samuel Tan [Fri, 5 Feb 2016 20:58:15 +0000 (20:58 +0000)]
Correctly load saved EAP CA cert and user cert options
am: 3d8cdb10f6

* commit '3d8cdb10f6103a794e4cb68adb5de03a325d1c8f':
  Correctly load saved EAP CA cert and user cert options

8 years agoMerge "Remove TetherUtil functions which are no longer needed."
Jeremy Klein [Fri, 5 Feb 2016 18:15:29 +0000 (18:15 +0000)]
Merge "Remove TetherUtil functions which are no longer needed."

8 years agoMerge "Make TetherSettings use the new tether api."
Jeremy Klein [Fri, 5 Feb 2016 18:14:50 +0000 (18:14 +0000)]
Merge "Make TetherSettings use the new tether api."

8 years agoMerge "Remove bad activity filter."
Julia Reynolds [Fri, 5 Feb 2016 16:11:56 +0000 (16:11 +0000)]
Merge "Remove bad activity filter."

8 years agoRestrict notification preferences for suspended apps
Andrei Stingaceanu [Mon, 1 Feb 2016 15:40:53 +0000 (15:40 +0000)]
Restrict notification preferences for suspended apps

Bug: 26856390
Bug: 22776761
Change-Id: I7f03b8b95af93db66f12c5ac1cbf490b4ae0e73c

8 years agoRemove bad activity filter.
Julia Reynolds [Fri, 5 Feb 2016 14:37:52 +0000 (09:37 -0500)]
Remove bad activity filter.

Bug: 26982026
Change-Id: I662af8db38f4ac624ba4bd1128e7b3a1123d9f8b

8 years agoRemove TetherUtil functions which are no longer needed.
Jeremy Klein [Fri, 29 Jan 2016 20:46:42 +0000 (12:46 -0800)]
Remove TetherUtil functions which are no longer needed.

Change-Id: I8559a2aaffa44e165d4e5e9070a85f23ed02b58b

8 years agoMake TetherSettings use the new tether api.
Jeremy Klein [Mon, 25 Jan 2016 22:43:49 +0000 (14:43 -0800)]
Make TetherSettings use the new tether api.

The new API handles all the provisioning logic so this area can
get significant code cleanup.

Change-Id: I4bcffb14b3ce26a01d17ec149599d63b0b4392f1

8 years agoMerge "Fix crash on devices without fingerprint feature."
Jim Miller [Fri, 5 Feb 2016 01:41:00 +0000 (01:41 +0000)]
Merge "Fix crash on devices without fingerprint feature."

8 years agoMerge "Replace LocaleList#getPrimary() with get(0)"
Roozbeh Pournader [Fri, 5 Feb 2016 01:39:00 +0000 (01:39 +0000)]
Merge "Replace LocaleList#getPrimary() with get(0)"