Commit Graph

57262 Commits

Author SHA1 Message Date
Xin Li
f9b5a6bd07 Merge "Merge Android10 QPR1 into AOSP master"
am: bd2174cda1

Change-Id: Ia9a27e2d5b245f8e3b52b86e0a155fc40383c42e
2019-12-03 16:13:50 -08:00
Treehugger Robot
bd2174cda1 Merge "Merge Android10 QPR1 into AOSP master" 2019-12-03 23:14:56 +00:00
Quang Luong
810f7861f0 Merge "Use WifiPickerTracker to get connected WifiEntry" 2019-12-03 20:03:10 +00:00
Automerger Merge Worker
833c578b01 Battery saver mode should disable dark mode modification am: 5fb68ae95d
Change-Id: I9b4b1dace76a6194fafe27e624465c3c05823bb1
2019-12-03 19:34:32 +00:00
Jay Aliomer
5fb68ae95d Battery saver mode should disable dark mode modification
am: f4bc80c45c

Change-Id: Iff4cb52ba46e20bd012f95e9d29917f7952b4259
2019-12-03 09:47:41 -08:00
TreeHugger Robot
cecaa52ed9 Merge "Support installation of the new app source certificate" 2019-12-03 17:37:11 +00:00
Bonian Chen
5cf137e0bb [Settings] Enable support on testing
1. Support ActivityScenario
2. Support add Service through ShadowServiceManager

Bug: 140542283
Test: build pass
Change-Id: Ib1066394114fb6077e1fa82872f029e6ee2b5da9
2019-12-03 20:06:59 +08:00
Tsung-Mao Fang
be895aea4c Always use local timezone for parsing date
Use local time zone to be in line with entry
in phonesky mainline module.

Test: Rebuild
Bug: 143357811
Change-Id: I1ecf57ec7952cff580af932e58c453622d4536f0
2019-12-03 09:06:59 +00:00
tim peng
cef4313ea0 Merge "Add base dialog preference controller for new Bluetooth developer option" 2019-12-03 07:12:17 +00:00
tim peng
1082bca0ee Merge "Add base preference controller for new Bluetooth developer option" 2019-12-03 07:12:17 +00:00
tim peng
2e092f5f83 Merge "Add base preference for new Bluetooth developer option" 2019-12-03 07:11:59 +00:00
TreeHugger Robot
feb51e20e6 Merge "Remove framelayout to make focus don't have duplicate action" 2019-12-03 05:46:38 +00:00
Xin Li
b4fe2d062d Merge Android10 QPR1 into AOSP master
Bug: 145570283
Change-Id: I4a45c18c3ee945f3603921c60d0762e44e686688
2019-12-02 21:25:19 -08:00
hughchen
23d04125b5 Remove framelayout to make focus don't have duplicate action
Fixes: 131128155
Test: Manual
Change-Id: Ifb96698007a2bfafb545dbc04f61343160a41ef7
2019-12-03 11:52:50 +08:00
timhypeng
78b0edfe3c Add base dialog preference controller for new Bluetooth developer option
Bug: 142227996
Test: manual
Change-Id: I15335d9c783b5ddba1b93322449f345f450d587f
2019-12-03 09:35:53 +08:00
Jay Aliomer
f4bc80c45c Battery saver mode should disable dark mode modification
disable toggle options and disable the dark theme drop down selection

Test: make -j64 RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.display.DarkUIPreferenceControllerTest" && \
make -j64 RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.display.darkmode.DarkModeActivationPreferenceControllerTest" && \
make -j64 RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.display.darkmode.DarkModeObserverTest" && \
make -j64 RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.display.darkmode.DarkModeScheduleSelectorControllerTest"

