Andre Eisenbach
75e4d44f0d
Move Bluetooth device "Forget" button to the left
...
am: aece754d77
Change-Id: I5732a476c5f6fb6753fc3d8a59b5ce9c293692b1
2016-09-26 21:52:13 +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
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
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
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
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
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
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
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
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
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
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
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
Bill Yi
4702b22ed5
Import translations. DO NOT MERGE
...
Change-Id: I536498782053bf9372ecc8c59c8f20727658a8ad
Auto-generated-cl: translation import
2016-09-22 02:07:48 -07:00
Christopher Tate
ee564e9cfc
Tell sublaunched backup settings activities about policy state
...
Policy state is not readily observable by subsidiary UI, so we
now tell it explicitly when sublaunching it.
Bug 30126678
Change-Id: Icdd6e39874070d7337b4b0a0d5b80c52bb3e7e40
2016-09-21 17:16:17 -07:00
Bill Yi
cacface139
Import translations. DO NOT MERGE am: 7eeb016fdd
-s ours
...
am: 4d83805999
-s ours
Change-Id: I04ef038f38034999a033f44f4c8a9f926143fd26
2016-09-21 19:28:18 +00:00
Bill Yi
4d83805999
Import translations. DO NOT MERGE
...
am: 7eeb016fdd
-s ours
Change-Id: I0c3faa0ad6760b35f3a7eb8d85d0908228297b8d
2016-09-21 19:25:17 +00: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
Amit Mahajan
f3f35a9b1e
Changes to make APN fields uneditable based on carrier config.
...
am: 7c01344349
Change-Id: Idf1b11ac139c63abc3e1d819c98cbe664fa60f04
2016-09-21 02:11:50 +00: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
Amit Mahajan
7c01344349
Changes to make APN fields uneditable based on carrier config.
...
Bug: 30457714
Change-Id: I682445eab8eb3ff4ff3eaf036964b467217366f0
2016-09-20 15:25:26 -07:00