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
Zoey Chen
17592fa2f4
[automerger skipped] Merge "Add new ACTION_WIFI_DETAILS_SETTINGS to Settings" into sc-qpr1-dev am: 2a87acf247
am: e964d73673
-s ours am: f3e6bbb12f
-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: Ic392a825c1a3b34251d6654838eb558440cb558c
2021-08-27 10:22:40 +00:00
Zoey Chen
7c41a2e1ab
[automerger skipped] Merge "[Provider Model] Redirect Settings Internet panel request to SystemUI." into sc-qpr1-dev am: 538af552c0
am: 5c49db8d8b
-s ours am: b55c6ea0ab
-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: I0e12949551b34e1e9402d56da79bd5c180ba610d
2021-08-27 10:21:55 +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
ff9ee466ca
[automerger skipped] Merge "Initialize UwbManager only if supported on device." into sc-qpr1-dev am: 029b6397a8
am: 8fd386e5c4
am: 08aec88281
-s ours
...
am skip reason: Merged-In I8346f4c2f3e3cc52e21a9214ab3fd428180c5d8d with SHA-1 811888bcde
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15676888
Change-Id: Iaf6c8a3ed976be3a277c9079bae5356eba127f6e
2021-08-27 02:40:43 +00:00
Victor Liu
393d618884
[automerger skipped] Merge "Revert "Revert "UWB: Re-enable UWB toggle""" into sc-qpr1-dev am: 989edd731d
am: 4b3f7bac9b
am: 9e9075949d
-s ours
...
am skip reason: Merged-In Ib0fee46471c7f110b265faedc62a3f66610bf7c2 with SHA-1 25b81a2640
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15676887
Change-Id: I125864a933dbb4948b121ba48cafef6d685d2386
2021-08-27 02:40:41 +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
fc9de1609f
[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: 68bb031edb
-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: I2a076e210a9f6d7d57e8eec7e0a4a55c9d15c38d
2021-08-26 22:35:35 +00:00
Android Build Prod User
20cdb6f50b
[automerger skipped] Merge "[QPR1][Security] Fix RequestIgnoreBatteryOptimizations info disclosure" into sc-qpr1-dev am: 71327943dc
-s ours am: 10519b6e30
-s ours am: b497c08d47
-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: If859c1eb797a4cacdedcb6f60a9543f4389bf639
2021-08-26 22:34:41 +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
ba4fed4459
[automerger skipped] Merge "Change the Network preference summary for wifi option" into sc-qpr1-dev am: 6a3b697141
am: 2889a7d49f
am: 6bdc44eeff
-s ours
...
am skip reason: Merged-In I3892386f8fe2e5c3e29cd7e91f88db65c3693990 with SHA-1 1d37fc6daf
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15671537
Change-Id: Ia1bd3823bd61af9805e68da6f3f3ef5a41ccd8da
2021-08-26 11:53:10 +00:00
Zoey Chen
f8a0a90d2d
[automerger skipped] Merge "Add new ACTION_WIFI_DETAILS_SETTINGS to Settings" into sc-qpr1-dev am: 2a87acf247
-s ours am: 9e1720d5c9
-s ours am: 8827f3393d
-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: Ied03b084b4474844336ce31cab222eaa45cd3f40
2021-08-26 11:51:43 +00:00
Zoey Chen
1b1caaff31
[automerger skipped] Merge "[RESTRICT AUTOMERGE] Add new ACTION_WIFI_DETAILS_SETTINGS to Settings" into sc-v2-dev am: 8df2fccba8
am: 058f4eab1a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15674265
Change-Id: I27e1211df8d60e0fbb1df55e68d69cc0d858c0d2
2021-08-26 11:49:58 +00:00
Weng Su
9d165b0efd
[automerger skipped] [RESTRICT AUTOMERGE] Add new ACTION_WIFI_DETAILS_SETTINGS to Settings am: 29f4a35dea
am: 2827396d74
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15674265
Change-Id: Ie1247de658f73c376ddcd59d19e64062557e16ab
2021-08-26 11:49:53 +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
8ffdf372c1
[B&R] ignore backup system app or default app optimization modes am: a90496e92e
am: c724633bf3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15671541
Change-Id: Ieb631d27cc6ca53f8926be3a4998baf38f4893dc
2021-08-26 08:49:15 +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
4a475606b7
[automerger skipped] Add new ACTION_WIFI_DETAILS_SETTINGS to Settings am: 56c0fe1c84
-s ours
...
am skip reason: Merged-In Id2fd8c9b3b113ffbb49168305b05c67392fa4d87 with SHA-1 e8a4e13a80
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15674266
Change-Id: I1f28c3796c6570af710e4971dbe6154967d57cbd
2021-08-26 07:47:44 +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
Joy Babafemi
1fca55dd68
Merge "Revert "Revert "UWB: Re-enable UWB toggle"""
2021-08-25 19:35:50 +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
Joshua Duong
12f0a063ac
Merge "Fix QR code scanner layout in "Pair devices over Wi-Fi" page."
2021-08-25 15:35:56 +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