Commit Graph

11147 Commits

Author SHA1 Message Date
Bill Yi
47ff6882fb Import translations. DO NOT MERGE
Change-Id: I4f03344d3ce65076256892ae63803239c5c47718
Auto-generated-cl: translation import
2016-09-26 09:44:05 -07:00
Bill Yi
0d07d0c79c Import translations. DO NOT MERGE
Change-Id: I69f2d26ec0a8a06fc611a68740ea9ce5184c124e
Auto-generated-cl: translation import
2016-09-26 09:35:48 -07:00
Robin Lee
660a944128 Merge "Enable the switch in TrustedCredentialsSettings" 2016-09-26 15:54:48 +00:00
Doris Ling
430025c4d6 Split Ambient Display settings. am: 1ad58d0abf am: f89766dbab
am: 0dfe46fe58

Change-Id: I33ffaa71c09cff7a4df496c42371519367e1772c
2016-09-24 00:35:24 +00:00
Doris Ling
0dfe46fe58 Split Ambient Display settings. am: 1ad58d0abf
am: f89766dbab

Change-Id: If17ab5951a9b8a2a5b68a1fcc2492de8a72f0c08
2016-09-24 00:07:17 +00:00
Doris Ling
f89766dbab Split Ambient Display settings.
am: 1ad58d0abf

Change-Id: Ie47c7504728bb225214ee8c348af8a154cb5a1f2
2016-09-24 00:05:17 +00:00
TreeHugger Robot
4f8a703d51 Merge "Split Ambient Display settings." into nyc-mr1-dev 2016-09-24 00:00:05 +00:00
Daniel Nishi
fee35492b8 Use a config flag instead of a RO flag for showing Manage Storage. am: c0b33f70ed
am: bfe5afc270

Change-Id: I159cb08e7ef25802562603d4f8e297ffdf8d0f30
2016-09-23 22:34:22 +00:00
Doris Ling
1ad58d0abf Split Ambient Display settings.
1. Reverting the changes for Display->Ambient Display; this setting
   will control incoming notification pulse.
2. Added 2 separate entries in gestures settings to control pick up
   and double tap gestures-triggered pulsing for Ambient Display.
3. Added automated tests to verify the preference initializes to the
   correct default value, and also verify that toggling the preference
   updates the corresponding settings correctly.

Test: make SettingsTests

Bug: 30595437
Change-Id: I125bf75fc4ccfea126a00ffae4207fcb789f487a
2016-09-23 15:33:37 -07:00
Daniel Nishi
bfe5afc270 Use a config flag instead of a RO flag for showing Manage Storage.
am: c0b33f70ed

Change-Id: I5b178d6e345ecc43689e0e1b5d6102e60b33037a
2016-09-23 22:31:34 +00:00
Daniel Nishi
3843dd96f5 Merge "Use a config flag instead of a RO flag for showing Manage Storage." into nyc-mr1-dev 2016-09-23 22:19:12 +00:00
Doris Ling
b1a2417fe9 Use default switch preference view if gesture animations video is not available. am: 08886a0e91 am: 38693095e3
am: 7c8de075d8

Change-Id: Icd2dd9b1f58c0957d651742dab16b291afcd750c
2016-09-23 22:07:04 +00:00
jackqdyulei
eab9337692 Set preference unselectable using the DividerPreference. am: 64e00da860 am: 33c2f0d150
am: 3f428f1ca9

Change-Id: I7c0c484486cfb462420578ec1a5edf5529259f9f
2016-09-23 22:06:32 +00:00
Annie Chin
2d1e4fb063 Change 'red' to 'amber' am: f980a1239c am: e1ffa85984
am: 30dbecc7bc

Change-Id: If32f29086f59c7a216e27636e91105196f58359e
2016-09-23 22:05:52 +00:00
Doris Ling
7c8de075d8 Use default switch preference view if gesture animations video is not available. am: 08886a0e91
am: 38693095e3

