Commit Graph

44539 Commits

Author SHA1 Message Date
Hansong Zhang
9b8c565932 [automerger skipped] [automerger] DO NOT MERGE Fix unexpected behavior in Bluetooth pairing am: ac6c49d2b0 am: 5b98c9f4a3 am: dfe4cc74f7 skipped: d276b38666 am: 5d27bdb6d2 am: bab8dca667 am: 84061c71d1 am: 41be25548e skipped: 74ff24d1c6 am: c4127072f4 am: 1b7566cd07 am: af077f8d4c -s ours
am: 3369767245

Change-Id: I9636196aa422a8a31148a3ed5684d567967a9891
2018-04-09 14:25:07 -07:00
Julia Reynolds
d7815fe18f Notification settings updates
- smaller icons
- text update
- fx header
- fix category header

Test: make -j RunSettingsRoboTests

Change-Id: If822d6db31a8dccf20ee88182cda1aee34aa7675
Fixes: 77325154
Fixes: 77323406
Fixes: 77324677
Fixes: 74408368
2018-04-09 17:24:09 -04:00
Christine Franks
0c92430be4 Merge "Remove Automatic color mode option" into pi-dev 2018-04-09 21:18:28 +00:00
Hansong Zhang
7df9791d24 Merge changes from topic "am-e8b13d24-dee0-4f84-89d4-8a7d110f6ec1" into oc-dev am: d59b0eddae am: 3f2dbb7cc9
am: e934ea80a6

Change-Id: I17aa86fa2a02f1a80e9ec8aaa557c3488dd32c21
2018-04-09 14:10:21 -07:00
Hansong Zhang
3369767245 [automerger skipped] [automerger] DO NOT MERGE Fix unexpected behavior in Bluetooth pairing am: ac6c49d2b0 am: 5b98c9f4a3 am: dfe4cc74f7 skipped: d276b38666 am: 5d27bdb6d2 am: bab8dca667 am: 84061c71d1 am: 41be25548e skipped: 74ff24d1c6 am: c4127072f4 am: 1b7566cd07
am: af077f8d4c  -s ours

Change-Id: I834e60da9920199756dce2206042e4a1ba0c20b9
2018-04-09 14:08:48 -07:00
Hansong Zhang
e934ea80a6 Merge changes from topic "am-e8b13d24-dee0-4f84-89d4-8a7d110f6ec1" into oc-dev am: d59b0eddae
am: 3f2dbb7cc9

Change-Id: Ica684d7a7fc36439111b7eeb3886761f63a7130f
2018-04-09 13:54:58 -07:00
Hansong Zhang
af077f8d4c [automerger] DO NOT MERGE Fix unexpected behavior in Bluetooth pairing am: ac6c49d2b0 am: 5b98c9f4a3 am: dfe4cc74f7 skipped: d276b38666 am: 5d27bdb6d2 am: bab8dca667 am: 84061c71d1 am: 41be25548e skipped: 74ff24d1c6 am: c4127072f4
am: 1b7566cd07

Change-Id: I10c2d233f05ddf566ac38afb7c2cdc5a8e61df25
2018-04-09 13:53:41 -07:00
Makoto Onuki
24287ce1e1 Merge "Once auto-battery saver is ever set, don't show suggestion" into pi-dev
am: 8064782d77

Change-Id: Ic672531ae914694b5c88dd96d7f7b71c0a6e1620
2018-04-09 13:46:52 -07:00
Hansong Zhang
3f2dbb7cc9 Merge changes from topic "am-e8b13d24-dee0-4f84-89d4-8a7d110f6ec1" into oc-dev
am: d59b0eddae

Change-Id: Ia628cc0bd02429ec321d8e80c9d9ad2c097715bd
2018-04-09 13:44:07 -07:00
Hansong Zhang
1b7566cd07 [automerger] DO NOT MERGE Fix unexpected behavior in Bluetooth pairing am: ac6c49d2b0 am: 5b98c9f4a3 am: dfe4cc74f7 skipped: d276b38666 am: 5d27bdb6d2 am: bab8dca667 am: 84061c71d1 am: 41be25548e skipped: 74ff24d1c6
am: c4127072f4

Change-Id: I559bfa947ae6f7ee89076d05826fd4529d6b0cc2
2018-04-09 13:43:04 -07:00
TreeHugger Robot
d59b0eddae Merge changes from topic "am-e8b13d24-dee0-4f84-89d4-8a7d110f6ec1" into oc-dev
* changes:
  [automerger] DO NOT MERGE Fix unexpected behavior in Bluetooth pairing am: 4f58c19afa am: e25ebddfdc am: ee220e0238 am: 7b2b84c617 skipped: b1f00ebf9c
  [automerger] DO NOT MERGE Fix unexpected behavior in Bluetooth pairing am: 4f58c19afa am: e25ebddfdc am: ee220e0238 am: 7b2b84c617
  [automerger] DO NOT MERGE Fix unexpected behavior in Bluetooth pairing am: 4f58c19afa am: e25ebddfdc am: ee220e0238
  [automerger] DO NOT MERGE Fix unexpected behavior in Bluetooth pairing am: 4f58c19afa am: e25ebddfdc
  [automerger] DO NOT MERGE Fix unexpected behavior in Bluetooth pairing am: 4f58c19afa
  DO NOT MERGE Fix unexpected behavior in Bluetooth pairing
2018-04-09 20:29:54 +00:00
Makoto Onuki
8064782d77 Merge "Once auto-battery saver is ever set, don't show suggestion" into pi-dev 2018-04-09 20:29:30 +00:00
Beverly Tai
3153a0e540 Merge "Update DndCondition settings summary" into pi-dev
am: 9fc72be6c8

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

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

Change-Id: I75b3068f415b6d1908e9579ca42a35049425a255
2018-04-09 12:27:02 -07:00
Lei Yu
9d2c7e822b Hide preference when no app restricted
Change-Id: I37135bce5354ce7380441f86f94cb79d89cc500c
Fixes: 77799629
Test: RunSettingsRoboTests
2018-04-09 12:23:52 -07:00
HJ ChangLiao
c10ae96139 Merge "GesturesSettingPreferenceController to Toggle" into pi-dev
am: 283ac08e86

Change-Id: Iff2c0533984a32dbe58e264e85d4ef9380218469
2018-04-09 12:14:53 -07:00
Julia Reynolds
2b5d069d4b Merge "Reorder visual effect fields" into pi-dev
am: b90e5aff53

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

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