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
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
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
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
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
Nobuyuki Nakamura
2c872109eb
Show help string when onEnrollmentHelp() is called
...
The help string is not shown when onEnrollmentHelp() is called
between onEnrollmentProgressChange() and mTouchAgainRunnable#run().
To fix this issue, showError() should be called.
Bug: 30274453
Test: manual - start enrolling fingerprint and move finger fast on the sensor
Change-Id: Ie604532940e40cca66dc54b56c3cb4b828a07987
2017-07-12 05:42:37 +00:00
mingliang.x.lei
36c25af6a1
Fix memory leak in Bluetooth settings
...
Bluetooth settings screen has two categories. Each category should call
removeAll() method to unregister a callback from CachedBluetoothDevice.
But the method is not called for mPairedDevicesCategory.
Bug: 30004142
Test: manual - connect to Bluetooth device and then
open and close Bluetooth settings screen repeatedly
Change-Id: I5a72994473ee2bb5fc3ad00176d9a930b4839099
2017-07-12 05:42:14 +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
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
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
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
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
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
jackqdyulei
4eba1d469c
Merge "Bind service in onCreate" into oc-dr1-dev
...
am: 4e4c73bfc7
2017-07-11 22:08:19 +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
Jack He
99eab3d5f9
Merge "Bluetooth: mLocalAdapter should never be null" into oc-dr1-dev
...
am: 86fd147ac6
2017-07-11 21:22:40 +00: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
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
Daniel Nishi
4961451a4e
Merge "Expand ASM activation warning." into oc-dr1-dev
...
am: 64acb2906c
2017-07-11 19:56:41 +00:00
Daniel Nishi
64acb2906c
Merge "Expand ASM activation warning." into oc-dr1-dev
2017-07-11 19:46:19 +00:00
Jack He
a4503c5b8b
Bluetooth: mLocalAdapter should never be null
...
* mLocalAdapter should never be null
* We should crash if it is ever null
Bug: 63442969
Test: make, pair Bluetooth device
Change-Id: If98f9ea0762927eb57d00224b62abf24bbec69ba
2017-07-11 12:04:01 -07:00
Maurice Lam
ace9759446
Merge "Hide screen lock options button in confirm lock" into oc-dr1-dev
...
am: 540d92a7e9
2017-07-11 18:27:30 +00:00
Maurice Lam
540d92a7e9
Merge "Hide screen lock options button in confirm lock" into oc-dr1-dev
2017-07-11 18:21:43 +00:00
Geoffrey Pitsch
57adc290d2
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-11 14:05:03 -04:00
Daniel Nishi
8f345d7fd6
Expand ASM activation warning.
...
If the device had ASM enabled by default but still opted to disable ASM
for policy reasons, we need to start warning the user.
Change-Id: I6a296e95d00413308de3ddc565b42c5f605087e9
Fixes: 62105682
Test: Settings robotest
2017-07-11 09:51:14 -07:00
Bill Yi
219086822c
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
...
am: 75bcd075f2
2017-07-11 04:11:37 +00:00
Bill Yi
4a11531ec7
Import translations. DO NOT MERGE am: 7267438b58 -s ours am: 750540ae48 -s ours
...
am: a8d19dc2e4
2017-07-11 04:08:17 +00:00
Bill Yi
81a9389ebd
Import translations. DO NOT MERGE am: 7267438b58 -s ours am: 750540ae48 -s ours
...
am: 2865272522
2017-07-11 04:03:04 +00:00
TreeHugger Robot
75bcd075f2
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
2017-07-11 04:01:24 +00:00
Bill Yi
a8d19dc2e4
Import translations. DO NOT MERGE am: 7267438b58 -s ours
...
am: 750540ae48
2017-07-11 03:55:40 +00:00
Bill Yi
2865272522
Import translations. DO NOT MERGE am: 7267438b58 -s ours
...
am: 750540ae48
2017-07-11 03:55:18 +00:00
Bill Yi
750540ae48
Import translations. DO NOT MERGE
...
am: 7267438b58
2017-07-11 03:47:35 +00:00
Kevin Chyn
b5b7ef69bf
Merge "Remove unnecessary keywords" into oc-dr1-dev
...
am: 9cf03c3884
2017-07-11 03:35:06 +00:00
Android Build Merger (Role)
51e0ed982c
Merge "Import translations. DO NOT MERGE am: f812f94216 -s ours am: c45dd3f1ec -s ours" into oc-dr1-dev-plus-aosp
2017-07-11 03:32:54 +00:00
Bill Yi
5076e0747b
Import translations. DO NOT MERGE am: f812f94216 -s ours
...
am: c45dd3f1ec
2017-07-11 03:32:38 +00:00
