Commit Graph

8351 Commits

Author SHA1 Message Date
Makoto Onuki
b018eedae6 Merge "[Settings] Don\'t allow apps on external storage to be active admin" into nyc-dev
am: 4bd2152cbc

* commit '4bd2152cbcef0a73389a89d0d74643e044759087':
  [Settings] Don't allow apps on external storage to be active admin
2016-02-17 23:41:35 +00:00
Makoto Onuki
4bd2152cbc Merge "[Settings] Don't allow apps on external storage to be active admin" into nyc-dev 2016-02-17 22:48:43 +00:00
Jason Monk
d2e75e0528 Fix date and time and apn editing
Bug: 27219773
Bug: 25822074
Change-Id: Iec5d56846bf5d3a875180e8907529518949a0d7e
2016-02-17 17:28:46 -05:00
Makoto Onuki
9dbad57a84 [Settings] Don't allow apps on external storage to be active admin
Bug 27149287

Change-Id: I7e0905228812fbc326cf4ac4984e7f59003996a8
2016-02-17 14:18:02 -08:00
Kenny Guy
be893c7f48 Merge "Fix inconsistent use of screenlock" into nyc-dev
am: 451ff8e916

* commit '451ff8e916b7a1ff9208bbf7f9330b9db633eac5':
  Fix inconsistent use of screenlock
2016-02-17 22:05:04 +00:00
Kenny Guy
451ff8e916 Merge "Fix inconsistent use of screenlock" into nyc-dev 2016-02-17 21:51:53 +00:00
Tobias Sargeant
f8364f597b add developer setting for multiprocess webview
Change-Id: I9cd547ad4168b56b8b5c9eab9e2407daea74a30e
2016-02-17 21:07:54 +00:00
Kenny Guy
9de8c4625a Fix inconsistent use of screenlock
Change screenlock to screen lock
to be consistent.

Bug: 26635057
Change-Id: I4cb06cd2dcea0499a232ed3f28a7dbbf3598c9e9
2016-02-17 20:49:45 +00:00
Noah Wang
aebb3338ea Merge "Create messenger preview screen for magnification gesture settings screen" into nyc-dev
am: 2bf0f59048

* commit '2bf0f59048c82f99bfaafcfb0ff0f9a5ff0cd0e8':
  Create messenger preview screen for magnification gesture settings screen
2016-02-17 20:36:47 +00:00
Noah Wang
2bf0f59048 Merge "Create messenger preview screen for magnification gesture settings screen" into nyc-dev 2016-02-17 20:20:01 +00:00
Tao Bao
bc89cb0ac2 Merge "Add a Developer option of "Disable automatic update"." into nyc-dev
am: 28dfd93b14

* commit '28dfd93b1473dcc47189d1cbcda3cf6e94e6c49d':
  Add a Developer option of "Disable automatic update".
2016-02-17 20:15:26 +00:00
Julia Reynolds
ed5c50a9cb Delete Notification Topics.
Bug: 23220370
Change-Id: I072b68650af35ae3d5c5ccf6222dc31f5f36f9bb
2016-02-17 15:13:44 -05:00
Sudheer Shanka
bb7ba52837 Update strings related to policy transparency.
Bug: 25603665
Change-Id: I1eb46979fbb1e1562a165a9879ac0106ff689bd3
2016-02-17 20:10:01 +00:00
Tao Bao
28dfd93b14 Merge "Add a Developer option of "Disable automatic update"." into nyc-dev 2016-02-17 20:06:52 +00:00
Noah Wang
d51affa86a Create messenger preview screen for magnification gesture
settings screen

Change-Id: I4824c370388c4996e233c87005879d4818cfd59e
2016-02-17 12:02:04 -08:00
Tao Bao
45a2c163c3 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
2016-02-17 10:41:24 -08:00
Julia Reynolds
6877dbd0b8 Merge "Alarm can end time-based rule." into nyc-dev
am: 810011d251

* commit '810011d25145e043f52cbb8de4f036fa02cf0312':
  Alarm can end time-based rule.
2016-02-17 15:44:35 +00:00
Geoff Mendal
a563c75537 Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-02-17 15:39:28 +00:00
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
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
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
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
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
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
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
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
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
e56db2bc76 Merge "Use SetupWizardPreferenceLayout" into nyc-dev
am: 0cfda1ad91

* commit '0cfda1ad9187df570d1cae843fb0c7a49bfdef69':
  Use SetupWizardPreferenceLayout
2016-02-11 01:28:16 +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