Doris Ling
ed9fc06b50
Merge "Update gesture settings text." into nyc-mr1-dev am: ace4753224
...
am: ad0d72fee7
Change-Id: Ie07ca705d81b2c8e09db4d6498d0e28f3ab9c661
2016-09-26 20:37:38 +00:00
Doris Ling
e816be1565
Update gesture settings text. am: 8ff630966a
...
am: 5252165f6a
Change-Id: I5dcac554e9dd345785b3975ab7af5cab6cfde32f
2016-09-26 20:37:25 +00:00
Doris Ling
ad0d72fee7
Merge "Update gesture settings text." into nyc-mr1-dev
...
am: ace4753224
Change-Id: Ia0497a0d0ea026eb279246034d16b40fbc2c0902
2016-09-26 20:34:54 +00:00
Doris Ling
5252165f6a
Update gesture settings text.
...
am: 8ff630966a
Change-Id: Ic05df8585fc113cf276f0606b680fd4f74e9a208
2016-09-26 20:34:53 +00:00
Doris Ling
ace4753224
Merge "Update gesture settings text." into nyc-mr1-dev
2016-09-26 20:27:39 +00:00
Daniel Nishi
b3405649fa
Fix a deprecated config string name for the storage manager settings.
...
The old string was used for configuration purposes, but the change was
removed. A previous patch accidentally used the old string for
choosing if the activity was exported or not.
Bug: 31621740
Change-Id: I9471e3a4c6d64d3fb8be7cbfcf058d35364892a5
2016-09-26 11:40:55 -07:00
Doris Ling
8ff630966a
Update gesture settings text.
...
Update the preference title and summary for Ambient Display Double-tap
and Pickup gestures.
Test: manual - launch gestures settings and verify latest strings are
used.
Bug: 30595437
Change-Id: I029c2048603563ea20f5030e381a9e7a624d0e85
2016-09-26 17:19:35 +00:00
Bill Yi
7552fb5a17
Import translations. DO NOT MERGE
...
Change-Id: I8cf027c5077ed24be8d68d191a6da201df7fdd0d
Auto-generated-cl: translation import
2016-09-26 09:48:57 -07:00
Bill Yi
47ff6882fb
Import translations. DO NOT MERGE
...
Change-Id: I4f03344d3ce65076256892ae63803239c5c47718
Auto-generated-cl: translation import
2016-09-26 09:44:05 -07:00
Daniel Nishi
8cf30cafff
Merge "Add storage manager settings activity." into nyc-mr1-dev am: 798a28ace9
...
am: 4ee3ce5732
Change-Id: I575b3ab0ab21cc3af4ee2533e1372bfd4c6ca0ff
2016-09-24 00:27:22 +00:00
Daniel Nishi
a55d5b6b3a
Add storage manager settings activity. am: 3981889d1d
...
am: 2382850d65
Change-Id: Ic105308a53273c6705027d13fb2430537116a0ce
2016-09-24 00:24:59 +00:00
Daniel Nishi
4ee3ce5732
Merge "Add storage manager settings activity." into nyc-mr1-dev
...
am: 798a28ace9
Change-Id: If2150702a9ef06c0d4e4469fac2646dce3a259e6
2016-09-24 00:23:38 +00:00
Daniel Nishi
2382850d65
Add storage manager settings activity.
...
am: 3981889d1d
Change-Id: I50224492a1ed42d6aa38fce72a905e35ee672a83
2016-09-24 00:20:27 +00:00
Andre Eisenbach
aece754d77
Move Bluetooth device "Forget" button to the left
...
"Forget" and "OK" actions are too close together.
Bug: 31693959
Change-Id: Iee452347a53b186df7aecad5d971edcfb7645f1d
2016-09-24 00:16:21 +00:00
Daniel Nishi
798a28ace9
Merge "Add storage manager settings activity." into nyc-mr1-dev
2016-09-24 00:15:49 +00:00
Doris Ling
799388df91
Merge "Split Ambient Display settings." into nyc-mr1-dev am: 4f8a703d51
...
am: f79a9b397e
Change-Id: I9a5498d766c23d7d2431706feacf66a7bb1da091
2016-09-24 00:07:21 +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
f79a9b397e
Merge "Split Ambient Display settings." into nyc-mr1-dev
...
am: 4f8a703d51
Change-Id: I0855a17e05c387a63241bfaa5c910d4625e2e5ce
2016-09-24 00:05:19 +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
Fan Zhang
d9d34f78ab
Merge "Fix NPE when trying to refreshes dnd condition." into nyc-mr1-dev am: c5bfd5f5a8
...
am: 8f621c8cfa
Change-Id: I9a05577aed82272d5040a03454289682aa5671fa
2016-09-23 23:44:49 +00:00
Fan Zhang
f77c940f9a
Fix NPE when trying to refreshes dnd condition. am: 98487f4d65
...
am: 80c589e1f8
Change-Id: I64d75489f6e7066b2303c6e3fc3d4e6b0c8388c6
2016-09-23 23:44:36 +00:00
Fan Zhang
8f621c8cfa
Merge "Fix NPE when trying to refreshes dnd condition." into nyc-mr1-dev
...
am: c5bfd5f5a8
Change-Id: Ie0736338105b670e827b636091ef3235ef872489
2016-09-23 23:37:49 +00:00
Fan Zhang
80c589e1f8
Fix NPE when trying to refreshes dnd condition.
...
am: 98487f4d65
Change-Id: I27d984f6ebb1de4832d819a843c9cdbfeeabeaf8
2016-09-23 23:37:49 +00:00
Fan Zhang
c5bfd5f5a8
Merge "Fix NPE when trying to refreshes dnd condition." into nyc-mr1-dev
2016-09-23 23:31:43 +00:00
Daniel Nishi
350c9a3ecb
Merge "Use a config flag instead of a RO flag for showing Manage Storage." into nyc-mr1-dev am: 3843dd96f5
...
am: 95ce1811ed
Change-Id: I22a87383234d2b909e4402093f587a4f60f52ed2
2016-09-23 22:52:37 +00:00
Daniel Nishi
95ce1811ed
Merge "Use a config flag instead of a RO flag for showing Manage Storage." into nyc-mr1-dev
...
am: 3843dd96f5
Change-Id: I6912a4d634152d40a9af1ab98f2303ec8288e55f
2016-09-23 22:41:15 +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
9d283f3162
Merge "Use default switch preference view if gesture animations video is not available." into nyc-mr1-dev am: 2dc974a648
...
am: 41a32a2a5f
Change-Id: Ia0cf4f60d994b947f36efa7c301d45c6606df6a8
2016-09-23 19:10:12 +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
41a32a2a5f
Merge "Use default switch preference view if gesture animations video is not available." into nyc-mr1-dev
...
am: 2dc974a648
Change-Id: Ia06f96e479d3282e11644cbbc40e5945d9ee215c
2016-09-23 19:07:21 +00: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
Lei Yu
8fe8f02245
Merge "Set preference unselectable using the DividerPreference." into nyc-mr1-dev am: a985425e98
...
am: 8497e0d2dd
Change-Id: I609c2a719ac9dd746876031c7e811736b285bfb6
2016-09-23 16:37:11 +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
Lei Yu
8497e0d2dd
Merge "Set preference unselectable using the DividerPreference." into nyc-mr1-dev
...
am: a985425e98
Change-Id: I63577db8f2ca7c8eea0a2b3b7220c4db4d5bf76f
2016-09-23 16:34:55 +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
Daniel Nishi
3981889d1d
Add storage manager settings activity.
...
Bug: 31621740
Change-Id: I5abc8ef3f12e02488104c0b74f4826d8c4182b2b
2016-09-22 17:43:42 -07:00
Annie Chin
34f4aa9119
Merge "Change 'red' to 'amber'" into nyc-mr1-dev am: 0ae282b26e
...
am: b2d199abd9
Change-Id: I5b4a8351e39f06f41c21671c497515a9107c6e8f
2016-09-23 00:26:12 +00:00
Annie Chin
30dbecc7bc
Change 'red' to 'amber' am: f980a1239c
...
am: e1ffa85984
Change-Id: If6d2a1998719c4aa008e669ae8d423541ff312eb
2016-09-23 00:25:57 +00:00
Chris Tate
9c4bad92b1
Merge "Tell sublaunched backup settings activities about policy state" into nyc-mr1-dev am: 4199a0d3bd
...
am: 53cc21d189
Change-Id: I173f1e085bda6eb3a0f98dd3c2259e6301c5d398
2016-09-23 00:25:42 +00:00
Annie Chin
b2d199abd9
Merge "Change 'red' to 'amber'" into nyc-mr1-dev
...
am: 0ae282b26e
Change-Id: I869ecadaf6cc42d076f1d6368f64ef6e0d521bca
2016-09-23 00:21:16 +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
Christopher Tate
d35a29884b
Tell sublaunched backup settings activities about policy state am: ee564e9cfc
...
am: 8953a28597
Change-Id: Ia3742c49903b95737b6559f69ffe2c6d65a85e0e
2016-09-22 23:57:32 +00:00