Commit Graph

29694 Commits

Author SHA1 Message Date
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
Todd Kennedy
33a08271c5 Merge "Add remote control of Instant Apps" into nyc-mr1-dev am: 727186bd33
am: 184524b37d

Change-Id: I13fba175e96ea9edcdd02d717bc768b913777240
2016-09-22 23:35:31 +00:00
Chris Tate
53cc21d189 Merge "Tell sublaunched backup settings activities about policy state" into nyc-mr1-dev
am: 4199a0d3bd

Change-Id: I64ccf414058dcd3488b1f5c6c32b2ca62791f778
2016-09-22 23:31:21 +00:00
Christopher Tate
8953a28597 Tell sublaunched backup settings activities about policy state
am: ee564e9cfc

Change-Id: Ia2e6482ce141ce6cc31ecd501e321b8f5454721f
2016-09-22 23:08:31 +00:00
Todd Kennedy
184524b37d Merge "Add remote control of Instant Apps" into nyc-mr1-dev
am: 727186bd33

Change-Id: Ib4e109f9780fd71c48fdd751b489ff22916864c3
2016-09-22 22:55:33 +00:00
Fan Zhang
98487f4d65 Fix NPE when trying to refreshes dnd condition.
Bug: 31685838
Test: manual, will add automated test in master.

The NPE happens when try to refresh dnd condition before the condition
object is created.

Change-Id: Idbd6898472e1ad21a2bbb3be5f0b9c24c03b5c80
2016-09-22 22:13:21 +00:00
Chris Tate
4199a0d3bd Merge "Tell sublaunched backup settings activities about policy state" into nyc-mr1-dev 2016-09-22 21:58:28 +00:00
Todd Kennedy
212eb25768 Add remote control of Instant Apps am: 6ed0c7e8d7
am: d95430cbe6

Change-Id: I3a052aeb59f608d21a3be43691128e2b7acd56a4
2016-09-22 21:58:04 +00:00
Bill Yi
2a7e6aa6a7 Import translations. DO NOT MERGE am: b8f9eca6b2 -s ours am: 6733fd04d9 -s ours
am: e4591a6295  -s ours

Change-Id: Iee4085c0c96e98888b0b7fbd9396d3ff87c5c6e6
2016-09-22 21:57:23 +00:00
Bill Yi
4097006da3 Import translations. DO NOT MERGE am: 4702b22ed5 -s ours
am: 11a58be734  -s ours

Change-Id: I1f99970be73359f9bd61ecfa976286581ac39d67
2016-09-22 21:57:06 +00:00
Todd Kennedy
d95430cbe6 Add remote control of Instant Apps
am: 6ed0c7e8d7

Change-Id: If24fd101fbc4815f1eb3875fdb1216c7cee39b4b
2016-09-22 20:01:03 +00:00
Bill Yi
e4591a6295 Import translations. DO NOT MERGE am: b8f9eca6b2 -s ours
am: 6733fd04d9  -s ours

Change-Id: I865142acdd2fae0fb886a4796f0ad15a9fc4d984
2016-09-22 19:59:25 +00:00
Bill Yi
11a58be734 Import translations. DO NOT MERGE
am: 4702b22ed5  -s ours

Change-Id: I8a8a675809d8ae335f43d58ba1e83443676fd8e4
2016-09-22 19:58:29 +00: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
TreeHugger Robot
727186bd33 Merge "Add remote control of Instant Apps" into nyc-mr1-dev 2016-09-22 16:57:14 +00:00
Bill Yi
6733fd04d9 Import translations. DO NOT MERGE
am: b8f9eca6b2  -s ours

Change-Id: I6fe66119ad608719c03ff091e1ee04f032312788
2016-09-22 12:38:46 +00: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