Jason Monk
41f69453a5
Merge "Fix date and time and apn editing" into nyc-dev
...
am: 91c2c96978
2016-02-18 21:04:17 +00:00
Maria Garcia Puyol
adcec744b2
Merge "Show emergency info preference for all users" into nyc-dev
2016-02-18 19:19:04 +00:00
Jason Monk
fd267eb2ed
Merge "Make battery settings use new battery graph." into nyc-dev
2016-02-18 19:14:14 +00:00
Jason Monk
9cc88e5e5e
Make battery settings use new battery graph.
...
Change-Id: I633a8750f9668c6315cd42866297ac3460375c22
2016-02-18 14:12:32 -05:00
Jason Monk
91c2c96978
Merge "Fix date and time and apn editing" into nyc-dev
2016-02-18 19:11:44 +00:00
Anna Galusza
0fa9b2dcf1
Merge "Add Screen Zoom preview screen with settings page, launch Talkback tutorial whenever the Talkback setting in SUW is pressed, and remove check for parent Activity from SettingsPreferenceFragment. Bug: 26734639" into nyc-dev am: 4b67c1a8be
...
am: c26916458d
2016-02-18 18:34:20 +00:00
Clara Bayarri
ebdf9af1dd
Merge "Call reportFailedPasswordAttempt from Work Challenge" into nyc-dev am: 42ed344f4b
...
am: d9f2c849df
2016-02-18 18:34:08 +00:00
mariagpuyol
fe19bc3d4b
Show emergency info preference for all users
...
Change-Id: I8bfcedb8a15c9ca0194f5f526dd288857c19a1de
2016-02-18 10:27:41 -08:00
Anna Galusza
c26916458d
Merge "Add Screen Zoom preview screen with settings page, launch Talkback tutorial whenever the Talkback setting in SUW is pressed, and remove check for parent Activity from SettingsPreferenceFragment. Bug: 26734639" into nyc-dev
...
am: 4b67c1a8be
2016-02-18 18:25:11 +00:00
Clara Bayarri
d9f2c849df
Merge "Call reportFailedPasswordAttempt from Work Challenge" into nyc-dev
...
am: 42ed344f4b
2016-02-18 18:24:59 +00:00
Anna Galusza
4b67c1a8be
Merge "Add Screen Zoom preview screen with settings page, launch Talkback tutorial whenever the Talkback setting in SUW is pressed, and remove check for parent Activity from SettingsPreferenceFragment. Bug: 26734639" into nyc-dev
2016-02-18 17:53:34 +00:00
Clara Bayarri
42ed344f4b
Merge "Call reportFailedPasswordAttempt from Work Challenge" into nyc-dev
2016-02-18 11:16:27 +00:00
Anna Galusza
384fa2e342
Add Screen Zoom preview screen with settings page, launch Talkback tutorial
...
whenever the Talkback setting in SUW is pressed, and remove check for parent
Activity from SettingsPreferenceFragment.
Bug: 26734639
Change-Id: I5671735437844ac54ea68322838d9b6b5c81957f
2016-02-18 01:36:34 +00:00
Shweta Chahar
42b512f389
Merge "Add a reset speech rate button to Text-to-Speech settings UI which resets the speech rate to 1x. Bug Id: 27166001" into nyc-dev am: f040f80a77
...
am: f7958ecfed
2016-02-18 00:35:17 +00:00
Shweta Chahar
f7958ecfed
Merge "Add a reset speech rate button to Text-to-Speech settings UI which resets the speech rate to 1x. Bug Id: 27166001" into nyc-dev
...
am: f040f80a77
2016-02-18 00:30:32 +00:00
Shweta Chahar
f040f80a77
Merge "Add a reset speech rate button to Text-to-Speech settings UI which resets the speech rate to 1x. Bug Id: 27166001" into nyc-dev
2016-02-18 00:15:50 +00:00
Makoto Onuki
f03dbe4c3f
Merge "[Settings] Don\'t allow apps on external storage to be active admin" into nyc-dev am: 4bd2152cbc
...
am: b018eedae6
2016-02-17 23:49:32 +00:00
Makoto Onuki
b018eedae6
Merge "[Settings] Don\'t allow apps on external storage to be active admin" into nyc-dev
...
am: 4bd2152cbc
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
Kenny Guy
fb75c2219e
Merge "Fix inconsistent use of screenlock" into nyc-dev am: 451ff8e916
...
am: be893c7f48
2016-02-17 22:19:48 +00: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
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
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
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
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
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