Fixes: 	145098277
Fixes: 145297188
Fixes: 	145254016
Change-Id: I5c81a295810cc2d9a45657978104647e9c15da46
2019-12-02 18:19:52 +00:00
Abhijeet Kaur
af95719337 Merge "Make Settings UI fuse flag "settings_fuse" persistent" 2019-12-02 15:48:28 +00:00
TreeHugger Robot
7e117fba33 Merge "Reorganize notification Settings classes" 2019-12-02 13:54:05 +00:00
TreeHugger Robot
79efb45f0f Merge "Adjust preferene to align the lastest mock" 2019-12-02 10:26:09 +00:00
Raff Tsai
c6f4ff5486 Change icon
Test: rebuild
Fixes: 145242321
Screenshot: https://screenshot.googleplex.com/zLg7iWd0s66
Change-Id: I0425a44fd10f01d657c91b8633e415b0c19817f0
2019-12-02 08:53:57 +00:00
TreeHugger Robot
09abaa93dd Merge "Hide PIP related preference when device didn't support this feature" 2019-12-02 08:01:28 +00:00
Raff Tsai
91aa4b853a Adjust preferene to align the lastest mock
- Because removeAll in updateState will cause preference list janking,
move updateState code to displayPreference.

Bug: 141601408
Fixes: 145369584
Test: manual and robolectric
Change-Id: Ic6ffeedfdd7a64671e497a61894d7c0d443750ef
2019-12-02 15:13:50 +08:00
Edgar Wang
334c5b36ad Hide PIP related preference when device didn't support this feature
Fixes: 79945310
Test: atest & manual
Change-Id: I24b9de06ec94a008656cbbc016a50a4e217fece1
2019-12-02 15:01:32 +08:00
timhypeng
54d06d368d Add base preference controller for new Bluetooth developer option
Bug: 142227996
Test: make -j50 RunSettingsRoboTests
Change-Id: I9d10019228bc575f4ac38494e4dd27d672d5da6d
2019-12-02 14:45:42 +08:00
Raff Tsai
ed1b808474 Fix testcase error
- ignore testcase in MobileNetworkActivityTest
- To avoid null pointer access in LocationForWorkPreferenceController,
move mUserManager initialization in constructor

Test: make RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.search"
Change-Id: Icf6c36ecef22149def6d5924741a798e8f506033
2019-12-02 12:11:29 +08:00
TreeHugger Robot
0a2a6cfef7 Merge "Add page creation latency for updatePreferenceStates" 2019-12-02 02:44:00 +00:00
Goven Liu
df1118d61c Merge "[Wi-Fi] Add one network request case for adding Wi-Fi for apps feature." 2019-11-29 03:28:05 +00:00
Bonian Chen
9b26611ce1 Merge "Consider subId when loading Wfc string resources" am: 9c2c1b4784 am: 944689abd6
am: 6c1861b3c0

Change-Id: I3d8c02c344d0aa70952dca9aac6597ca6b36a4db
2019-11-28 07:30:09 -08:00
Bonian Chen
6c1861b3c0 Merge "Consider subId when loading Wfc string resources" am: 9c2c1b4784
am: 944689abd6

Change-Id: I6bfa2099cdb382109c90f0c3b9ea76a2a7df4d19
2019-11-28 07:28:07 -08:00
Bonian Chen
944689abd6 Merge "Consider subId when loading Wfc string resources"
am: 9c2c1b4784

Change-Id: Ib680198aff74daa31d5ca0413ca3dd869b3126af
2019-11-28 07:26:07 -08:00
Bonian Chen
9c2c1b4784 Merge "Consider subId when loading Wfc string resources" 2019-11-28 15:22:21 +00:00
TreeHugger Robot
702cc1d223 Merge "Fix bottom zone is transparent in add network page" 2019-11-28 11:45:23 +00:00
Tsung-Mao Fang
a641cdae50 Fix bottom zone is transparent in add network page
Override clipToPadding and clipToChildren attributes
to prevent view from overlapping problem.

Change-Id: I3493d80d89950545ea74b76e25c6f55069f83f5e
Fix: 145332638
Test: visual
2019-11-28 17:25:08 +08:00
timhypeng
fdd98bd9ff Add base preference for new Bluetooth developer option
Bug: 142227996
Test: manual
Change-Id: I23c11072a326473bdc7ce169c6c2fb970a8f828d
2019-11-28 17:09:36 +08:00
Neil Fuller
5d49eeb3d5 [automerger skipped] Merge "Switch settings to use TimeDetector" am: d32eee26e3 am: 5ef64ad89b
am: 3296857f38 -s ours
am skip reason: change_id I671bf0e7e7364f64f1397d524c6277591eb4e22e with SHA1 9861696306 is in history

