Commit Graph

10728 Commits

Author SHA1 Message Date
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
Paul Stewart
49d703319b Bad Wi-Fi: Change strings to carrier specs
Also add a checkbox to persist the value.  However, the logic to
pass this persistence to ConnectivityService has not yet been added.

Bug: 31075769
Test: Visual inspection of dialog (upcoming)
Change-Id: I370ab07ea276b024ce4adc61e10ca085be1c5549
2016-09-16 17:51:16 -07:00
Bill Yi
a4e479afec Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 31516661
Change-Id: Idc23b872921e45152ba6c092551b6984db2073cc
2016-09-16 17:39:21 -07:00
Daniel Nishi
7f075a3c41 Use a config flag instead of a RO flag for showing Manage Storage.
Bug: 30455784
Test: make SettingsTests; run the instrumentation.
Change-Id: I860192c1c20fcaec2a5cbcdc085ff01dafa7351a
2016-09-16 15:56:47 -07:00
Hugo Benichi
e590183dcc Add a "Cellular data fallback" pref. am: a317684cfc am: aabd051f50 am: d294f58361
am: 56e754b446

Change-Id: Id2c098cf8df2c8f3b1dc5a6f6aa7cb4618f85ddd
2016-09-16 16:57:11 +00:00
Hugo Benichi
56e754b446 Add a "Cellular data fallback" pref. am: a317684cfc am: aabd051f50
am: d294f58361

Change-Id: Iceca5357dab0d1a2755070f9b3b2fd7964b6e8ca
2016-09-16 16:53:17 +00:00
Hugo Benichi
d294f58361 Add a "Cellular data fallback" pref. am: a317684cfc
am: aabd051f50

Change-Id: Iddbac3787f05e97bee559a8e991d1c2412ccbc37
2016-09-16 16:51:11 +00:00
Hugo Benichi
aabd051f50 Add a "Cellular data fallback" pref.
am: a317684cfc

Change-Id: I902d4039aefddbe38a7caa20afede7af20d03086
2016-09-16 16:45:15 +00:00
Julia Reynolds
2dcc7a8895 Merge "Add notification channel settings." 2016-09-16 15:35:23 +00:00
Hugo Benichi
a317684cfc Add a "Cellular data fallback" pref.
Also adjust working of the "lost internet" notification.

Bug: 31075769
Change-Id: I17e18516c9bfdc32b38686191327b6d6f87aed95
2016-09-17 00:30:05 +09:00
Julia Reynolds
b5ec2d71a2 Add notification channel settings.
If a user has set a preference at an app wide level, it cannot be
undone at a channel level, but channels can be more restrictive.

Tests: changing settings for apps and channels.

Change-Id: I7907b8179ffc24d68197c917f182e63d8e1ff7a7
2016-09-15 21:46:17 -04:00
Bill Yi
a5e9df1417 Import translations. DO NOT MERGE
Change-Id: Ibf23355f7b80612e52b6b528c24318742e96cf5a
Auto-generated-cl: translation import
2016-09-15 15:54:24 -07:00
TreeHugger Robot
02f3cd3849 Merge "Prevent height change in default ringtone preferences." 2016-09-15 22:10:43 +00:00
Fan Zhang
7aae6746b1 Prevent height change in default ringtone preferences.
- Added a placeholder summary text in ringtone preferences so the height
  is reserved while we load ringtone names.

Bug: 28075406
Test: Visually inspected
Change-Id: Ia4022679fcc9d6992c3bb9439f7bfce9bb552ea1
2016-09-15 13:12:22 -07:00
Noah Wang
071fab88eb Disable accessibility focus on the instruction video in magnification gesture screen. am: 93ec5312c5 am: 3e00d852c4
am: d8f9e29395

Change-Id: Ie27d136cd93a48eb4bef81fe07e34d7e66af4606
2016-09-15 19:48:59 +00:00
Noah Wang
d8f9e29395 Disable accessibility focus on the instruction video in magnification gesture screen. am: 93ec5312c5
am: 3e00d852c4

Change-Id: I322c47b86023f5ebb25b312515d69e8bbe5d08e5
2016-09-15 19:46:32 +00:00
Noah Wang
3e00d852c4 Disable accessibility focus on the instruction video in magnification gesture screen.
am: 93ec5312c5

Change-Id: Ie60200fd1ced75472c24a7efbb0112fd10628e06
2016-09-15 19:44:20 +00:00
Noah Wang
131988f1ea Merge "Disable accessibility focus on the instruction video in magnification gesture screen." into nyc-mr1-dev 2016-09-15 19:31:24 +00:00