Commit Graph

9113 Commits

Author SHA1 Message Date
Julia Reynolds
810011d251 Merge "Alarm can end time-based rule." into nyc-dev 2016-02-17 15:34:48 +00:00
Geoff Mendal
31149fb65c Import translations. DO NOT MERGE
Change-Id: I82c0f874cb02c345985bab538378d34a0a6b781c
Auto-generated-cl: translation import
2016-02-17 07:33:57 -08:00
Geoff Mendal
a63f1b865a Merge "Import translations. DO NOT MERGE" 2016-02-17 14:37:35 +00:00
Geoff Mendal
79733c28ce Import translations. DO NOT MERGE
Change-Id: I109d787b1b3238a0e3b46920e84c193abf983def
Auto-generated-cl: translation import
2016-02-17 06:27:36 -08:00
Lorenzo Colitti
25086efe33 resolve merge conflicts of c408ab3de6 to nyc-dev am: 6ef09978ad
am: 060fc11562

* commit '060fc11562c81056d921148e358ea27e89dae8cd':
  Hide the legacy DHCP client option, since it no longer works.
2016-02-17 14:06:14 +00:00
Lorenzo Colitti
060fc11562 resolve merge conflicts of c408ab3de6 to nyc-dev
am: 6ef09978ad

* commit '6ef09978adb4c660001ca9cabd6e8b9653d87c18':
  Hide the legacy DHCP client option, since it no longer works.
2016-02-17 14:02:42 +00:00
Julia Reynolds
97d9100fde Alarm can end time-based rule.
Bug: 21069008
Change-Id: I83527f787b7daaf936029674202a27900550b652
2016-02-17 08:43:31 -05:00
Lorenzo Colitti
6ef09978ad resolve merge conflicts of c408ab3de6 to nyc-dev
Change-Id: I647195694e4c2c8dd886246143ef9f9ac7a79a62
2016-02-17 22:32:33 +09:00
Lorenzo Colitti
c408ab3de6 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
2016-02-17 22:10:21 +09:00
Clara Bayarri
9d357ea072 Call reportFailedPasswordAttempt from Work Challenge
Entering the wrong credential in ConfirmDeviceCredentials should
also count as failed attempts for the password, after which the
DPC have set a restriction to wipe the work profile.

Fixed related issues, such as the CredentialChecker re-sending
the result after onResume causing additional attempts to be counted.

The new error message String is also displayed initially when there
are pending attempts to inform the user that they are not starting
from fresh.

Bug: 26677759
Change-Id: I70cfae4c05e705ad7fe93bc071426459b79e7d0c
2016-02-17 12:22:16 +00:00
Mahaver Chopra
39527ba7fe Merge "Fixes for fingerprint profile challenge" into nyc-dev am: 4d2186a9b3
am: 8b666fb9b8

* commit '8b666fb9b8001b8970116ae1718cd94238ed44e4':
  Fixes for fingerprint profile challenge
2016-02-17 10:39:22 +00:00
Mahaver Chopra
8b666fb9b8 Merge "Fixes for fingerprint profile challenge" into nyc-dev
am: 4d2186a9b3

* commit '4d2186a9b3e114a19c3931ef192051e734acfef6':
  Fixes for fingerprint profile challenge
2016-02-17 10:35:28 +00:00
Mahaver Chopra
4d2186a9b3 Merge "Fixes for fingerprint profile challenge" into nyc-dev 2016-02-17 10:29:45 +00:00
Maurice Lam
3806f977e6 Revert "Revert "Use SetupWizardPreferenceLayout""
This reverts commit 73512ee684.

With ag/866290, this change can be applied again.

Bug: 27152471
Change-Id: I0fd78218b989e99873765f7678f0113fb2c08f16
2016-02-16 17:22:08 -08:00
Udam Saini
39bff27817 Merge "Removes tap continue when done text" into nyc-dev am: 95d7c970dc
am: 4284c830ea

* commit '4284c830eab64a5734c55b7481e5b62d6ecd6b59':
  Removes tap continue when done text
2016-02-16 21:13:54 +00:00
Udam Saini
4284c830ea Merge "Removes tap continue when done text" into nyc-dev
am: 95d7c970dc

* commit '95d7c970dc80304f84545ba4614d75b8e64c7744':
  Removes tap continue when done text
