Commit Graph

2808 Commits

Author SHA1 Message Date
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

Change-Id: Ib1b6f17ef73222cfeebe163c6a43112f74ffa898
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

Change-Id: I9ab99b706f8d545294ebacc5e204d90e94c9ea32
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

Change-Id: I5151ab5ba2ed2dfb94460a118705b3f68a18f777
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
a674aa69c2 Merge "Update spacing and background color for condition/suggestion." into oc-dr1-dev
am: 91ca9f60e9

Change-Id: I65e88eb8e4d65641beace03ab8f0782efa00db62
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
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
7811db450e Merge "Remove obsolete bluetooth pages" into oc-dr1-dev
am: c2e0e41446

Change-Id: Ibc5adabb7cfb83815423a30bd4bd94c4b6d7d8fa
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
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
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
4eba1d469c Merge "Bind service in onCreate" into oc-dr1-dev
am: 4e4c73bfc7

Change-Id: Id317c4003fd560c5cff4da7191198aa17ea97f7b
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
Stephen Chen
e549e732bd Merge "Adjust UX for toggles when active scorer is not set." into oc-dr1-dev
am: 89fdea9807

Change-Id: Iddc9c6e474847f2aa54a0f695d34201a84596985
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
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

Change-Id: I992843e238acc4720c1fd5ade1cb4a66936ecb9c
2017-07-11 20:00:20 +00:00
Daniel Nishi
4961451a4e Merge "Expand ASM activation warning." into oc-dr1-dev
am: 64acb2906c

Change-Id: I980227fd99274364a7160a0e896b9518c2de1dd0
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
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
jackqdyulei
4a2bbadcd4 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
2017-07-11 10:52:06 -07:00
Doris Ling
a689787b71 Automatically play the gesture video when the setting is launched.
- and save the video pause state on config change so that the paused
video will not auto start again on screen rotation.

Change-Id: I3f41849ee3063942fb4141e4556e494bc8439226
Fix: 63145847
Test: make RunSettingsRoboTests
2017-07-11 10:38:24 -07: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
TreeHugger Robot
75bcd075f2 Merge "Import translations. DO NOT MERGE" into oc-dr1-dev 2017-07-11 04:01:24 +00:00
Bill Yi
85550c537b Import translations. DO NOT MERGE
Change-Id: I827ed97b3afd80dd3e834b3cf686c6b1d4a65d25
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
2017-07-10 16:23:41 -07:00
TreeHugger Robot
9e2984b035 Merge "Add location as a Inline list payload" into oc-dr1-dev 2017-07-10 23:23:13 +00:00
Fan Zhang
f559395603 Use preference theme from SettingsLib
Bug: 36663882
Test: rerun robotests
Change-Id: I9f0f51a9d070191f5bf8f3315fef4d997d6213c3
2017-07-10 14:56:49 -07:00
TreeHugger Robot
f74878dca3 Merge "Import translations. DO NOT MERGE" 2017-07-10 20:52:21 +00:00
jackqdyulei
17bae5fa57 Init BatteryUtils in constructor am: 116fec5b25
am: d6ff657b78

Change-Id: I876a9fc869ae48ef6bf45080c6036980423d1fe5
2017-07-10 20:26:35 +00:00
TreeHugger Robot
4553225ab5 Merge "Add location as a Inline list payload" 2017-07-10 20:18:42 +00:00
TreeHugger Robot
a9b1cca103 Merge "Fix build" 2017-07-10 19:06:50 +00:00
Matthew Fritze
0609c4c281 Add location as a Inline list payload
The inline payload is added to security settings because
security settings indexes the setting with the key
"location" which corresponds with the correct
PreferenceController, LocationPreferenceController.

However, we suppress the Location search result, so to
avoid confusion later, we don't include the ResultPayload
in the search indexing.

Bug: 62022517
Test: make RunSettingsRoboTests
Change-Id: Ica9b775fe7b43259e651f95b079b8cccb29d0ea8
Merged-In: Ic5515d38064498ae908f4cefedfeb3c2a2af449c
2017-07-10 18:21:15 +00:00
Matthew Fritze
ea72afa330 Add location as a Inline list payload
The inline payload is added to security settings because
security settings indexes the setting with the key
"location" which corresponds with the correct
PreferenceController, LocationPreferenceController.

However, we suppress the Location search result, so to
avoid confusion later, we don't include the ResultPayload
in the search indexing.

Merge from: ag/2511709/

Bug: 62022517
Test: make RunSettingsRoboTests
Change-Id: Ic5515d38064498ae908f4cefedfeb3c2a2af449c
2017-07-10 11:20:02 -07:00
jackqdyulei
116fec5b25 Init BatteryUtils in constructor
In this case we won't have the NPE.

Bug: 63526637
Test: RunSettingsRoboTests
Change-Id: I20375e535ba07deddacf74052f31476e0cb28e56
2017-07-10 11:08:12 -07:00
Fan Zhang
b886c1613c Fix build
Change-Id: I0accc5b7c753ff85a56f5dfc17f7d9aa8eb7cd9a
Fix: 63525553
Test: RunSettingsRoboTests
2017-07-10 10:23:07 -07:00
Soroosh Mariooryad
892d65fd1e Adding warmup call API for Settings search ranking.
- This allows the ranking implementations to prepare for predictions and
avoids latency on the first prediction call.

Bug: 38197948
Bug: 37312700

Test: RunSettingsRoboTests

Change-Id: I1878b14765ad7cede5648fa1c7f29c419c2e5535
2017-07-07 17:53:58 -07:00
jackqdyulei
d2d524d958 Merge "Update summary for "Voice Calls"" into oc-dr1-dev am: 69d6f2840f
am: d8b92b4d82

Change-Id: Ic8a6bc7312c1a464104867e87daecf72bdcffaa9
2017-07-07 23:59:46 +00:00