Android Build Prod User
1f7161281e
[automerger skipped] Merge "[QPR1] Add time unit into battery usage chart and refine some UI" into sc-qpr1-dev am: 33af17ff31
am: 0b8ff007b7
-s ours
...
am skip reason: Merged-In I5b35b0fa808eb8a5f607962ee973c2896529b078 with SHA-1 0791d77df0
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15516309
Change-Id: I761469178dc8ad80464384b2c274ddbfa94fd0c5
2021-08-27 10:33:30 +00:00
Android Build Prod User
55325fc38d
[automerger skipped] Merge "[QPR1][Security] Fix RequestIgnoreBatteryOptimizations info disclosure" into sc-qpr1-dev am: 71327943dc
am: ca8e67d144
-s ours
...
am skip reason: Merged-In Ia2e47c493c206e96b0bc1d9f08735c0f9474c233 with SHA-1 5589007530
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15596897
Change-Id: Ic02568f9af4ec588193c180c5dda86d679b42c3c
2021-08-27 10:32:20 +00:00
Betty Chang
1089b11bd0
[automerger skipped] Merge "Change the Network preference summary for wifi option" into sc-qpr1-dev am: 6a3b697141
am: 7e7b237092
-s ours
...
am skip reason: Merged-In I3892386f8fe2e5c3e29cd7e91f88db65c3693990 with SHA-1 b1b2da9aca
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15671537
Change-Id: I6e69becb33f5c3bef0569b676eb366b90272445e
2021-08-27 10:12:25 +00:00
Zoey Chen
f3e6bbb12f
[automerger skipped] Merge "Add new ACTION_WIFI_DETAILS_SETTINGS to Settings" into sc-qpr1-dev am: 2a87acf247
am: e964d73673
-s ours
...
am skip reason: Merged-In Id2fd8c9b3b113ffbb49168305b05c67392fa4d87 with SHA-1 29f4a35dea
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15580670
Change-Id: I8c9e98d478b90c6825b03797fc164257cff386c8
2021-08-27 10:10:07 +00:00
Zoey Chen
b55c6ea0ab
[automerger skipped] Merge "[Provider Model] Redirect Settings Internet panel request to SystemUI." into sc-qpr1-dev am: 538af552c0
am: 5c49db8d8b
-s ours
...
am skip reason: Merged-In I5b4131c4d986399944c038f8bce0723fcb5ba3b3 with SHA-1 6ce608787b
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15544646
Change-Id: I6b917857236a8e20a264f4cb98e37be3a879f7d9
2021-08-27 10:09:26 +00:00
Victor Liu
08aec88281
Merge "Initialize UwbManager only if supported on device." into sc-qpr1-dev am: 029b6397a8
am: 8fd386e5c4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15676888
Change-Id: I83cfdad5fa3d7a0f59a9e0e9026480979b8a8a09
2021-08-27 02:26:40 +00:00
Victor Liu
9e9075949d
Merge "Revert "Revert "UWB: Re-enable UWB toggle""" into sc-qpr1-dev am: 989edd731d
am: 4b3f7bac9b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15676887
Change-Id: I12e543c1f689cd64d2eb01422c363e092cd0eb48
2021-08-27 02:26:38 +00:00
Victor Liu
da15cbb50e
Merge "Initialize UwbManager only if supported on device." into sc-qpr1-dev am: 029b6397a8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15676888
Change-Id: If9a8aba1e56a75422b0c2a453673d0cd873d4aa1
2021-08-27 02:14:01 +00:00
Victor Liu
8fd386e5c4
Merge "Initialize UwbManager only if supported on device." into sc-qpr1-dev am: 029b6397a8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15676888
Change-Id: I705dbcfa7b4095bdf1d39830b2910ce53eaf4e44
2021-08-27 02:14:01 +00:00
Victor Liu
4b3f7bac9b
Merge "Revert "Revert "UWB: Re-enable UWB toggle""" into sc-qpr1-dev am: 989edd731d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15676887
Change-Id: Ie5eaa98792e804e4fded2673f3ab5e32717a8b08
2021-08-27 02:14:00 +00:00
Victor Liu
1d35b1cd1b
Merge "Revert "Revert "UWB: Re-enable UWB toggle""" into sc-qpr1-dev am: 989edd731d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15676887
Change-Id: Iee67208eb135484aca10ae7c17894713795d1544
2021-08-27 02:13:58 +00:00
Victor Liu
029b6397a8
Merge "Initialize UwbManager only if supported on device." into sc-qpr1-dev
2021-08-27 01:57:14 +00:00
Victor Liu
989edd731d
Merge "Revert "Revert "UWB: Re-enable UWB toggle""" into sc-qpr1-dev
2021-08-27 01:57:14 +00:00
Android Build Prod User
68bb031edb
[automerger skipped] Merge "[QPR1] Add time unit into battery usage chart and refine some UI" into sc-qpr1-dev am: 33af17ff31
-s ours am: bfcdb0a8ad
-s ours
...
am skip reason: Merged-In I5b35b0fa808eb8a5f607962ee973c2896529b078 with SHA-1 fbbcc55fc0
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15516309
Change-Id: I137e23e0bb4d542521c2ca2d483260515e307779
2021-08-26 22:20:46 +00:00
Android Build Prod User
b497c08d47
[automerger skipped] Merge "[QPR1][Security] Fix RequestIgnoreBatteryOptimizations info disclosure" into sc-qpr1-dev am: 71327943dc
-s ours am: 10519b6e30
-s ours
...
am skip reason: Merged-In Ia2e47c493c206e96b0bc1d9f08735c0f9474c233 with SHA-1 518d6df4f4
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15596897
Change-Id: Ib37708431d1a10a7783ccb052201fda7fb928e57
2021-08-26 22:20:40 +00:00
Android Build Prod User
bfcdb0a8ad
[automerger skipped] Merge "[QPR1] Add time unit into battery usage chart and refine some UI" into sc-qpr1-dev am: 33af17ff31
-s ours
...
am skip reason: Merged-In I5b35b0fa808eb8a5f607962ee973c2896529b078 with SHA-1 fbbcc55fc0
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15516309
Change-Id: I4296f4accb9cf3c066c8b6c7e22f7bdf84b866af
2021-08-26 21:59:49 +00:00
Android Build Prod User
10519b6e30
[automerger skipped] Merge "[QPR1][Security] Fix RequestIgnoreBatteryOptimizations info disclosure" into sc-qpr1-dev am: 71327943dc
-s ours
...
am skip reason: Merged-In Ia2e47c493c206e96b0bc1d9f08735c0f9474c233 with SHA-1 518d6df4f4
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15596897
Change-Id: I903d37c821a8226d0b83e91b3947eae02834d26b
2021-08-26 21:59:29 +00:00
Android Build Prod User
0b8ff007b7
Merge "[QPR1] Add time unit into battery usage chart and refine some UI" into sc-qpr1-dev am: 33af17ff31
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15516309
Change-Id: Ie0d087c70691e9363126c096625e9ee4aab44a63
2021-08-26 21:59:26 +00:00
Android Build Prod User
ca8e67d144
Merge "[QPR1][Security] Fix RequestIgnoreBatteryOptimizations info disclosure" into sc-qpr1-dev am: 71327943dc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15596897
Change-Id: I3d91b11afeb397e7bddea0b82d0cfe4d2faafece
2021-08-26 21:59:11 +00:00
Android Build Prod User
33af17ff31
Merge "[QPR1] Add time unit into battery usage chart and refine some UI" into sc-qpr1-dev
2021-08-26 21:42:36 +00:00
Android Build Prod User
71327943dc
Merge "[QPR1][Security] Fix RequestIgnoreBatteryOptimizations info disclosure" into sc-qpr1-dev
2021-08-26 21:42:27 +00:00
Joy Babafemi
63976c2051
Revert "Revert "UWB: Re-enable UWB toggle""
...
This reverts commit 2e593b3784
.
Reason for revert: Root cause b/196317865 fixed
Bug: 197519749
Change-Id: Ib0fee46471c7f110b265faedc62a3f66610bf7c2
Merged-In: Ib0fee46471c7f110b265faedc62a3f66610bf7c2
2021-08-26 20:27:23 +00:00
Joy Babafemi
14aee30625
Initialize UwbManager only if supported on device.
...
Test: Manual
Bug: 197519749
Change-Id: I8346f4c2f3e3cc52e21a9214ab3fd428180c5d8d
Merged-In: I8346f4c2f3e3cc52e21a9214ab3fd428180c5d8d
2021-08-26 20:26:11 +00:00
Betty Chang
6bdc44eeff
Merge "Change the Network preference summary for wifi option" into sc-qpr1-dev am: 6a3b697141
am: 2889a7d49f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15671537
Change-Id: I7a0f00431aeb0eacf23be1381148fbec15886b85
2021-08-26 11:39:43 +00:00
Zoey Chen
8827f3393d
[automerger skipped] Merge "Add new ACTION_WIFI_DETAILS_SETTINGS to Settings" into sc-qpr1-dev am: 2a87acf247
-s ours am: 9e1720d5c9
-s ours
...
am skip reason: Merged-In Id2fd8c9b3b113ffbb49168305b05c67392fa4d87 with SHA-1 29f4a35dea
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15580670
Change-Id: I397e67f3ca61c965d948a6da0878bf13222c365c
2021-08-26 11:38:27 +00:00
Zoey Chen
058f4eab1a
Merge "[RESTRICT AUTOMERGE] Add new ACTION_WIFI_DETAILS_SETTINGS to Settings" into sc-v2-dev am: 8df2fccba8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15674265
Change-Id: Icc8655608421a8f3afbd1be8d364679076e38b5b
2021-08-26 11:36:56 +00:00
Weng Su
2827396d74
[RESTRICT AUTOMERGE] Add new ACTION_WIFI_DETAILS_SETTINGS to Settings am: 29f4a35dea
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15674265
Change-Id: I880a89daadc5bb0f325a3e3b3be99e3d5dd094af
2021-08-26 11:36:54 +00:00
Betty Chang
2889a7d49f
Merge "Change the Network preference summary for wifi option" into sc-qpr1-dev am: 6a3b697141
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15671537
Change-Id: I6ce573b12c83282587419e321f7c690c6830b4a6
2021-08-26 11:16:54 +00:00
Zoey Chen
9e1720d5c9
[automerger skipped] Merge "Add new ACTION_WIFI_DETAILS_SETTINGS to Settings" into sc-qpr1-dev am: 2a87acf247
-s ours
...
am skip reason: Merged-In Id2fd8c9b3b113ffbb49168305b05c67392fa4d87 with SHA-1 29f4a35dea
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15580670
Change-Id: I299e82f613ee4af87b01a68c6e78492bba2c38f2
2021-08-26 11:07:28 +00:00
Zoey Chen
8df2fccba8
Merge "[RESTRICT AUTOMERGE] Add new ACTION_WIFI_DETAILS_SETTINGS to Settings" into sc-v2-dev
2021-08-26 10:58:40 +00:00
ykhung
c724633bf3
[B&R] ignore backup system app or default app optimization modes am: a90496e92e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15671541
Change-Id: I8b0df014d4e0c317349f1937a649df3ae9ba613f
2021-08-26 08:39:37 +00:00
Weng Su
29f4a35dea
[RESTRICT AUTOMERGE] Add new ACTION_WIFI_DETAILS_SETTINGS to Settings
...
- Need to export the interface to Quick Settings to launch Wi-Fi Network
details settings.
- Rename WifiNetworkDetailsFragment.class
Bug: 191475923
Test: manual test with the topic CLs.
make RunSettingsRoboTests
atest -c SettingsUnitTests:com.android.settings.wifi \
SettingsUnitTests:com.android.settings.network
Change-Id: Id2fd8c9b3b113ffbb49168305b05c67392fa4d87
(cherry picked from commit e8a4e13a80
)
2021-08-26 04:24:39 +00:00
Betty Chang
7e7b237092
Merge "Change the Network preference summary for wifi option" into sc-qpr1-dev am: 6a3b697141
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15671537
Change-Id: I4bc6a5d4d5eeccaf23d4c7da0314ebdfaf4965e4
2021-08-26 02:06:50 +00:00
Betty Chang
6a3b697141
Merge "Change the Network preference summary for wifi option" into sc-qpr1-dev
2021-08-26 01:50:56 +00:00
Weng Su
56c0fe1c84
Add new ACTION_WIFI_DETAILS_SETTINGS to Settings
...
- Need to export the interface to Quick Settings to launch Wi-Fi Network
details settings.
- Rename WifiNetworkDetailsFragment.class
Bug: 191475923
Test: manual test with the topic CLs.
make RunSettingsRoboTests
atest -c SettingsUnitTests:com.android.settings.wifi \
SettingsUnitTests:com.android.settings.network
Change-Id: Id2fd8c9b3b113ffbb49168305b05c67392fa4d87
(cherry picked from commit e8a4e13a80
)
Merged-In: Id2fd8c9b3b113ffbb49168305b05c67392fa4d87
2021-08-25 15:37:19 +00:00
ykhung
a90496e92e
[B&R] ignore backup system app or default app optimization modes
...
Avoid backup system app or default app optimization modes, since all of
them are using the MODE_UNRESTRICTED in default, and the system or
default apps may be different in the different devices.
BYPASS_INCLUSIVE_LANGUAGE_REASON=legacy method name
Test command for backup manager:
adb shell bmgr backupnow com.android.settings
adb shell dumpsys backup | grep Current
Bug: 192523697
Test: make SettingsRoboTests
Change-Id: I0862ee31fcfa3bece15c2d4fdef5b0ea70235967
2021-08-25 15:01:52 +00:00
Zoey Chen
f834fe054a
Merge "[Provider Model] Redirect Settings Internet panel request to SystemUI." into sc-qpr1-dev am: 538af552c0
am: 8b3bb01ca8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15544646
Change-Id: I937c5e630247871b2ebb34da3c0c28f13ee97f78
2021-08-25 14:30:35 +00:00
Zoey Chen
8b3bb01ca8
Merge "[Provider Model] Redirect Settings Internet panel request to SystemUI." into sc-qpr1-dev am: 538af552c0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15544646
Change-Id: I57e5c0f9abf213026d67cdfed8acfccff46084a8
2021-08-25 14:20:17 +00:00
Zoey Chen
e964d73673
Merge "Add new ACTION_WIFI_DETAILS_SETTINGS to Settings" into sc-qpr1-dev am: 2a87acf247
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15580670
Change-Id: I8eb97e03575fb7b1d69aac24fecc22bc100cca50
2021-08-25 06:19:18 +00:00
Zoey Chen
2a87acf247
Merge "Add new ACTION_WIFI_DETAILS_SETTINGS to Settings" into sc-qpr1-dev
2021-08-25 06:04:30 +00:00
Zoey Chen
5c49db8d8b
Merge "[Provider Model] Redirect Settings Internet panel request to SystemUI." into sc-qpr1-dev am: 538af552c0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15544646
Change-Id: Iaae85f03949e22b76390956de127513c2b806863
2021-08-25 04:54:20 +00:00
Zoey Chen
538af552c0
Merge "[Provider Model] Redirect Settings Internet panel request to SystemUI." into sc-qpr1-dev
2021-08-25 04:29:12 +00:00
ykhung
5f3bc01915
[B&R] notify BackupManager when app optimization mode is changed am: 935a9321b5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15667992
Change-Id: I6699e68d8c6e66ee76420c732307af03ee9513fd
2021-08-25 03:43:21 +00:00
changbetty
b1b2da9aca
Change the Network preference summary for wifi option
...
Bug:192987269
Test: Manual test
Test: make RunSettingsRoboTests
ROBOTEST_FILTER=NetworkProviderSettingsTest
Change-Id: I3892386f8fe2e5c3e29cd7e91f88db65c3693990
Merged-In: I3892386f8fe2e5c3e29cd7e91f88db65c3693990
2021-08-25 02:55:38 +00:00
ykhung
ef42284a61
Refactor BatteryOptimizeUtils from enum to @IntDef am: 0ab0a3af56
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15659652
Change-Id: Ia636f4a56ff2b528e8a86d924af00e2a68602b06
2021-08-25 02:46:38 +00:00
ykhung
935a9321b5
[B&R] notify BackupManager when app optimization mode is changed
...
Invoke BackupManager.dataChanged() when app optimization mode is changed
to notify BackupManager to execute Settings agent to backup data in the
next backup session, when performing the partial backup event.
Bug: 192523697
Bug: 197608038
Bug: 194633034
Test: make SettingsRoboTests
Change-Id: I456acc2594d22503763e4ce286435148ae0644a4
2021-08-25 02:21:16 +00:00
ykhung
0ab0a3af56
Refactor BatteryOptimizeUtils from enum to @IntDef
...
Based on the Android API Council guideline, we should avoid using the
Enum structure to define the constant definition.
go/android-api-guidelines#avoid-enum
Bug: 197595292
Test: make SettingsRoboTests
Change-Id: I4b22f0abde7f4ce2c3a0b076db786e619783d93e
Merged-In: I4b22f0abde7f4ce2c3a0b076db786e619783d93e
2021-08-24 12:04:31 +00:00
TreeHugger Robot
bdbe97f958
Merge "Import the window extension libary in the Settings app" into sc-v2-dev am: a1b8347ae4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15595088
Change-Id: I4064c73828fa62f5f895111a38ee143f6d9a27df
2021-08-24 05:26:51 +00:00
TreeHugger Robot
a1b8347ae4
Merge "Import the window extension libary in the Settings app" into sc-v2-dev
2021-08-24 05:19:07 +00:00
Tsung-Mao Fang
c6e44c0e89
Import the window extension libary in the Settings app
...
Test: Rebuilt apk and run apk successfully.
Fix: 196939216
Change-Id: If9040ae9a1c72097e4964c8d40ea9785cf2f01dc
Merged-In: If9040ae9a1c72097e4964c8d40ea9785cf2f01dc
2021-08-24 12:01:35 +08:00