2016-02-16 21:06:22 +00:00
Udam Saini
9757152d16 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
2016-02-16 19:42:48 +00:00
Mahaver Chopra
a186c8d801 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
2016-02-16 17:27:30 +00:00
Sudheer Shanka
9e9e63b7b3 Part3 - Don't add padlock if the restriction is not set by admin.
Bug: 26687435
Change-Id: Ibfea6d7d5bd32e7a05dcc2cc32b121c9e50b6a34
2016-02-16 11:04:11 +00:00
Alan Viverette
a12d4791e1 Merge "Make the screen zoom preview app icon bigger to match Launcher" into nyc-dev am: 98f5b2ab66
am: c64d333316

* commit 'c64d333316f676744bb0338af033fc9430b7fb8a':
  Make the screen zoom preview app icon bigger to match Launcher
2016-02-15 20:14:16 +00:00
Alan Viverette
c64d333316 Merge "Make the screen zoom preview app icon bigger to match Launcher" into nyc-dev
am: 98f5b2ab66

* commit '98f5b2ab66313f82dde2a6eebb2bee2c5b8c5134':
  Make the screen zoom preview app icon bigger to match Launcher
2016-02-15 20:07:19 +00:00
Alan Viverette
98f5b2ab66 Merge "Make the screen zoom preview app icon bigger to match Launcher" into nyc-dev 2016-02-15 20:02:00 +00:00
Geoff Mendal
d6da1965a0 Import translations. DO NOT MERGE
Change-Id: I04e3ee5ea3c7c89b94a24ea047077928cc9accb0
Auto-generated-cl: translation import
2016-02-15 07:33:11 -08:00
Geoff Mendal
405e9dc96b Import translations. DO NOT MERGE
Change-Id: If4c33b7479cfbfac9df168c257a145081274ed1d
Auto-generated-cl: translation import
2016-02-15 06:27:25 -08:00
shwetachahar
bc170fd680 Add a reset speech rate button to Text-to-Speech settings UI
which resets the speech rate to 1x.
Bug Id: 27166001

Change-Id: Ie5b923e51de645e23ef0ba5d756c271070f11984
2016-02-12 22:44:52 +00:00
Jason Monk
042b5b43df Fix incorrectly sized app prefs am: 08331aca4e
am: 48ee5e20c5

* commit '48ee5e20c535dad57c89ddf18013350c6cdbd2bc':
  Fix incorrectly sized app prefs
2016-02-12 21:52:25 +00:00
Jason Monk
48ee5e20c5 Fix incorrectly sized app prefs
am: 08331aca4e

* commit '08331aca4e5b994ed26ca12bfceaa1282551359c':
  Fix incorrectly sized app prefs
2016-02-12 21:46:15 +00:00
Jason Monk
08331aca4e Fix incorrectly sized app prefs
Bug: 27066871
Change-Id: I0a1a4847532243c27ec5f9d96d8079c417bae91e
2016-02-12 16:31:43 -05:00
Udam Saini
bcb125f828 Merge "Revert "Use SetupWizardPreferenceLayout"" into nyc-dev am: 6b00d3fe40
am: 33a593f325

* commit '33a593f325d034323ab68f63712e8048cd2ae1fd':
  Revert "Use SetupWizardPreferenceLayout"
2016-02-12 01:19:49 +00:00
Alan Viverette
557ce43a37 Make the screen zoom preview app icon bigger to match Launcher
Bug: 27060024
Change-Id: I0eb58facefa8618331b5109f034d6e0134ad32d8
2016-02-11 15:56:53 -08:00
Udam Saini
33a593f325 Merge "Revert "Use SetupWizardPreferenceLayout"" into nyc-dev
am: 6b00d3fe40

* commit '6b00d3fe40b250956724c49302cf2dba4ef4ad05':
  Revert "Use SetupWizardPreferenceLayout"
2016-02-11 23:35:43 +00:00
Udam Saini
6b00d3fe40 Merge "Revert "Use SetupWizardPreferenceLayout"" into nyc-dev 2016-02-11 23:32:16 +00:00
Udam Saini
73512ee684 Revert "Use SetupWizardPreferenceLayout"
This reverts commit a95e7c3c09.
This causes a bug where you cannot access fingerprint from settings.

bug:27152471
Change-Id: I4f3078a81b66d44bb6f29ed3afc501e0b56a369e
2016-02-11 23:17:48 +00:00
shwetachahar
c229fa6897 Remove \'Higher speech rate\' button based on the results of the speech rate slider a11y UX study. am: 5433496186
am: 20975797b7

