Commit Graph

4579 Commits

Author SHA1 Message Date
Doris Ling
2add0178ce Fix robotest failure for ChartDataUsagePreferenceTest. am: c8613c7930
am: a98c2cfdf1

Change-Id: I4549d3b8f56a9fc97056a8ed03f296ce7954308b
2018-04-09 21:23:44 -07:00
Salvador Martinez
58fc3deab2 Merge "Make it possible to have open tether network" into pi-dev am: b410c21a01
am: 0cbce4983f

Change-Id: I59e11a84ab1dce03e7e9ab5afed816cb27313b1d
2018-04-09 19:27:48 -07:00
Doris Ling
c8613c7930 Fix robotest failure for ChartDataUsagePreferenceTest.
- the chart usage data is computed using difference between current time
and the timestamp from the usage data. In the test, we are using actual
current time and mock usage data. As the current time varies the test
computating sometimes results in some negative data, and makes the
comparison unpredictable. Change to use a fix "current" time in the test
so that the time difference in computation will be constant.

Fixes: 77824818
Test: make RunSettingsRoboTests
Change-Id: I2d8c166839775469d30015317afdc04eb3d9a2b4
2018-04-09 18:12:46 -07:00
Salvador Martinez
b410c21a01 Merge "Make it possible to have open tether network" into pi-dev 2018-04-09 23:30:35 +00:00
Christine Franks
036cf51ac4 Merge "Remove Automatic color mode option" into pi-dev am: 0c92430be4
am: 00606b5d2a

Change-Id: I31fa05e75ddadbf11cd670e2b89455d222212b3e
2018-04-09 14:44:56 -07:00
Christine Franks
0c92430be4 Merge "Remove Automatic color mode option" into pi-dev 2018-04-09 21:18:28 +00:00
Beverly Tai
890283719a Merge "Update DndCondition settings summary" into pi-dev am: 9fc72be6c8
am: 3153a0e540

Change-Id: I551283fe04d4df1d2dd492c91ec7589e0f94aa12
2018-04-09 13:18:48 -07:00
Beverly Tai
9fc72be6c8 Merge "Update DndCondition settings summary" into pi-dev 2018-04-09 19:54:24 +00:00
Jerry Zhang
dd3db23f18 Merge "Remove gear from usb preference" into pi-dev am: 631ee514ae
am: ba04287724

Change-Id: Ic0b801330f581e23a93fa81c1a2b18aa2238c07c
2018-04-09 12:54:19 -07:00
Fan Zhang
c7e36d940d Merge "Use proper icon size for default app prefs." into pi-dev am: 968dcaf41a
am: d45b7cbe40

Change-Id: I0f77ebaeb861fd4a15ec31abb1d6728b5dde1788
2018-04-09 12:45:56 -07:00
Julia Reynolds
65fe2137d8 Merge "Reorder visual effect fields" into pi-dev am: b90e5aff53
am: 2b5d069d4b

Change-Id: I1e0eac8dfb3f9dde02c29b540af381e45fb10eec
2018-04-09 12:18:36 -07:00
TreeHugger Robot
631ee514ae Merge "Remove gear from usb preference" into pi-dev 2018-04-09 19:08:26 +00:00
Daniel Nishi
df2b3c6d18 Merge "Fix a crash in Storage Settings." into pi-dev am: 4264653952
am: 2e9e429741

Change-Id: If6c37a67c623875735dd90bd8fbc4abfbf5f629d
2018-04-09 12:06:46 -07:00
TreeHugger Robot
968dcaf41a Merge "Use proper icon size for default app prefs." into pi-dev 2018-04-09 19:04:22 +00:00
TreeHugger Robot
283ac08e86 Merge "GesturesSettingPreferenceController to Toggle" into pi-dev 2018-04-09 18:59:44 +00:00
TreeHugger Robot
b90e5aff53 Merge "Reorder visual effect fields" into pi-dev 2018-04-09 18:52:25 +00:00
Salvador Martinez
670a3e582f Make it possible to have open tether network
Previously people could have open tether networks but a restrction
was placed on this sometime in the past. However there is no migration
plan in place for people with open tether networks which will cause
problems when the new requirements are enforced. This CL makes it
so tether networks can be open once more.

Test: robotests
Bug: 65784990
Change-Id: I6e350dd53b9b9f987dd5a4cc317ba18d7f50df79
2018-04-09 11:30:37 -07:00
Jerry Zhang
07a4c25fc1 Remove gear from usb preference
Switch from GearPreference to a normal
Preference.

Add some spacing underneath the power role.

Bug: 77647931
Test: passes
Change-Id: Ic15849e12aa47df75cc75c9da0384e24627a9c8b
2018-04-09 11:08:48 -07:00
Lei Yu
be52a5312a Merge "Add NullPtrCheck when smearing in settings" into pi-dev am: c2ec26b4ac
am: f26e2fda76

