Jerry Zhang
9d6aba32cb
Fix usb preference summary
...
In host mode, summary should not display
function info.
Bug: 77647931
Test: passes
Change-Id: Ic15849e12aa47df75cc75c9da0384e24627a9c8b
2018-04-09 13:52:43 -07:00
Jerry Zhang
dd3db23f18
Merge "Remove gear from usb preference" into pi-dev am: 631ee514ae
...
am: ba04287724
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
2018-04-09 12:45:56 -07:00
Jerry Zhang
ba04287724
Merge "Remove gear from usb preference" into pi-dev
...
am: 631ee514ae
2018-04-09 12:36:12 -07:00
HJ ChangLiao
47a64c8c33
[automerger skipped] Merge "GesturesSettingPreferenceController to Toggle" into pi-dev am: 283ac08e86
...
am: c10ae96139
2018-04-09 12:27:07 -07:00
Fan Zhang
d45b7cbe40
Merge "Use proper icon size for default app prefs." into pi-dev
...
am: 968dcaf41a
2018-04-09 12:27:02 -07:00
Julia Reynolds
65fe2137d8
Merge "Reorder visual effect fields" into pi-dev am: b90e5aff53
...
am: 2b5d069d4b
2018-04-09 12:18:36 -07:00
HJ ChangLiao
c10ae96139
Merge "GesturesSettingPreferenceController to Toggle" into pi-dev
...
am: 283ac08e86
2018-04-09 12:14:53 -07:00
Julia Reynolds
2b5d069d4b
Merge "Reorder visual effect fields" into pi-dev
...
am: b90e5aff53
2018-04-09 12:10:53 -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
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
Daniel Nishi
2e9e429741
Merge "Fix a crash in Storage Settings." into pi-dev
...
am: 4264653952
2018-04-09 11:54:44 -07:00
TreeHugger Robot
b90e5aff53
Merge "Reorder visual effect fields" into pi-dev
2018-04-09 18:52:25 +00:00
TreeHugger Robot
4264653952
Merge "Fix a crash in Storage Settings." into pi-dev
2018-04-09 18:40:40 +00:00
Andrew Sapperstein
3dcf1a1e27
Merge "Delete unused query_hint_text string." into pi-dev am: 39d634da53
...
am: 6b3fbf29bf
2018-04-09 11:19:43 -07:00
Andrew Sapperstein
26815d38ca
Merge "Update inherited actionBarStyle to DeviceDefault." into pi-dev am: fcca962bb7
...
am: 9acdb356a6
2018-04-09 11:11:51 -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
Andrew Sapperstein
6b3fbf29bf
Merge "Delete unused query_hint_text string." into pi-dev
...
am: 39d634da53
2018-04-09 11:00:59 -07:00
Andrew Sapperstein
9acdb356a6
Merge "Update inherited actionBarStyle to DeviceDefault." into pi-dev
...
am: fcca962bb7
2018-04-09 10:52:00 -07:00
Lei Yu
be52a5312a
Merge "Add NullPtrCheck when smearing in settings" into pi-dev am: c2ec26b4ac
...
am: f26e2fda76
2018-04-09 10:42:25 -07:00
TreeHugger Robot
39d634da53
Merge "Delete unused query_hint_text string." into pi-dev
2018-04-09 17:33:50 +00:00
TreeHugger Robot
fcca962bb7
Merge "Update inherited actionBarStyle to DeviceDefault." into pi-dev
2018-04-09 17:33:21 +00:00
Lei Yu
f26e2fda76
Merge "Add NullPtrCheck when smearing in settings" into pi-dev
...
am: c2ec26b4ac
2018-04-09 10:31:45 -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
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
2018-04-08 22:45:07 -07:00
John Li
5dca83ce24
Move these radio buttons to the left
...
am: 2df5a0b322
2018-04-08 22:39:53 -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
2018-04-08 17:11:27 -07:00
Erik Kline
3d5592ad31
Display Private DNS status in preference summary
...
am: 85c34077d3
2018-04-08 17:06:39 -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
Andrew Sapperstein
823cd12415
Update inherited actionBarStyle to DeviceDefault.
...
Was using a Material style. Now it's using the DeviceDefault one that
Theme.DeviceDefault.Settings uses.
Bug: 69314526
Test: visual inspection
Change-Id: I5ce1bbb51a8d067fce226ff4a41fdea64106156a
2018-04-08 12:33:27 -07:00
Andrew Sapperstein
4bd3007865
Delete unused query_hint_text string.
...
Change-Id: If6378768255c7cac290f914620115bff04c6b281
Fixes: 77772047
Test: compiles
2018-04-08 11:15:03 -07:00
Erik Kline
ef12e2f84e
Merge "Fix test expectations for NetworkCallbacks" into pi-dev am: 47c2eebc85
...
am: 3d6d43663e
2018-04-06 22:30:15 -07:00
Erik Kline
3d6d43663e
Merge "Fix test expectations for NetworkCallbacks" into pi-dev
...
am: 47c2eebc85
2018-04-06 22:19:21 -07:00
TreeHugger Robot
47c2eebc85
Merge "Fix test expectations for NetworkCallbacks" into pi-dev
2018-04-07 05:06:53 +00:00
Fan Zhang
5bb34f2782
[automerger skipped] Merge "Create help link placeholder for Wifi Direct settings." into pi-dev am: aeb33b72b3
...
am: 8d3068bf3b
2018-04-06 18:20:23 -07:00
Fan Zhang
8d3068bf3b
Merge "Create help link placeholder for Wifi Direct settings." into pi-dev
...
am: aeb33b72b3
2018-04-06 18:12:21 -07:00
TreeHugger Robot
aeb33b72b3
Merge "Create help link placeholder for Wifi Direct settings." into pi-dev
2018-04-07 01:04:52 +00:00
Doris Ling
ac2b789826
Merge "Adjust alignment for suggestion icon." into pi-dev am: 2d925f45b2
...
am: 137dcb6998
2018-04-06 16:37:03 -07:00
Bill Yi
abdcff575f
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: cd986c2c38 -s ours
...
am: 11c27313e6
2018-04-06 16:34:49 -07:00
Matthew Fritze
67bf80c9ab
Merge "Prioritize dynamic summaries" into pi-dev am: c29aec4bde
...
am: bd4ba55cac
2018-04-06 16:27:35 -07:00
