Hansong Zhang
7df9791d24
Merge changes from topic "am-e8b13d24-dee0-4f84-89d4-8a7d110f6ec1" into oc-dev am: d59b0eddae am: 3f2dbb7cc9
...
am: e934ea80a6
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
2018-04-09 14:08:48 -07:00
Makoto Onuki
9d9a79bb6c
Merge "Once auto-battery saver is ever set, don't show suggestion" into pi-dev am: 8064782d77
...
am: 24287ce1e1
2018-04-09 13:57:29 -07:00
Hansong Zhang
e934ea80a6
Merge changes from topic "am-e8b13d24-dee0-4f84-89d4-8a7d110f6ec1" into oc-dev am: d59b0eddae
...
am: 3f2dbb7cc9
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
2018-04-09 13:53:41 -07:00
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
Makoto Onuki
24287ce1e1
Merge "Once auto-battery saver is ever set, don't show suggestion" into pi-dev
...
am: 8064782d77
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
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
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: 4f58c19afae25ebddfdcee220e02387b2b84c617b1f00ebf9c4f58c19afae25ebddfdcee220e02387b2b84c6174f58c19afae25ebddfdcee220e02384f58c19afae25ebddfdc4f58c19afa
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
890283719a
Merge "Update DndCondition settings summary" into pi-dev am: 9fc72be6c8
...
am: 3153a0e540
2018-04-09 13:18:48 -07:00
Beverly Tai
3153a0e540
Merge "Update DndCondition settings summary" into pi-dev
...
am: 9fc72be6c8
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
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
Lei Yu
9d2c7e822b
Hide preference when no app restricted
...
Change-Id: I37135bce5354ce7380441f86f94cb79d89cc500c
Fixes: 77799629
Test: RunSettingsRoboTests
2018-04-09 12:23:52 -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
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
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
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