* commit '20975797b7a0262b9fa65a32766dfdfba93afdb0':
  Remove 'Higher speech rate' button based on the results of the speech rate slider a11y UX study.
2016-02-11 17:33:08 +00:00
shwetachahar
20975797b7 Remove \'Higher speech rate\' button based on the results of the speech rate slider a11y UX study.
am: 5433496186

* commit '5433496186856aa16a8092801a073e4971a97536':
  Remove 'Higher speech rate' button based on the results of the speech rate slider a11y UX study.
2016-02-11 17:21:30 +00:00
shwetachahar
5433496186 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
2016-02-11 14:58:09 +00:00
Maurice Lam
be252bc9b5 Merge "Use SetupWizardPreferenceLayout" into nyc-dev am: 0cfda1ad91
am: e56db2bc76

* commit 'e56db2bc7667ebefdb671c532a876d627e7f750f':
  Use SetupWizardPreferenceLayout
2016-02-11 01:32:13 +00:00
Maurice Lam
e56db2bc76 Merge "Use SetupWizardPreferenceLayout" into nyc-dev
am: 0cfda1ad91

* commit '0cfda1ad9187df570d1cae843fb0c7a49bfdef69':
  Use SetupWizardPreferenceLayout
2016-02-11 01:28:16 +00:00
Makoto Onuki
900bc4b549 Device Admin activation screen: Show buttons vertically. am: dd3e761aa1
am: 13db86430b

* commit '13db86430b923024e62aa63d67da4ba48ebc67c0':
  Device Admin activation screen: Show buttons vertically.
2016-02-11 01:13:55 +00:00
Maurice Lam
a95e7c3c09 Use SetupWizardPreferenceLayout
Update SetupChooseLockGeneric to use SetupWizardPreferenceLayout,
which is a layout designed to be used with Preference v14.

Change-Id: I31f372b5f70382a9f6502c790cb8981277a8d5e1
2016-02-11 00:25:07 +00:00
Makoto Onuki
13db86430b Device Admin activation screen: Show buttons vertically.
am: dd3e761aa1

* commit 'dd3e761aa1b6cdf992d7ac9127cdfc2b89fd7814':
  Device Admin activation screen: Show buttons vertically.
2016-02-11 00:14:03 +00:00
Makoto Onuki
dd3e761aa1 Device Admin activation screen: Show buttons vertically.
Bug 25392386

Change-Id: Ie7e7ff107af3c307d99818b4c9a5e1b95fa329f2
2016-02-10 16:09:16 -08:00
Suprabh Shukla
8388a272a6 Merge "Adding an easy uninstall for active device admin" into nyc-dev
am: eee6c2c8b7

* commit 'eee6c2c8b7a709a0ba6e221c7b52661e539e4afa':
  Adding an easy uninstall for active device admin
2016-02-10 23:14:10 +00:00
Suprabh Shukla
eee6c2c8b7 Merge "Adding an easy uninstall for active device admin" into nyc-dev 2016-02-10 22:58:30 +00:00
Suprabh Shukla
02a06eff42 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
2016-02-10 14:32:13 -08:00
Mihai Nita
7b1ce1e7e0 UX fixes for the language draggable cell am: 7f78a4b723
am: dc7d254f76

* commit 'dc7d254f766bd65bac540961063978ac8acf3697':
  UX fixes for the language draggable cell
2016-02-10 21:54:23 +00:00
Mihai Nita
dc7d254f76 UX fixes for the language draggable cell
am: 7f78a4b723

* commit '7f78a4b7230a17cbf356899f3a31fdbac360bc96':
  UX fixes for the language draggable cell
2016-02-10 21:50:50 +00:00
Udam Saini
b6efc89a02 Merge "Fixes showing learn more screen from fingerprint intro page" into nyc-dev am: 4b796fa7d8
am: 3e64c83eef

* commit '3e64c83eef2fbcf0e0edd51edea2e3447bdec7f5':
  Fixes showing learn more screen from fingerprint intro page
2016-02-10 21:47:08 +00:00
mariagpuyol
10fa9e15c0 Modify emergency info subtitle am: 1c9b3d5b5f
am: 262e6f8519

* commit '262e6f851993c2448f2cbbdf31cf01c525d7f26d':
  Modify emergency info subtitle
2016-02-10 21:46:59 +00:00
Mihai Nita
7f78a4b723 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
2016-02-10 21:46:13 +00:00