Change-Id: I71949412d9b4cf5890833a03a00cd903d0fc5784
2018-04-09 10:42:25 -07:00
Fan Zhang
e0d2140256 Use proper icon size for default app prefs.
Change-Id: Ib48c7a546fcd3a3a9e32b7a65cbdadd54721f252
Fixes: 77726902
Test: robotests
2018-04-09 10:29:58 -07:00
Daniel Nishi
f5ba67dc40 Fix a crash in Storage Settings.
This prevents a NullPtrException when the DonutView attempts to shrink
the percentage sign. By gracefully falling back when we don't understand
the percentage sign, we can avoid a crash.

Change-Id: I0b0770ce4b51eb30817dc556636f86476f4cd1bf
Fixes: 77653937
Test: Robotest -- screenshot attached
2018-04-09 10:21:50 -07:00
Lei Yu
c2ec26b4ac Merge "Add NullPtrCheck when smearing in settings" into pi-dev 2018-04-09 17:09:22 +00:00
TreeHugger Robot
00b336bcfb Merge "GesturesSettingPreferenceController to Toggle" 2018-04-09 16:46:57 +00:00
Beverly
98c63ed1c7 Update DndCondition settings summary
Test: make ROBOTEST_FILTER=ZenModeSettingsTest RunSettingsRoboTests -j40
Test: atest DndConditionTest
Change-Id: Iff39e9dfda25453bfe4c2554fea3ef7be0832413
Fixes: 77704156
Fixes: 76208187
2018-04-09 11:05:35 -04:00
Julia Reynolds
9c3e2f6ceb Reorder visual effect fields
Bug: 77657376
Test: RunSettingsRoboTests
Change-Id: I9f5be8f173d8d987d419f6d444d76d2abe175b4e
2018-04-09 10:18:29 -04:00
Victor Chang
25c0c763e7 Merge "Remove the feature flag and dead code for the old time zone picker" 2018-04-09 12:30:02 +00:00
HJ ChangLiao
3c4c3fc5c7 GesturesSettingPreferenceController to Toggle
Convert GesturesSettingPreferenceController to
TogglePreferenceController,
All of its children need follow the change,
add setter and robotest for them:
AssistGestureSettingsPreferenceController
DoubleTapPowerPreferenceController
DoubleTapScreenPreferenceController
DoubleTwistPreferenceController
PickupGesturePreferenceController
SwipeToNotificationPreferenceController

Change-Id: I792b2d370eea828bf345fb2b1cc3eac260eb66f4
Merged-In: I792b2d370eea828bf345fb2b1cc3eac260eb66f4
Fixes: 74913806
Fixes: 67998110
Fixes: 67998098
Fixes: 67998048
Fixes: 67998069
Fixes: 67997452
Test: make RunSettingsRoboTests
2018-04-09 09:08:41 +00:00
HJ ChangLiao
22f53c0274 GesturesSettingPreferenceController to Toggle
Convert GesturesSettingPreferenceController to
TogglePreferenceController,
All of its children need follow the change,
add setter and robotest for them:
AssistGestureSettingsPreferenceController
DoubleTapPowerPreferenceController
DoubleTapScreenPreferenceController
DoubleTwistPreferenceController
PickupGesturePreferenceController
SwipeToNotificationPreferenceController

Change-Id: I792b2d370eea828bf345fb2b1cc3eac260eb66f4
Fixes: 74913806
Fixes: 67998110
Fixes: 67998098
Fixes: 67998048
Fixes: 67998069
Fixes: 67997452
Test: make RunSettingsRoboTests
2018-04-09 15:27:32 +08:00
John Li
9914ef7635 Move these radio buttons to the left am: 2df5a0b322
am: 5dca83ce24

Change-Id: Ia3ec5eda8cfb59f2d2d97de9d369c180d438490c
2018-04-08 22:45:07 -07:00
John Li
2df5a0b322 Move these radio buttons to the left
Assign new single layout to RadioButtonPreference for w/ or w/o icon
and call setIconSpaceReserved(false) in RadioButtonPreference's
constructor. In case of having icon, calling setIcon() can make
icon_frame visible.

Bug: 70850017
Test: m -j56 SettingsRoboTests RunSettingsRoboTests
Change-Id: I8b35f75b6d8114a5e4c69ec1a3287c55e764ffe0
2018-04-09 12:10:59 +08:00
Erik Kline
d77ac78c37 Display Private DNS status in preference summary am: 85c34077d3
am: 3d5592ad31

Change-Id: I57bbe57fedd650440ca107fd89a51fd0885beadd
2018-04-08 17:11:27 -07:00
Erik Kline
85c34077d3 Display Private DNS status in preference summary
Also: fix a bug where the actual current mode is not read correctly
from settings on initialization.