Change-Id: I460835a7e0ba3737e530ae24f6a957ed5ac1e742
2016-09-23 19:10:06 +00:00
Meng Wang
fe3749dd0b WiFiCallingSettings: show roaming preferrence
Bug: 31492826
Change-Id: I45cd8455e84802d690d074099d6a8e9c9398e157
2016-09-23 12:09:03 -07:00
Doris Ling
38693095e3 Use default switch preference view if gesture animations video is not available.
am: 08886a0e91

Change-Id: I813a7b61b49c593d639621194d1e0929a2322605
2016-09-23 19:07:19 +00:00
Doris Ling
2dc974a648 Merge "Use default switch preference view if gesture animations video is not available." into nyc-mr1-dev 2016-09-23 18:49:05 +00:00
jackqdyulei
3f428f1ca9 Set preference unselectable using the DividerPreference. am: 64e00da860
am: 33c2f0d150

Change-Id: I92fca298aa8e6cc1632022049a1cb95883c41d6b
2016-09-23 16:36:57 +00:00
jackqdyulei
33c2f0d150 Set preference unselectable using the DividerPreference.
am: 64e00da860

Change-Id: Ie202ee30067761ca7025ff37c3779052c48cacd5
2016-09-23 16:34:54 +00:00
Lei Yu
a985425e98 Merge "Set preference unselectable using the DividerPreference." into nyc-mr1-dev 2016-09-23 16:29:00 +00:00
Annie Chin
30dbecc7bc Change 'red' to 'amber' am: f980a1239c
am: e1ffa85984

Change-Id: If6d2a1998719c4aa008e669ae8d423541ff312eb
2016-09-23 00:25:57 +00:00
Annie Chin
e1ffa85984 Change 'red' to 'amber'
am: f980a1239c

Change-Id: I8c55a1cc67024be79922e9f931ea8e631a790615
2016-09-23 00:21:15 +00:00
TreeHugger Robot
0ae282b26e Merge "Change 'red' to 'amber'" into nyc-mr1-dev 2016-09-23 00:11:08 +00:00
Stephen Chen
2b98ffaab8 Change Display summary to sleep timeout description.
Bug: 29579542
Fixes: 29579542
Change-Id: I4e122bd6972fde933229768cba86302eb4d3f7c6
Test: Added Robo test, manually tested
2016-09-22 13:55:32 -07:00
jackqdyulei
64e00da860 Set preference unselectable using the DividerPreference.
In this way, when talking back is on, device won't speaking "Double
tap to activate" for no-action perference. The preference will have
divider line but lose ripple animation.

Bug: 31051833
Test: Manual Test. Cannot find a way to test it in testing framework.
1. Turn on the talk back.
2. Go to "About phone" Settings.
3. Tap and listen.

Change-Id: I2066d574e14071408c5a1db85a3bd4dafd8429fe
2016-09-22 12:53:55 -07:00
Annie Chin
f980a1239c Change 'red' to 'amber'
Change-Id: I36e4815165a12d33ce4aaad446acae19897be138
Fixes: 31628145
2016-09-22 10:26:06 -07:00
Bill Yi
b8f9eca6b2 Import translations. DO NOT MERGE
Change-Id: I3f9f1416177c094f377745c6b23e878b257ccaa9
Auto-generated-cl: translation import
2016-09-22 02:12:45 -07:00
Bill Yi
4702b22ed5 Import translations. DO NOT MERGE
Change-Id: I536498782053bf9372ecc8c59c8f20727658a8ad
Auto-generated-cl: translation import
2016-09-22 02:07:48 -07:00
Bill Yi
2e1dc45798 Import translations. DO NOT MERGE
Change-Id: I9bb06a317297ac9da28b3d462194211759c73172
Auto-generated-cl: translation import
2016-09-22 02:02:33 -07:00
Bill Yi
7eeb016fdd Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 31075769
Change-Id: I12e44f90e46c8f42290b7210556b52ecabcf769e
2016-09-21 12:10:51 -07:00
Doris Ling
08886a0e91 Use default switch preference view if gesture animations video is not
available.

Check to see if animation video is available. If so, use the customized
view. Otherwise, use the default switch preference layout.

Test: make and run SettingsGoogleTests