Change-Id: I0d02b8b75e2e5481946fead9520b14b7e21f8789
2019-11-28 01:04:26 -08:00
Sunny Shao
e5e82400ac Add page creation latency for updatePreferenceStates
- The updatePreferenceStates is called in the onResume. Here creates a new enum to
  record the elapsed time.

Bug: 137558156
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.dashboard
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.core
Change-Id: I02bdbeecd61fbc0082eea19ea64cbfe7541a6970
2019-11-28 17:00:31 +08:00
Neil Fuller
3296857f38 Merge "Switch settings to use TimeDetector" am: d32eee26e3
am: 5ef64ad89b

Change-Id: I8901a6595677380013cc3d063426a4dfead18b97
2019-11-28 00:59:44 -08:00
Neil Fuller
5ef64ad89b Merge "Switch settings to use TimeDetector"
am: d32eee26e3

Change-Id: I1f3c05b986768be9c29043eea51143d6ab22bd12
2019-11-28 00:54:40 -08:00
Neil Fuller
d32eee26e3 Merge "Switch settings to use TimeDetector" 2019-11-28 08:47:32 +00:00
govenliu
7b6b93b4f8 [Wi-Fi] Add one network request case for adding Wi-Fi for apps feature.
Handle adding one network case, add UI components and process saving/connecting flow.

Bug: 136472483
Test: Add unit test cases to test one network in list case and null list case, and also check if the SSID set correct or not.
Change-Id: I99f804a967575538c9dc3f1faabb2b507e92e558
2019-11-28 16:39:06 +08:00
TreeHugger Robot
913bde21ff Merge "Make some existing slices public." 2019-11-28 08:12:01 +00:00
TreeHugger Robot
c0662d26c2 Merge "Make some accessibility related slices public." 2019-11-28 08:12:01 +00:00
TreeHugger Robot
a9dcd4d726 Merge "Make some gesture related slices public." 2019-11-28 08:12:01 +00:00
TreeHugger Robot
97b9b3debe Merge "Make some device info related slices public." 2019-11-28 08:12:01 +00:00
TreeHugger Robot
ec422880b1 Merge changes from topic "expose_slices"
* changes:
  Make some display related slices public.
  Make all TogglePreferenceController slice-able.
2019-11-28 08:12:01 +00:00
Yi-Ling Chuang
2516848b30 Make some device info related slices public.
Only PreferenceControllers with isPublicSlice() set to true are exposed
to other apps. Others will be Settings only.

Bug: 141088937
Test: robotests
Change-Id: Id38fd0203a4efc812e30990491786b4d8aff8902
2019-11-28 14:38:30 +08:00
Yi-Ling Chuang
430c16c012 Make some existing slices public.
Only PreferenceControllers with isPublicSlice() set to true are exposed
to other apps. Others will be Settings only.

Bug: 141088937
Test: robotests
Change-Id: I5934e89bc1b268fdd44acd630621fa46987728ff
2019-11-28 14:32:15 +08:00
Yi-Ling Chuang
30a62c074c Make some accessibility related slices public.
Only PreferenceControllers with isPublicSlice() set to true are exposed
to other apps. Others will be Settings only.

Bug: 141088937
Test: robotests
Change-Id: If0fa79f7c270b10f8f1a47cb5f914d19566dedfb
2019-11-28 14:31:48 +08:00
Yi-Ling Chuang
1089f7c695 Make some gesture related slices public.
Only PreferenceControllers with isPublicSlice() set to true are exposed
to other apps. Others will be Settings only.

Bug: 141088937
Test: robotests
Change-Id: I0b54e752c5982f13193590db47dc3a84dde5311d
2019-11-28 14:31:00 +08:00
Yi-Ling Chuang
31719321af Make some display related slices public.
Only PreferenceControllers with isPublicSlice() set to true are exposed
to other apps. Others will be Settings only.

Bug: 141088937
Test: robotests
Change-Id: I2a36da4ac4bb14a4d2ac7b89ab2bb3ebf8e655f7
2019-11-28 14:29:33 +08:00