Bill Yi
c4da62b4f9
Merge changes from topic "presubmit-am-35921ce6adc648e489af26a77e4b0f36" into sc-qpr1-dev am: 7793bd6b17
am: dc4bd7f721
am: ffcdc25bb6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16712348
Change-Id: I112c8cf892227e9e1297362174dba0c29a56870c
2022-01-28 03:56:58 +00:00
Bill Yi
9a3ff1ac81
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: e4ca28a0d0
am: 86cab2cd66
-s ours am: a85b3c079b
-s ours am: 47050372c7
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16712348
Change-Id: I8c03d6a2b9d6582aa9c27a67adc5fdc2f97d01ef
2022-01-28 03:56:47 +00:00
Bill Yi
ffcdc25bb6
Merge changes from topic "presubmit-am-35921ce6adc648e489af26a77e4b0f36" into sc-qpr1-dev am: 7793bd6b17
am: dc4bd7f721
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16712348
Change-Id: I54f091eb6314a2f3efed35e88e7f398087dca3b2
2022-01-28 03:33:19 +00:00
Bill Yi
47050372c7
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: e4ca28a0d0
am: 86cab2cd66
-s ours am: a85b3c079b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16712348
Change-Id: Ib19651ad473c7c1e3ed2bdb56eabf771a3617bd9
2022-01-28 03:33:15 +00:00
Bill Yi
dc4bd7f721
Merge changes from topic "presubmit-am-35921ce6adc648e489af26a77e4b0f36" into sc-qpr1-dev am: 7793bd6b17
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16712348
Change-Id: Ie9fb258fd1c063363b545a0bb5db659f3f207bb4
2022-01-28 03:13:54 +00:00
Bill Yi
a85b3c079b
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: e4ca28a0d0
am: 86cab2cd66
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16712348
Change-Id: Ia0e06bf03996897f9619d2e62b899ffd5878b4b5
2022-01-28 03:13:52 +00:00
Bill Yi
61efb14d7f
Merge changes from topic "presubmit-am-35921ce6adc648e489af26a77e4b0f36" into sc-mainline-prod am: d326cb4ae3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16712348
Change-Id: I7417fb27cef002c7f9d24978a43c8d766e8006fe
2022-01-28 03:12:58 +00:00
Bill Yi
1d0243cc5c
Merge "Import translations. DO NOT MERGE ANYWHERE"
2022-01-28 02:54:56 +00:00
Bill Yi
7793bd6b17
Merge changes from topic "presubmit-am-35921ce6adc648e489af26a77e4b0f36" into sc-qpr1-dev
...
* changes:
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: e4ca28a0d0
Import translations. DO NOT MERGE ANYWHERE
2022-01-28 02:54:43 +00:00
Bill Yi
d326cb4ae3
Merge changes from topic "presubmit-am-35921ce6adc648e489af26a77e4b0f36" into sc-mainline-prod
...
* changes:
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: e4ca28a0d0
Import translations. DO NOT MERGE ANYWHERE
2022-01-28 02:54:43 +00:00
Bill Yi
f28b7ace82
Merge changes from topic "presubmit-am-35921ce6adc648e489af26a77e4b0f36"
...
* changes:
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: e4ca28a0d0
2p: c09b5ba58d
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: e4ca28a0d0
Import translations. DO NOT MERGE ANYWHERE
2022-01-28 02:54:43 +00:00
Bill Yi
83c91187f1
Merge "Import translations. DO NOT MERGE ANYWHERE"
2022-01-28 02:54:28 +00:00
TreeHugger Robot
0ae266c6fb
Merge "Add dark theme custom type into the dark theme settings page"
2022-01-28 01:59:07 +00:00
PETER LIANG
3774ff6813
Merge changes Ideea8589,Id8fe4fb6
...
* changes:
New feature “Text and reading options” for SetupWizard, Wallpaper, and Settings (9/n).
New feature “Text and reading options” for SetupWizard, Wallpaper, and Settings (8/n).
2022-01-28 00:58:40 +00:00
Junyu Lai
893c1ee0cc
Merge "[MS49] Remove NetworkStats hidden Api usages"
2022-01-28 00:42:44 +00:00
Kevin Han
c721a44f20
Merge "Pull unused app count from PermissionController"
2022-01-27 23:50:03 +00:00
TreeHugger Robot
a36e4349ba
Merge "Update BrightnessInfo construction in tests"
2022-01-27 23:21:30 +00:00
TreeHugger Robot
24ab172153
Merge "Clarify language and fix typo."
2022-01-27 23:00:03 +00:00
TreeHugger Robot
b27bad5154
Merge "Ask user to reboot when enabling freeform and desktop mode"
2022-01-27 22:55:30 +00:00
TreeHugger Robot
49e472f8d8
Merge "Add CHANGE_WIFI_STATE request to PICK_WIFI_NETWORK intent"
2022-01-27 22:54:58 +00:00
TreeHugger Robot
2335dd98e6
Merge changes from topic "a11y_qs_tooltip_framework"
...
* changes:
Support OHM quick settings tooltips when feature on
Support extra dim quick settings tooltips when feature on
Support color correction quick settings tooltips when feature on
Support color inversion quick settings tooltips when feature on
Integrate Accessibility quick setting tooltips widget into ToggleFeaturePreferenceFragment
2022-01-27 22:10:33 +00:00
Xiaowen Lei
99bd4e45c7
Merge "Log user action for selecting dream."
2022-01-27 19:25:02 +00:00
SongFerng Wang
3fc353f63a
Merge "[MEP]The Esim's PhysicalSlotIndex is wrong"
2022-01-27 19:16:08 +00:00
SongFerng Wang
6f632da57c
Merge "Lost code for setting the list as visible"
2022-01-27 19:15:28 +00:00
SongFerngWang
28bed8ec9f
[MEP]The Esim's PhysicalSlotIndex is wrong
...
Using the getUiccSlotInfo API to get the PhysicalSlotIndex of esim
Bug: 215302360
Test: atest UiccSlotUtilTest
Change-Id: Ic43d6c4a3209d24673769b71b9a148e780ee81ab
2022-01-27 21:13:16 +08:00
Christian Göllner
f1128f0c21
Merge "Small refactor to allow more customization of AutoRotate settings in extending classes"
2022-01-27 12:59:04 +00:00
Peter_Liang
88d63ea3af
New feature “Text and reading options” for SetupWizard, Wallpaper, and Settings (9/n).
...
- Fine-tune the legacy interface of the LabeledSeekBarPreference
1) If not set any label, the layout should be gone instead of visible. If not gone, the preference will have redundant space.
Bug: 211503117
Test: make -j64 RunSettingsRoboTests ROBOTEST_FILTER=LabeledSeekBarPreferenceTest
Change-Id: Ideea8589e35083eb89495c0eceba38c62b4807a7
2022-01-27 20:33:04 +08:00
Peter_Liang
cc5808cbd7
New feature “Text and reading options” for SetupWizard, Wallpaper, and Settings (8/n).
...
- Extending the LabeledSeekBarPreference
1) Add new attributes, "iconStart", "iconEnd",
"iconStartContentDescription", "iconEndContentDescription"
2) Add new interface setOnSeekBarChangeListener
- It will be integrated with display/font size items in next patches.
Bug: 211503117
Test: make -j64 RunSettingsRoboTests ROBOTEST_FILTER=LabeledSeekBarPreferenceTest
Change-Id: Id8fe4fb68062c0e92ca4c291d2f7c47303e8691e
2022-01-27 20:32:52 +08:00
Frank Li
6d4870f996
[automerger skipped] Merge "[MS48.2] Remove NetworkStatsHistory from CycleAdaptor" am: cd2bbccf3a
am: 5799ee886b
am: 752e7a3ba3
am: 3ae8de500e
-s ours
...
am skip reason: Merged-In Ia778d680d5354fb67476db0763dfab017284dc4a with SHA-1 3a15d6cab1
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1942878
Change-Id: I6a0655d3db9a6ad0cb5ea38b3d363da56a648cac
2022-01-27 10:45:56 +00:00
SongFerngWang
04eec0382c
Lost code for setting the list as visible
...
the ag/16710087 lost the code.
Bug: 216233391
Test: manual test: check the UI
make RunSettingsRoboTests ROBOTEST_FILTER=SimListDialogFragmentTest (PASS)
Change-Id: If6ad5422a820627873e58b144e7b65a8b0130def
2022-01-27 10:18:00 +00:00
Frank Li
3ae8de500e
Merge "[MS48.2] Remove NetworkStatsHistory from CycleAdaptor" am: cd2bbccf3a
am: 5799ee886b
am: 752e7a3ba3
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1942878
Change-Id: I6c9bf15370443b49c654e341b905961d136f5c5a
2022-01-27 09:45:15 +00:00
Frank Li
752e7a3ba3
Merge "[MS48.2] Remove NetworkStatsHistory from CycleAdaptor" am: cd2bbccf3a
am: 5799ee886b
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1942878
Change-Id: I296210366abe8965fba7fe1be48ac3bed1195599
2022-01-27 09:23:35 +00:00
Frank Li
5799ee886b
Merge "[MS48.2] Remove NetworkStatsHistory from CycleAdaptor" am: cd2bbccf3a
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1942878
Change-Id: I3f21840dc00f63ad1e0945f44a9a9e560644fb71
2022-01-27 09:01:12 +00:00
Frank Li
cd2bbccf3a
Merge "[MS48.2] Remove NetworkStatsHistory from CycleAdaptor"
2022-01-27 08:47:55 +00:00
Junyu Lai
d7451d16ff
[MS48.2] Remove NetworkStatsHistory from CycleAdaptor
...
While the ChartData changes the types of stored data.
Modify CycleAdaptor accordlingly for the compatibility.
Test: atest clockwork-settings-robotests
make RunSettingsRoboTests -j40
make RunSettingsLibRoboTests
ROBOTEST_FILTER=DataUsageControllerTest
make RunSettingsLibRoboTests
ROBOTEST_FILTER=NetworkCycleChartDataLoaderTest
make RunSettingsLibRoboTests
ROBOTEST_FILTER=NetworkCycleDataForUidLoaderTest
make RunSettingsLibRoboTests
ROBOTEST_FILTER=NetworkCycleDataLoaderTest
make RunSettingsLibRoboTests
ROBOTEST_FILTER=DataUsageUtilsTest
Bug: 204830222
Ignore-AOSP-First: Related API conflict, need master first.
(cherry-picked from ag/16686514)
Change-Id: Ia778d680d5354fb67476db0763dfab017284dc4a
Merged-In: Ia778d680d5354fb67476db0763dfab017284dc4a
2022-01-27 08:46:05 +00:00
Xiao Ma
0042654d60
Merge "Fix EthernetManager.addListener dependency in Tethering settings." am: fa785d2c86
am: 2287aa1993
am: fc3365f6d5
am: 04c20d1381
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1952166
Change-Id: I8c4764fb38e7d9241e4801e1fce4bc2f0ad118ee
2022-01-27 08:01:04 +00:00
Xiao Ma
04c20d1381
Merge "Fix EthernetManager.addListener dependency in Tethering settings." am: fa785d2c86
am: 2287aa1993
am: fc3365f6d5
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1952166
Change-Id: I1b6ea198e7c82ffed62abe87cf694a9f0bdf389b
2022-01-27 07:46:22 +00:00
Xiao Ma
fc3365f6d5
Merge "Fix EthernetManager.addListener dependency in Tethering settings." am: fa785d2c86
am: 2287aa1993
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1952166
Change-Id: I93071ad4ef3ae2e2a333b3e510af82587a34b29c
2022-01-27 07:31:02 +00:00
Xiao Ma
2287aa1993
Merge "Fix EthernetManager.addListener dependency in Tethering settings." am: fa785d2c86
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1952166
Change-Id: I324d48263c1d6ff5aa8eddb8917188087383e6f5
2022-01-27 07:13:01 +00:00
Xiao Ma
fa785d2c86
Merge "Fix EthernetManager.addListener dependency in Tethering settings."
2022-01-27 06:59:12 +00:00
Yuri Lin
b5e4fabf76
Merge "Change zen schedules page to use switches."
2022-01-27 04:51:46 +00:00
Weng Su
79c30c0a3e
Add CHANGE_WIFI_STATE request to PICK_WIFI_NETWORK intent
...
- Add CHANGE_WIFI_STATE permission to WifiPickerActivity
Bug: 183410556
Test: manual test
Use b/183410556#comment4 app-debug.apk to verify the solution
Change-Id: Ie9295c129bc87cb66c67377db64ba716046e9daf
2022-01-27 03:57:21 +00:00
Jason Chiu
0ca89079f1
Merge "Fix broken SettingsSliceProviderTest"
2022-01-27 02:09:30 +00:00
Wilson Wu
d3582455e6
Merge "Introduce AvailableVirtualKeyboardFragmentTest"
2022-01-27 01:41:10 +00:00
Arc Wang
283a085b2f
Merge "Fix UI problems of PublicVolumeSettings"
2022-01-27 01:32:03 +00:00
Pyuli Naithani
d140857954
Add "All services" settings in the App Preference screen for GmsCore.
...
BUG: 188920241
Test: N/A
Change-Id: Icf475f4a6c7498cd9782524806b0335e9cb0f8fc
2022-01-26 21:36:25 +00:00
TreeHugger Robot
2486e07301
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 4636172136
-s ours am: bcf447c371
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16712346
Change-Id: I2c5fe362932b1746567097011e9ee1a2939eaa8e
2022-01-26 17:12:26 +00:00
TreeHugger Robot
bcf447c371
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 4636172136
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16712346
Change-Id: I46d04c4185b62f87cdb3dd1ab315871f052655a3
2022-01-26 17:07:10 +00:00
TreeHugger Robot
f21d79502a
Merge changes from topic "presubmit-am-c45b2d983b9d4ec78289228420413054" into sc-v2-dev-plus-aosp am: c54ae54340
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16712346
Change-Id: Idd2e71889fec6d33d1e354a16e6fa427c98dc7f4
2022-01-26 17:06:49 +00:00
Bill Yi
b93ef1c8c9
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2953e0c45f
am: c7a1715bba
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16712346
Change-Id: Iba34e9952c176c3cd93da0777df313e050da332f
2022-01-26 17:06:45 +00:00