Commit Graph

44844 Commits

Author SHA1 Message Date
Andrew Sapperstein
26815d38ca Merge "Update inherited actionBarStyle to DeviceDefault." into pi-dev am: fcca962bb7
am: 9acdb356a6

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

Change-Id: I70b98e3541ab25e4f621f7c4fedfd1255f0b0765
2018-04-09 11:00:59 -07:00
Andrew Sapperstein
9acdb356a6 Merge "Update inherited actionBarStyle to DeviceDefault." into pi-dev
am: fcca962bb7

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

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

Change-Id: Icf0eb026ed251b2b0f34ac8e522c37d21667fa15
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
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
caxtonchan
4964685a2e [Settings] Align volume slider with other preference
Update padding to align with other preference.

Bug: 77606803
Test: Robotest and manual test
Change-Id: I3f81bf0a6c796465128d05260f4a50e23db45385
2018-04-09 18:48:17 +08: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
ryanywlin
e35464711e Add new string for audio switcher
Bug: 74130772
Test: rebuild
Change-Id: I31760046ca1754145dfa40049428213f985e8175
2018-04-09 08:44:21 +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
5dca83ce24 Move these radio buttons to the left
am: 2df5a0b322

Change-Id: Ie2513c98c3eac7d9dca7ad64e5a799eacc0799da
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
Jeff Sharkey
2af67a9302 Update storage wizard to latest UX mocks.
Mostly shuffling around strings and layouts.  Slow device warning is
now a full-screen activity, and format warning is now a dialog.

Bug: 76097999
Test: atest com.android.settings.ui.StorageWizardTest
Change-Id: Ifd74e3b1389f0cc9590f6a6a2cd49671f3bbc746
2018-04-08 20:06:27 -06: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
3d5592ad31 Display Private DNS status in preference summary
am: 85c34077d3

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

Change-Id: Id4f7d846ac723b807ba60e2fbb2ac73ece88bae1
2018-04-06 22:30:15 -07:00
Erik Kline
3d6d43663e Merge "Fix test expectations for NetworkCallbacks" into pi-dev
am: 47c2eebc85

Change-Id: Id9ad03e3df258d4e65a0ee9875499554be7c5cd2
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  -s ours

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

Change-Id: I92c91bfcda90f55312572fa928c04f7ff6f2a70b
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
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
Doris Ling
ac2b789826 Merge "Adjust alignment for suggestion icon." into pi-dev am: 2d925f45b2
am: 137dcb6998

Change-Id: I8b4d9f6c29ea07092f95683d5b076ed0b9046d02
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  -s ours

Change-Id: I9655a38f71906d39ac0b7a05b74f46f87ad8aae1
2018-04-06 16:34:49 -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
Doris Ling
137dcb6998 Merge "Adjust alignment for suggestion icon." into pi-dev
am: 2d925f45b2

Change-Id: Id29c00047d3a3261f1ef567c56499e44e0973db6
2018-04-06 16:11:48 -07:00
Fan Zhang
0cd2ccfe30 Create help link placeholder for Wifi Direct settings.
Change-Id: Ia22259d191d2663d7ef63438c680826d3fd590fb
Merged-In: Ia22259d191d2663d7ef63438c680826d3fd590fb
Fixes: 70854725
Test: robotests
2018-04-06 23:06:36 +00:00
Doris Ling
2d925f45b2 Merge "Adjust alignment for suggestion icon." into pi-dev 2018-04-06 23:00:30 +00:00
TreeHugger Robot
0391597948 Merge "Create help link placeholder for Wifi Direct settings." 2018-04-06 22:58:31 +00: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
Bill Yi
11c27313e6 [automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am: cd986c2c38  -s ours

Change-Id: Ib90910def317a57ec5f961b742ce380ad2cec06a
2018-04-06 15:54:50 -07:00
Matthew Fritze
bd4ba55cac Merge "Prioritize dynamic summaries" into pi-dev
am: c29aec4bde

Change-Id: Iaacc14c7da4f3957f940c44c70c57c2f77c97d00
2018-04-06 15:52:40 -07:00
TreeHugger Robot
cd986c2c38 Merge "Import translations. DO NOT MERGE" into pi-dev 2018-04-06 22:42:17 +00: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
Fan Zhang
1deac101a0 Create help link placeholder for Wifi Direct settings.
Change-Id: Ia22259d191d2663d7ef63438c680826d3fd590fb
Bug: 70854725
Test: robotests
2018-04-06 22:00:10 +00:00
Mehdi Alizadeh
a220a524fa Merge "Adds strings for Swipe Up gesture in Settings" into pi-dev am: 3ac16896b9
am: 3e2897b6cd

Change-Id: I8cc22d4977f3289d23857e57631d6734eb7821da
2018-04-06 14:57:22 -07:00