Phil Weaver
df045253a4
DO NOT MERGE Back-port ag/2491664 am: 9a14484b38 am: 840b78e19e am: bebc9f9f3c -s ours
...
am: 98e0930394
2017-07-12 22:06:35 +00:00
Phil Weaver
98e0930394
DO NOT MERGE Back-port ag/2491664 am: 9a14484b38 am: 840b78e19e
...
am: bebc9f9f3c
2017-07-12 21:59:38 +00:00
Phil Weaver
bebc9f9f3c
DO NOT MERGE Back-port ag/2491664 am: 9a14484b38
...
am: 840b78e19e
2017-07-12 21:55:38 +00:00
Phil Weaver
840b78e19e
DO NOT MERGE Back-port ag/2491664
...
am: 9a14484b38
2017-07-12 21:43:49 +00:00
Tony Mantler
12672f4d85
Add ADB enable/disable PreferenceController
...
Bug: 34203528
Test: EnableAdbControllerTest
Change-Id: I086403f7c4c9cf2f6f04b246e29b0d7ec4ab5b51
2017-07-12 14:36:57 -07:00
Rajeev Kumar
82ee7cf14f
Merge "Data plans setting peference."
2017-07-12 20:53:52 +00:00
Phil Weaver
9a14484b38
DO NOT MERGE Back-port ag/2491664
...
Bug: 62196835
Test: Verify overlays disappear on a11y capabilities
dialog.
Change-Id: Icbd00799e4b12cde9d17d3d0abbd38d9643b26c4
2017-07-12 20:50:13 +00:00
Salvador Martinez
42e65d11b9
Merge "Fix mistake in conditional + test" into oc-dr1-dev am: ab2d96de83
...
am: 96e4b8f9f4
2017-07-12 20:49:51 +00:00
Salvador Martinez
96e4b8f9f4
Merge "Fix mistake in conditional + test" into oc-dr1-dev
...
am: ab2d96de83
2017-07-12 20:47:14 +00:00
TreeHugger Robot
ab2d96de83
Merge "Fix mistake in conditional + test" into oc-dr1-dev
2017-07-12 20:41:27 +00:00
Fan Zhang
f57e167375
UI refresh on bluetooth list page
...
- xml layout clean up
- add "Device name" preference, tapping will bring up rename dialog
- Remove tap target from original device_name pref
Change-Id: I6e9764dbb6c51f94be6d6a61d5a6401141407409
Bug: 62890841
Bug: 62891178
Test: robotests
2017-07-12 13:24:25 -07:00
Ajay Nadathur
7d66e044d4
Merge "Remove next button from FingerprintEnroll screen" into oc-dr1-dev am: d1bac25518
...
am: 4aaa52d1d6
2017-07-12 20:09:22 +00:00
Ajay Nadathur
4aaa52d1d6
Merge "Remove next button from FingerprintEnroll screen" into oc-dr1-dev
...
am: d1bac25518
2017-07-12 20:07:19 +00:00
TreeHugger Robot
d1bac25518
Merge "Remove next button from FingerprintEnroll screen" into oc-dr1-dev
2017-07-12 20:03:14 +00:00
jackqdyulei
5fbdfddb13
Fix bug in DevicePickerFragment
...
BluetoothProgressCategory will add a no device preference if it is
not scanning and no device is added to the list. Since
DeviceListFragment doesn't report its scanning status correctly, it will
show "No nearby device" even though it is scanning.
This cl add control code for BluetoothProgressCategory in
DeviceListFragment, which avoid the unnecessary no device preference.
Bug: 62492822
Test: RunSettingsRoboTests
Change-Id: Ic49f21cb58a80dcd37c5737800181263ae876ebc
2017-07-12 12:38:12 -07:00
TreeHugger Robot
85c0be9bf4
Merge "Disable lift-to-wake when always-on is checked"
2017-07-12 19:34:54 +00:00
Rajeev Kumar
c6f0b9d6f3
Data plans setting peference.
...
Change-Id: Ieb2aa67ab98140aa90501227345a15ad64cf124c
Note: These changes are required for Data balance UI.
Bug: 62349208
Test: make RunSettingsRoboTests -j40
2017-07-12 11:48:23 -07:00
Salvador Martinez
433288a76e
Fix mistake in conditional + test
...
This CL fixes a mixup that was in a conditional that determined
what was shown on the battery settings page. Additionally, it adds
a simple test to help ensure that this does not regress in the
future.
Test: Robotest
Bug: 63158794
Change-Id: I8af4843ef6d798b5114c97b2f1b99dd29fa5f412
2017-07-12 11:31:02 -07:00
Ajay Nadathur
00dda696cd
Merge "Do not show options if screen lock types is empty" into oc-dr1-dev am: 0bde6dcb18
...
am: 3d627974d6
2017-07-12 18:11:47 +00:00
Ajay Nadathur
3d627974d6
Merge "Do not show options if screen lock types is empty" into oc-dr1-dev
...
am: 0bde6dcb18
2017-07-12 18:04:26 +00:00
Ajay Nadathur
0bde6dcb18
Merge "Do not show options if screen lock types is empty" into oc-dr1-dev
2017-07-12 17:53:07 +00:00
Geoffrey Pitsch
8d973761ad
Disable lift-to-wake when always-on is checked
...
The setting has little to no meaning when AOD is on.
Test: make
ROBOTEST_FILTER=AmbientDisplayAlwaysOnPreferenceControllerTest
RunSettingsRoboTests -j
Bug:62391405
Change-Id:If5492227755ca81ec0bcf921a81e2bfd33a85b9c
2017-07-12 13:42:34 -04:00
Daniel Nishi
e70a06a5d5
Merge "Fix filter bug for non-internal app filtering." into oc-dr1-dev am: bce83f8c71
...
am: eba886f045
2017-07-12 17:33:32 +00:00
Daniel Nishi
eba886f045
Merge "Fix filter bug for non-internal app filtering." into oc-dr1-dev
...
am: bce83f8c71
2017-07-12 17:26:57 +00:00
Geoffrey Pitsch
b3e20232d4
Merge "Disable lift-to-wake when always-on is checked" into oc-dr1-dev am: 00ac782f3e
...
am: 329bab9e1b
2017-07-12 17:14:54 +00:00
Daniel Nishi
bce83f8c71
Merge "Fix filter bug for non-internal app filtering." into oc-dr1-dev
2017-07-12 17:13:46 +00:00
Geoffrey Pitsch
329bab9e1b
Merge "Disable lift-to-wake when always-on is checked" into oc-dr1-dev
...
am: 00ac782f3e
2017-07-12 16:59:26 +00:00
TreeHugger Robot
4ee9134749
Merge "Use pref controller to get non-indexable in network setting"
2017-07-12 16:59:24 +00:00
Geoffrey Pitsch
00ac782f3e
Merge "Disable lift-to-wake when always-on is checked" into oc-dr1-dev
2017-07-12 16:50:48 +00:00
Doris Ling
5cc0eb16e1
Merge "Update spacing and background color for condition/suggestion." into oc-dr1-dev am: 91ca9f60e9
...
am: a674aa69c2
2017-07-12 03:22:57 +00:00
Doris Ling
a674aa69c2
Merge "Update spacing and background color for condition/suggestion." into oc-dr1-dev
...
am: 91ca9f60e9
2017-07-12 03:13:51 +00:00
TreeHugger Robot
91ca9f60e9
Merge "Update spacing and background color for condition/suggestion." into oc-dr1-dev
2017-07-12 02:58:28 +00:00
Ajay Nadathur
85132ee541
Merge "Add another fingerprint button not visible in landscape mode" into oc-dr1-dev am: 482b7feaa7
...
am: 43a49fca4d
2017-07-12 02:09:29 +00:00
Ajay Nadathur
43a49fca4d
Merge "Add another fingerprint button not visible in landscape mode" into oc-dr1-dev
...
am: 482b7feaa7
2017-07-12 02:05:58 +00:00
TreeHugger Robot
482b7feaa7
Merge "Add another fingerprint button not visible in landscape mode" into oc-dr1-dev
2017-07-12 01:57:26 +00:00
Ajay Nadathur
ba313c0347
Remove next button from FingerprintEnroll screen
...
bug: 63515466
Test: Manually tested and verified that next button is removed
Change-Id: Ib43363c763fba2f92cb4774e1b961ab8647f5040
2017-07-11 18:49:53 -07:00
Ajay Nadathur
17d66bea42
Do not show options if screen lock types is empty
...
Bug: 63311251
Test: Manually tested on device
Change-Id: Ia56a0791b89635efb4f8305f39b586b8054271cf
2017-07-11 18:09:49 -07:00
TreeHugger Robot
30e0986078
Merge "Update spacing and background color for condition/suggestion."
2017-07-12 00:25:13 +00:00
jackqdyulei
2a82e1487e
Merge "Remove obsolete bluetooth pages" into oc-dr1-dev am: c2e0e41446
...
am: 7811db450e
2017-07-12 00:20:57 +00:00
jackqdyulei
7811db450e
Merge "Remove obsolete bluetooth pages" into oc-dr1-dev
...
am: c2e0e41446
2017-07-12 00:12:26 +00:00
Daniel Nishi
6f3900f6b5
Fix filter bug for non-internal app filtering.
...
By default, the filter would show all non-categorized apps. This,
however, regressed the external storage apps view which does not have
categorization (yet). By adding back in a legacy option to use the old
purely UUID filtering, we can fix the regression.
Change-Id: I72d8d3bc08fbdff53374eb1e973bce9f8d7e2e79
Fixes: 63542896
Test: Settings unit test
2017-07-11 17:11:28 -07:00
TreeHugger Robot
c2e0e41446
Merge "Remove obsolete bluetooth pages" into oc-dr1-dev
2017-07-12 00:01:47 +00:00
Ajay Nadathur
5eca3a64ea
Add another fingerprint button not visible in landscape mode
...
bug:63067568
Test: Manually tested and verified
Change-Id: I172bbf4c4db6cebb2cc96874f3d8d29e859b07d1
2017-07-11 16:58:12 -07:00
Maurice Lam
042084c58a
Merge "Add category for wallpaper suggestion" into oc-dr1-dev am: 13a1a98bb9
...
am: 4c64565518
2017-07-11 23:50:49 +00:00
Maurice Lam
4c64565518
Merge "Add category for wallpaper suggestion" into oc-dr1-dev
...
am: 13a1a98bb9
2017-07-11 23:47:21 +00:00
Maurice Lam
13a1a98bb9
Merge "Add category for wallpaper suggestion" into oc-dr1-dev
2017-07-11 23:41:32 +00:00
Soroosh Mariooryad
9fb52be032
Merge "Adding warmup call API for Settings search ranking."
2017-07-11 23:01:12 +00:00
Doris Ling
df055c8655
Update spacing and background color for condition/suggestion.
...
- changed suggestion/condition and searchbox background color to
#F2F2F2
- changed condition card background color to #F8F8F8
- removed Suggestion header
- reduced space above condition header/footer by 9dp
Fix: 63393599
Test: visual
Change-Id: I4317781c93e23c6d019928b9fe9af16177f81c07
Merged-In: I268934e3a573b542480c0b21dbab68b7217295b5
2017-07-11 15:50:48 -07:00
Kevin Chyn
1e21688600
Merge "Assist gesture title should not be translated, remove unused strings" into oc-dr1-dev am: 7bde506ed1
...
am: bab6e592bc
2017-07-11 22:40:16 +00:00
Kevin Chyn
bab6e592bc
Merge "Assist gesture title should not be translated, remove unused strings" into oc-dr1-dev
...
am: 7bde506ed1
2017-07-11 22:36:47 +00:00
