Commit Graph

25855 Commits

Author SHA1 Message Date
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

* commit 'c26916458d965c3caac849026c1ba358c015c2e6':
  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
2016-02-18 18:34:20 +00:00
Clara Bayarri
ebdf9af1dd Merge "Call reportFailedPasswordAttempt from Work Challenge" into nyc-dev am: 42ed344f4b
am: d9f2c849df

* commit 'd9f2c849df066b067069cbb2e2cb13ea2764ac8e':
  Call reportFailedPasswordAttempt from Work Challenge
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

* commit '4b67c1a8be16f7a95759735ed4b714c72b308cac':
  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
2016-02-18 18:25:11 +00:00
Clara Bayarri
d9f2c849df Merge "Call reportFailedPasswordAttempt from Work Challenge" into nyc-dev
am: 42ed344f4b

* commit '42ed344f4bc4c1a39b08eb60b47ecffe38402860':
  Call reportFailedPasswordAttempt from Work Challenge
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

* commit 'f7958ecfeda14a5d698ef17c838b56b900ba49c1':
  Add a reset speech rate button to Text-to-Speech settings UI which resets the speech rate to 1x. Bug Id: 27166001
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

* commit 'f040f80a7740798a25c6570b4446af8292f14226':
  Add a reset speech rate button to Text-to-Speech settings UI which resets the speech rate to 1x. Bug Id: 27166001
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

* commit 'b018eedae699a4581632b20b2656ccb5cde23491':
  [Settings] Don't allow apps on external storage to be active admin
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

* 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
Kenny Guy
fb75c2219e Merge "Fix inconsistent use of screenlock" into nyc-dev am: 451ff8e916
am: be893c7f48

* commit 'be893c7f483b66475c1a7915b66cca6e92436e77':
  Fix inconsistent use of screenlock
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
Tony Mak
6d49d698b1 Merge "Home default setting should not shown in managed profile settings" into nyc-dev am: 6e7cfdda79
am: f891ba72c1

* commit 'f891ba72c164f7439664f5e9f8820c684a7f5414':
  Home default setting should not shown in managed profile settings
2016-02-17 22:09:54 +00: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
Tony Mak
f891ba72c1 Merge "Home default setting should not shown in managed profile settings" into nyc-dev
am: 6e7cfdda79

* commit '6e7cfdda7975a737268f8a7281da5186d3ad2201':
  Home default setting should not shown in managed profile settings
2016-02-17 21:56:32 +00:00
Kenny Guy
451ff8e916 Merge "Fix inconsistent use of screenlock" into nyc-dev 2016-02-17 21:51:53 +00:00
Tony Mak
6e7cfdda79 Merge "Home default setting should not shown in managed profile settings" into nyc-dev 2016-02-17 21:43:02 +00:00
Bill Yi
b39a652348 Merge commit \'6a19c5cabf1615ffce654a1203554bbaa1d1f72e\' into HEAD am: c9652c1d66 -s ours
am: f55a8ddb4b

* commit 'f55a8ddb4b303de80498c5b2e2b7b88e9d121a31':
2016-02-17 21:15:37 +00:00
Tobias Sargeant
f8364f597b add developer setting for multiprocess webview
Change-Id: I9cd547ad4168b56b8b5c9eab9e2407daea74a30e
2016-02-17 21:07:54 +00:00
Bill Yi
f55a8ddb4b Merge commit \'6a19c5cabf1615ffce654a1203554bbaa1d1f72e\' into HEAD
am: c9652c1d66  -s ours

* commit 'c9652c1d662b733519c8734bc51ee3a814081598':
2016-02-17 21:06:50 +00:00
Noah Wang
1cb028bc65 Merge "Create messenger preview screen for magnification gesture settings screen" into nyc-dev am: 2bf0f59048
am: aebb3338ea

* commit 'aebb3338ead9bde99b55665446540bce2f945b5a':
  Create messenger preview screen for magnification gesture settings screen
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

* commit '2bf0f59048c82f99bfaafcfb0ff0f9a5ff0cd0e8':
  Create messenger preview screen for magnification gesture settings screen
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

* commit 'bc89cb0ac2d890bfcd1415f5ca8b158e312f3af6':
  Add a Developer option of "Disable automatic update".
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

* 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
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  -s ours

* commit 'a49c9cd8695f8056ed6cf65b28a3b6bab187fb75':
  Import translations. DO NOT MERGE
2016-02-17 17:48:26 +00:00
Geoff Mendal
a49c9cd869 Import translations. DO NOT MERGE am: 7efa356849 -s ours
am: 7b54a8154e  -s ours

* commit '7b54a8154e4b1926f07f7ac37cf9997efc4134ca':
  Import translations. DO NOT MERGE
2016-02-17 17:41:31 +00:00
Geoff Mendal
7b54a8154e Import translations. DO NOT MERGE
am: 7efa356849  -s ours

* commit '7efa356849411f4c4562c9c84b4e9f5c68fa9e13':
  Import translations. DO NOT MERGE
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  -s ours

* commit '91b7774efd1d88e2953868fcfa323a05234c3591':
  Import translations. DO NOT MERGE
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

* commit '6877dbd0b891af7cc6ba43dc5a678a98d55fa37a':
  Alarm can end time-based rule.
2016-02-17 15:52:52 +00:00
Geoff Mendal
91b7774efd Merge "Import translations. DO NOT MERGE" into nyc-dev
am: a563c75537  -s ours

* commit 'a563c755371809116a5bea3a5f1fd4548befd65c':
  Import translations. DO NOT MERGE
2016-02-17 15:46:55 +00: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
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