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
TreeHugger Robot
7bde506ed1
Merge "Assist gesture title should not be translated, remove unused strings" into oc-dr1-dev
2017-07-11 22:32:19 +00:00
Doris Ling
78e08f0f0a
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
Bug: 63393599
Test: make RunSettingsRoboTests
Change-Id: I268934e3a573b542480c0b21dbab68b7217295b5
2017-07-11 15:22:53 -07:00
jackqdyulei
e7c20d6fc4
Merge "Bind service in onCreate" into oc-dr1-dev am: 4e4c73bfc7
...
am: 4eba1d469c
2017-07-11 22:11:45 +00:00
jackqdyulei
4eba1d469c
Merge "Bind service in onCreate" into oc-dr1-dev
...
am: 4e4c73bfc7
2017-07-11 22:08:19 +00:00
Lei Yu
6fab00e64b
Merge "Remove obsolete bluetooth pages"
2017-07-11 22:05:25 +00:00
TreeHugger Robot
ade7f5b531
Merge "Automatically play the gesture video when the setting is launched."
2017-07-11 22:05:22 +00:00
TreeHugger Robot
4e4c73bfc7
Merge "Bind service in onCreate" into oc-dr1-dev
2017-07-11 22:02:35 +00:00
jackqdyulei
07fffc3877
Remove obsolete bluetooth pages
...
1. Remove BluetoothSettingsObsolete
2. Remove DeviceListPreferenceObsoleteFragment
3. Update master swtich, now constantly point to new page
4. Update the tests
Future cl will remove the page switch API in BluetoothFeatureProvider
Bug: 63444548
Test: Test still pass
Change-Id: I24fb5cd03cf30044edb7201426e11e0a818f0a7f
Merged-In: I24fb5cd03cf30044edb7201426e11e0a818f0a7f
2017-07-11 15:01:59 -07:00
Fan Zhang
af6fce6335
Use pref controller to get non-indexable in network setting
...
Change-Id: I2bcc9047146f4ad014d5929e66ee895ee497b641
Fix: 62555826
Test: robotests
2017-07-11 14:58:38 -07:00
Jack He
549d864bbf
Merge "Bluetooth: mLocalAdapter should never be null" into oc-dr1-dev am: 86fd147ac6
...
am: 99eab3d5f9
2017-07-11 21:26:09 +00:00
Jack He
99eab3d5f9
Merge "Bluetooth: mLocalAdapter should never be null" into oc-dr1-dev
...
am: 86fd147ac6
2017-07-11 21:22:40 +00:00
Michael Wachenschwanz
a203093d75
Update FakeUid to implement getForegroundServiceTimer
...
Simple change. Override the getForegroundServiceTimer method in FakeUid
Test: bit FrameworksCoreTests:com.android.internal.os.BatteryStatsNoteTest
Bug: 38313557
Change-Id: I8a3142e61ed67109629c683384734f749eaafb3f
2017-07-11 14:17:19 -07:00
TreeHugger Robot
86fd147ac6
Merge "Bluetooth: mLocalAdapter should never be null" into oc-dr1-dev
2017-07-11 21:16:32 +00:00
Stephen Chen
80b65d4328
Merge "Adjust UX for toggles when active scorer is not set." into oc-dr1-dev am: 89fdea9807
...
am: e549e732bd
2017-07-11 20:30:38 +00:00
Stephen Chen
e549e732bd
Merge "Adjust UX for toggles when active scorer is not set." into oc-dr1-dev
...
am: 89fdea9807
2017-07-11 20:27:39 +00:00
TreeHugger Robot
89fdea9807
Merge "Adjust UX for toggles when active scorer is not set." into oc-dr1-dev
2017-07-11 20:21:01 +00:00
jackqdyulei
50b0daee90
Bind service in onCreate
...
This cl puts the binding to onCreate instead of constructor, so
preference controller won't bind/unbind service without registering
Lifecycle.
Bug: 62105045
Test: RunSettingsRoboTests
Change-Id: I1e60d4b6ad7270aa5d04b7ec9fae1d3200fccc5f
Merged-In: I1e60d4b6ad7270aa5d04b7ec9fae1d3200fccc5f
2017-07-11 13:17:38 -07:00
Kevin Chyn
599d4b93f3
Assist gesture title should not be translated, remove unused strings
...
Bug: 63441962
Test: manual && make -j RunSettingsRoboTests
Change-Id: I8b50ad378828f30f31dbfd648c9fac62af5d9da7
2017-07-11 13:17:37 -07:00
TreeHugger Robot
38d02fb900
Merge "Bind service in onCreate"
2017-07-11 20:15:08 +00:00
jackqdyulei
88a9e4cc19
Remove obsolete bluetooth pages
...
1. Remove BluetoothSettingsObsolete
2. Remove DeviceListPreferenceObsoleteFragment
3. Update master swtich, now constantly point to new page
4. Update the tests
Future cl will remove the page switch API in BluetoothFeatureProvider
Bug: 63444548
Test: Test still pass
Change-Id: I24fb5cd03cf30044edb7201426e11e0a818f0a7f
2017-07-11 13:12:17 -07:00
Daniel Nishi
6dd03f6d8e
Merge "Expand ASM activation warning." into oc-dr1-dev am: 64acb2906c
...
am: 4961451a4e
2017-07-11 20:00:20 +00:00