Test: as follows
    - built, flashed, booted
    - manual test behaves as expected
    - make -j50 RunSettingsRoboTests ROBOTEST_FILTER=PrivateDnsModeDialogPreferenceTest passes
    - make -j50 RunSettingsRoboTests ROBOTEST_FILTER=PrivateDnsPreferenceControllerTest passes
Bug: 34953048
Bug: 64133961
Change-Id: I0b845b3894a47b837abf5de273d1ada642ef5a23
2018-04-08 15:50:58 -07:00
Erik Kline
ef12e2f84e Merge "Fix test expectations for NetworkCallbacks" into pi-dev am: 47c2eebc85
am: 3d6d43663e

Change-Id: Id4f7d846ac723b807ba60e2fbb2ac73ece88bae1
2018-04-06 22:30:15 -07:00
TreeHugger Robot
47c2eebc85 Merge "Fix test expectations for NetworkCallbacks" into pi-dev 2018-04-07 05:06:53 +00:00
Christine Franks
91490d4cd9 Remove Automatic color mode option
This is not yet implemented and should not appear as an option.

Bug: 76420446
Test: make RunSettingsRoboTests -j100

Change-Id: I40f1f48cc93417536a1680923c7628139a0534b1
2018-04-06 17:41:57 -07:00
Matthew Fritze
67bf80c9ab Merge "Prioritize dynamic summaries" into pi-dev am: c29aec4bde
am: bd4ba55cac

Change-Id: I6aaa0f91e91fd0cfe19578935a539393c289d63e
2018-04-06 16:27:35 -07:00
Lei Yu
c5f5b18b22 Add NullPtrCheck when smearing in settings
This only happens in new device with broken power_profile.xml, in
which it doesn't have screen power model.

This CL catches the null pointer crash and log it.

Change-Id: Iac23e3a8fc51385bdb22979c4b59000319f6fd49
Fixes: 74617269
Test: RunSettingsRoboTests
2018-04-06 15:57:44 -07:00
TreeHugger Robot
c29aec4bde Merge "Prioritize dynamic summaries" into pi-dev 2018-04-06 22:29:02 +00:00
Julia Reynolds
61478b7049 Merge "Make volume sliders sliceable" into pi-dev am: 4ef7b5f97b
am: 3fa5b4fad4

Change-Id: Idcbc7acf0343ff74f198ea960b8e6ca3d2e16a20
2018-04-06 15:09:22 -07:00
Lei Yu
4afd56362a Merge "Add test for anomaly detection in P" into pi-dev am: e0864a030f
am: 84b0cbc3ee

Change-Id: Ia86a5ecdfb2e449d4c78dc603a9cd24c311ced0a
2018-04-06 14:51:06 -07:00
Matthew Fritze
8db4358f76 Prioritize dynamic summaries
If both Xml and a controller provide a summary,
the controller's should be prioritized.

Change-Id: I030746b0f253ce4884a7868e385069b208f63082
Fixes: 77602860
Test: robotests
2018-04-06 14:11:50 -07:00
Erik Kline
fabbd1730c Fix test expectations for NetworkCallbacks
Test: as follows
    - built
    - flashed
    - booted
    - make -j50 RunSettingsRoboTests ROBOTEST_FILTER=WifiMasterSwitchPreferenceControllerTest
Bug: 64133961
Bug: 77285360
Change-Id: I1ada2888d0c5517f3bcde646bf8efab331330cfd
2018-04-06 14:10:30 -07:00
arangelov
9993ea833a Merge "Change "More details" to "Learn more" in policy transparency dialog." into pi-dev am: 22a12c0ea2
am: a739a63880

Change-Id: Ib61bc1739cff8b7cb63ead4104febc553d4d0c45
2018-04-06 13:59:46 -07:00
Lei Yu
ebb18819b7 Merge "Add battery illustration" into pi-dev am: 3035d45a8f
am: 0c43bd4c36

Change-Id: Id80603471c5ac9d1ea68417bc27b5f2c77dd1dcf
2018-04-06 13:51:07 -07:00
Lei Yu
2678c6e34a Merge "Add name and icon for AOD" into pi-dev am: f9cea645e1
am: 17c2906404

Change-Id: I9bf3646637a790e58a19f735ac9cfc1fa5f88889
2018-04-06 13:48:32 -07:00
Julia Reynolds
4ef7b5f97b Merge "Make volume sliders sliceable" into pi-dev 2018-04-06 20:48:31 +00:00
TreeHugger Robot
e0864a030f Merge "Add test for anomaly detection in P" into pi-dev 2018-04-06 20:46:00 +00:00
TreeHugger Robot
22a12c0ea2 Merge "Change "More details" to "Learn more" in policy transparency dialog." into pi-dev 2018-04-06 20:35:41 +00:00
TreeHugger Robot
3035d45a8f Merge "Add battery illustration" into pi-dev 2018-04-06 20:26:24 +00:00
TreeHugger Robot
f9cea645e1 Merge "Add name and icon for AOD" into pi-dev 2018-04-06 20:19:21 +00:00