Bug: 30701118
Change-Id: I0b25f41f8425b92834b45f706690648fb35a885d
2016-09-20 16:34:04 -07:00
TreeHugger Robot
651140a448 Merge "Clean up string description for NFC disclaimer dialog." 2016-09-20 16:30:14 +00:00
Daniel Nishi
c0b33f70ed Use a config flag instead of a RO flag for showing Manage Storage.
Bug: 30455784
Test: make SettingsTests; run the instrumentation.
Change-Id: I860192c1c20fcaec2a5cbcdc085ff01dafa7351a
(cherry picked from commit 7f075a3c41)
2016-09-19 20:39:33 +00:00
Daniel Nishi
f83a21d0fc Merge "Use a config flag instead of a RO flag for showing Manage Storage." 2016-09-19 20:36:03 +00:00
Fan Zhang
2c6dbab68a Clean up string description for NFC disclaimer dialog.
Bug: 30852261
Bug: 30860218
Test: manual build
Change-Id: I7be1e5ac0bf2a044efe6820a3cf011dc32ebc14b
2016-09-19 12:17:04 -07:00
TreeHugger Robot
a365d9123c Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 2016-09-19 18:30:15 +00:00
TreeHugger Robot
b949075b30 Merge "Import translations. DO NOT MERGE" 2016-09-19 18:09:23 +00:00
Bill Yi
a860e80b92 Import translations. DO NOT MERGE
Change-Id: I6959685436657e51d7c951d9bbc9a0c62cb8696e
Auto-generated-cl: translation import
2016-09-19 09:57:21 -07:00
Matthew Fritze
1823fba4a4 Update edit text padding on Bluetooth device renaming dialog am: 68125813b2 am: 152a666154
am: 86a343e8c5

Change-Id: I2c13095ddba956acfd1508e2624b33ceb0dd097a
2016-09-19 16:42:57 +00:00
Matthew Fritze
86a343e8c5 Update edit text padding on Bluetooth device renaming dialog am: 68125813b2
am: 152a666154

Change-Id: Ib420ca9f6a46a4768f9caff824ccf7924b41ceac
2016-09-19 16:39:26 +00:00
Matthew Fritze
152a666154 Update edit text padding on Bluetooth device renaming dialog
am: 68125813b2

Change-Id: I96e7f964342c5f5b41aa9dfb6aff4e0547551a79
2016-09-19 16:35:53 +00:00
Matthew Fritze
dcc265dcbf Merge "Update edit text padding on Bluetooth device renaming dialog" into nyc-mr1-dev 2016-09-19 16:29:44 +00:00
Bill Yi
055b63c404 Import translations. DO NOT MERGE
Change-Id: If7030d2f90712f31a40fec2403e224dc2991021f
Auto-generated-cl: translation import
2016-09-19 09:20:03 -07:00
Bill Yi
82eff79103 Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 31075769
Change-Id: I8ed0dcd8d79e366a4f5963f1ec5b2d60346b7376
2016-09-19 08:53:13 -07:00
Paul Stewart
3766a2d7d3 Bad Wi-Fi: Change strings to carrier specs am: 49d703319b am: 00641d68c3 am: e089439788
am: 6e488ecf26

Change-Id: Id794f7c82c577dcd4824e3d6caab29712c7d4c9f
2016-09-17 04:00:08 +00:00
Paul Stewart
6e488ecf26 Bad Wi-Fi: Change strings to carrier specs am: 49d703319b am: 00641d68c3
am: e089439788

Change-Id: I894960bd05265da4f7dab8028c4fb508e8469cc1
2016-09-17 03:55:06 +00:00
Paul Stewart
e089439788 Bad Wi-Fi: Change strings to carrier specs am: 49d703319b
am: 00641d68c3

Change-Id: I12a333eeda4b90b3b20a59c55140a53a6c2b129d
2016-09-17 03:50:06 +00:00
Paul Stewart
00641d68c3 Bad Wi-Fi: Change strings to carrier specs
am: 49d703319b

Change-Id: I644d183683367280b3653750f84d9d2c9ee4c5ff
2016-09-17 03:47:35 +00:00
Bill Yi
0d00554d62 Merge "Bad Wi-Fi: Change strings to carrier specs" into nyc-dr1-dev 2016-09-17 03:39:34 +00:00