Noah Wang
1cb028bc65
Merge "Create messenger preview screen for magnification gesture settings screen" into nyc-dev am: 2bf0f59048
...
am: aebb3338ea
2016-02-17 20:52:19 +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
2016-02-17 20:36:47 +00:00
Tao Bao
208ac00d29
Merge "Add a Developer option of "Disable automatic update"." into nyc-dev am: 28dfd93b14
...
am: bc89cb0ac2
2016-02-17 20:24:05 +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
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
Bill Yi
c9652c1d66
Merge commit '6a19c5cabf1615ffce654a1203554bbaa1d1f72e' into HEAD
...
Change-Id: Ic7cd65ff8d2fd397a77f635b21bd06bfc17a38dc
2016-02-17 11:13:33 -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
Geoff Mendal
b2caf5ac08
Import translations. DO NOT MERGE am: 7efa356849 -s ours am: 7b54a8154e -s ours
...
am: a49c9cd869
2016-02-17 17:48:26 +00:00
Geoff Mendal
a49c9cd869
Import translations. DO NOT MERGE am: 7efa356849 -s ours
...
am: 7b54a8154e
2016-02-17 17:41:31 +00:00
Geoff Mendal
7b54a8154e
Import translations. DO NOT MERGE
...
am: 7efa356849
2016-02-17 17:35:03 +00:00
Tony Mak
0e19d2420b
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
2016-02-17 17:08:02 +00:00
Geoff Mendal
bc583e1f6d
Merge "Import translations. DO NOT MERGE" into nyc-dev am: a563c75537 -s ours
...
am: 91b7774efd
2016-02-17 15:53:02 +00:00
Julia Reynolds
8b240da029
Merge "Alarm can end time-based rule." into nyc-dev am: 810011d251
...
am: 6877dbd0b8
2016-02-17 15:52:52 +00:00
Geoff Mendal
91b7774efd
Merge "Import translations. DO NOT MERGE" into nyc-dev
...
am: a563c75537
2016-02-17 15:46:55 +00:00
Julia Reynolds
6877dbd0b8
Merge "Alarm can end time-based rule." into nyc-dev
...
am: 810011d251
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
Geoff Mendal
7efa356849
Import translations. DO NOT MERGE
...
Change-Id: I8c51d320dee803b9c72bb5e0737ca44beb40819e
Auto-generated-cl: translation import
2016-02-17 07:15:28 -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
2016-02-17 14:06:14 +00:00
Lorenzo Colitti
060fc11562
resolve merge conflicts of c408ab3de6 to nyc-dev
...
am: 6ef09978ad
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
2016-02-17 10:39:22 +00:00
Mahaver Chopra
8b666fb9b8
Merge "Fixes for fingerprint profile challenge" into nyc-dev
...
am: 4d2186a9b3
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
Udam Saini
129e7e812b
Merge "Fixes autoadvance on find sensor page for fingerprint." into nyc-dev am: efc87af3f8
...
am: 7e7672184a
2016-02-17 02:04:11 +00:00
Nathan Harold
233fc6071a
Update BandMode Names to support full list, fix off-by-one UI error. am: 575fe1af95 am: 6b9bea9ef4
...
am: 7c8c873b07
2016-02-17 01:42:33 +00:00
Fyodor Kupolov
1c34e8b5d0
Merge "Remove switching from Users menu" into nyc-dev am: 9317dcac2d
...
am: fa6eef0623
2016-02-17 01:42:23 +00:00
Udam Saini
7e7672184a
Merge "Fixes autoadvance on find sensor page for fingerprint." into nyc-dev
...
am: efc87af3f8
2016-02-17 01:33:50 +00:00
Nathan Harold
7c8c873b07
Update BandMode Names to support full list, fix off-by-one UI error. am: 575fe1af95
...
am: 6b9bea9ef4
2016-02-17 01:27:57 +00:00
Fyodor Kupolov
fa6eef0623
Merge "Remove switching from Users menu" into nyc-dev
...
am: 9317dcac2d
2016-02-17 01:27:48 +00:00
Maurice Lam
3806f977e6
Revert "Revert "Use SetupWizardPreferenceLayout""
...
This reverts commit 73512ee684
2016-02-16 17:22:08 -08:00
Udam Saini
efc87af3f8
Merge "Fixes autoadvance on find sensor page for fingerprint." into nyc-dev
2016-02-17 01:15:02 +00:00
Nathan Harold
6b9bea9ef4
Update BandMode Names to support full list, fix off-by-one UI error.
...
am: 575fe1af95
2016-02-17 00:51:20 +00:00
Fyodor Kupolov
9317dcac2d
Merge "Remove switching from Users menu" into nyc-dev
2016-02-17 00:29:00 +00:00
Nathan Harold
575fe1af95
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
2016-02-16 15:25:38 -08:00
Fyodor Kupolov
889bc3de82
Remove switching from Users menu
...
Bug: 26562786
Change-Id: Id0f26621b8356c3161dee861b0215b01d48007c9
2016-02-16 13:38:34 -08:00
Udam Saini
39bff27817
Merge "Removes tap continue when done text" into nyc-dev am: 95d7c970dc
...
am: 4284c830ea
2016-02-16 21:13:54 +00:00
Udam Saini
4284c830ea
Merge "Removes tap continue when done text" into nyc-dev
...
am: 95d7c970dc
2016-02-16 21:06:22 +00:00
Udam Saini
95d7c970dc
Merge "Removes tap continue when done text" into nyc-dev
2016-02-16 21:00:06 +00:00
