Zoey Chen
125a25bc09
[automerger skipped] Merge "[Provider Model] Redirect Settings Internet panel request to SystemUI." into sc-qpr1-dev am: 538af552c0
am: 8b3bb01ca8
am: f834fe054a
-s ours
...
am skip reason: Merged-In I5b4131c4d986399944c038f8bce0723fcb5ba3b3 with SHA-1 ab8a922f77
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15544646
Change-Id: I73bedd194c6d30625afa4f2c05ec1f51503cf282
2021-08-25 14:45:56 +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
Joy Babafemi
25b81a2640
Revert "Revert "UWB: Re-enable UWB toggle""
...
This reverts commit 2e593b3784
.
Reason for revert: Root cause b/196317865 fixed
Change-Id: Ib0fee46471c7f110b265faedc62a3f66610bf7c2
2021-08-25 03:58:53 +00:00
Joy Babafemi
e5f9b424a4
Merge "Initialize UwbManager only if supported on device."
2021-08-25 03:56:49 +00:00
ykhung
87898aec66
[B&R] notify BackupManager when app optimization mode is changed am: 935a9321b5
am: 5f3bc01915
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15667992
Change-Id: I8e422e893bb80e202ed50550c05ea5484b1b2756
2021-08-25 03:55:48 +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
ykhung
39403bd7ad
[automerger skipped] Refactor BatteryOptimizeUtils from enum to @IntDef am: 0ab0a3af56
am: ef42284a61
-s ours
...
am skip reason: Merged-In I4b22f0abde7f4ce2c3a0b076db786e619783d93e with SHA-1 b2f80a7105
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15659652
Change-Id: I1e9be812ea0b064d701c1e6d0f08e04badf73c7e
2021-08-25 03:00:52 +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
Joy Babafemi
811888bcde
Initialize UwbManager only if supported on device.
...
Test: Manual
Bug: 197519749
Change-Id: I8346f4c2f3e3cc52e21a9214ab3fd428180c5d8d
2021-08-24 18:03:52 +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
ykhung
b2f80a7105
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
2021-08-24 10:20:43 +00:00
TreeHugger Robot
d9085192ba
[automerger skipped] Merge "Import the window extension libary in the Settings app" into sc-v2-dev am: a1b8347ae4
am: bdbe97f958
-s ours
...
am skip reason: Merged-In If9040ae9a1c72097e4964c8d40ea9785cf2f01dc with SHA-1 18ad0c49a8
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15595088
Change-Id: I2a5589ef30857b66568dec24a68a6a66a360dc88
2021-08-24 05:35:15 +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
Zoey Chen
6c2b3ca25c
[automerger skipped] Merge changes Ia8ce6cfa,I1acdfb09 into sc-qpr1-dev am: 8c5611a7ea
am: 3d7b3abff5
-s ours am: 5c8a325f23
-s ours
...
am skip reason: Merged-In Ia8ce6cfa19cd5d57695dc0092b1585d8cad5a8d7 with SHA-1 3043c87f98
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15582202
Change-Id: I41244d873d0b5e894b03fd04e2c3b4b2d42a9e28
2021-08-24 03:26:08 +00:00
changbetty
3a9a3d4078
[automerger skipped] Set the attribute of the dialog window for overlay QS internet panel am: 6871807a95
am: 15cf976b48
-s ours am: 77c8a960a0
-s ours
...
am skip reason: Merged-In I1acdfb09393163bb94824fe2b3bad0391ba4fb53 with SHA-1 6871807a95
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15580496
Change-Id: Ia6fad1fc91f4c9e0350eff50ae7fa472c6ae0572
2021-08-24 03:26:07 +00:00
Zoey Chen
94fee271ab
[automerger skipped] Merge changes Ia8ce6cfa,I1acdfb09 into sc-qpr1-dev am: 8c5611a7ea
am: 5d3e33badf
am: b4ebc1c059
-s ours
...
am skip reason: Merged-In Ia8ce6cfa19cd5d57695dc0092b1585d8cad5a8d7 with SHA-1 cfb994c644
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15582202
Change-Id: I0478565b113a5b6417eb40a6e2209acfb43d6f9a
2021-08-24 03:25:59 +00:00
changbetty
9f9dec9c49
[automerger skipped] Set the attribute of the dialog window for overlay QS internet panel am: 6871807a95
am: 17f06cc0ed
am: 95f566beed
-s ours
...
am skip reason: Merged-In I1acdfb09393163bb94824fe2b3bad0391ba4fb53 with SHA-1 767681812b
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15580496
Change-Id: I8b74f99360f69533a5bc45831d04e979e0055c21
2021-08-24 03:25:57 +00:00
Zoey Chen
5c8a325f23
[automerger skipped] Merge changes Ia8ce6cfa,I1acdfb09 into sc-qpr1-dev am: 8c5611a7ea
am: 3d7b3abff5
-s ours
...
am skip reason: Merged-In Ia8ce6cfa19cd5d57695dc0092b1585d8cad5a8d7 with SHA-1 3043c87f98
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15582202
Change-Id: I2ee0110135bc002a5521a560fb2f8d26c50a8811
2021-08-24 03:17:19 +00:00
changbetty
77c8a960a0
[automerger skipped] Set the attribute of the dialog window for overlay QS internet panel am: 6871807a95
am: 15cf976b48
-s ours
...
am skip reason: Merged-In I1acdfb09393163bb94824fe2b3bad0391ba4fb53 with SHA-1 6871807a95
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15580496
Change-Id: I92ef1f758bfe8a97acc0a396a0d85858c1879cd2
2021-08-24 03:17:17 +00:00
Zoey Chen
b4ebc1c059
Merge changes Ia8ce6cfa,I1acdfb09 into sc-qpr1-dev am: 8c5611a7ea
am: 5d3e33badf
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15582202
Change-Id: I9fd80cfe34f34ba99e35e3c6c5d1da411caf2668
2021-08-24 03:16:57 +00:00
changbetty
95f566beed
Set the attribute of the dialog window for overlay QS internet panel am: 6871807a95
am: 17f06cc0ed
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15580496
Change-Id: I622330aa4b5448d6f3165a388ca6a7cee1c2ca1b
2021-08-24 03:16:56 +00:00
Zoey Chen
5d3e33badf
Merge changes Ia8ce6cfa,I1acdfb09 into sc-qpr1-dev am: 8c5611a7ea
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15582202
Change-Id: I9a75c6a772c6033ce5d949eddccd66bf7cf9dacd
2021-08-24 03:01:16 +00:00
Zoey Chen
3d7b3abff5
Merge changes Ia8ce6cfa,I1acdfb09 into sc-qpr1-dev am: 8c5611a7ea
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15582202
Change-Id: I3ccb6d5f0a4131707cc1fa9f53da93eb78c28e8f
2021-08-24 03:01:16 +00:00
changbetty
15cf976b48
Set the attribute of the dialog window for overlay QS internet panel am: 6871807a95
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15580496
Change-Id: I9abdd46b7af650435bf07a0487d45468e0ded874
2021-08-24 03:01:15 +00:00
changbetty
17f06cc0ed
Set the attribute of the dialog window for overlay QS internet panel am: 6871807a95
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15580496
Change-Id: I49b6bd849d70f57ab3699b771cca36309e935c75
2021-08-24 03:01:15 +00:00
Zoey Chen
8c5611a7ea
Merge changes Ia8ce6cfa,I1acdfb09 into sc-qpr1-dev
...
* changes:
Remove some attributes to move the dialog window up
Set the attribute of the dialog window for overlay QS internet panel
2021-08-24 02:47:23 +00:00
TreeHugger Robot
d3ab611aee
Merge "Update Memory progressbar style in Developer options" into sc-v2-dev am: 2919585538
am: 4af312f397
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15605517
Change-Id: Id84ebc5731d83fad8356de481db302560f1b0fc4
2021-08-23 18:33:37 +00:00
TreeHugger Robot
4af312f397
Merge "Update Memory progressbar style in Developer options" into sc-v2-dev am: 2919585538
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15605517
Change-Id: Ice9b8dcd8c0499752b38358ec5f8705718338483
2021-08-23 18:22:21 +00:00
TreeHugger Robot
682b315af3
[automerger skipped] Merge "[Povider Model] Fix string in SIMs" into sc-qpr1-dev am: 8e98df31a4
am: a980758c5c
-s ours am: c4cc6c4b20
-s ours
...
am skip reason: Merged-In I4314802840a4952acf7f090d81ca19ec28b793b2 with SHA-1 f982f286a2
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15542132
Change-Id: Ia9fd2f306f71be3f0b99e1752d0092dcf7f7e034
2021-08-23 18:03:23 +00:00
TreeHugger Robot
826e0a832b
[automerger skipped] Merge "[Settings] Fix RTL issue of Calls and SMS" into sc-qpr1-dev am: 0fa8c951e0
am: 289bdbe53a
-s ours am: 7ea24a57b3
-s ours
...
am skip reason: Merged-In I022253efbe0ea25f11d5ac6c2b3b0fcd1d9f54aa with SHA-1 95bcd7cb23
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15542135
Change-Id: Ifea9163c3e42fd5318a0778695cc54fa2f35b447
2021-08-23 18:03:18 +00:00
TreeHugger Robot
1aedb9f8a6
[automerger skipped] Merge "[Povider Model] Fix string in SIMs" into sc-qpr1-dev am: 8e98df31a4
am: e1a95327ea
am: bb0cd8b022
-s ours
...
am skip reason: Merged-In I4314802840a4952acf7f090d81ca19ec28b793b2 with SHA-1 84073b9851
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15542132
Change-Id: Icdde3a1c99a7c74774d7a6435565af6c6f4b5881
2021-08-23 18:03:13 +00:00
TreeHugger Robot
dfbf468d8f
[automerger skipped] Merge "[Settings] Fix RTL issue of Calls and SMS" into sc-qpr1-dev am: 0fa8c951e0
am: 9436706f92
am: 127550a3cf
-s ours
...
am skip reason: Merged-In I022253efbe0ea25f11d5ac6c2b3b0fcd1d9f54aa with SHA-1 54bd206fbc
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15542135
Change-Id: I7d2ddf7a6c1f79dfed4c903c542e0e4bc7d6e8dd
2021-08-23 18:03:04 +00:00
TreeHugger Robot
2919585538
Merge "Update Memory progressbar style in Developer options" into sc-v2-dev
2021-08-23 18:00:58 +00:00
TreeHugger Robot
c4cc6c4b20
[automerger skipped] Merge "[Povider Model] Fix string in SIMs" into sc-qpr1-dev am: 8e98df31a4
am: a980758c5c
-s ours
...
am skip reason: Merged-In I4314802840a4952acf7f090d81ca19ec28b793b2 with SHA-1 f982f286a2
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15542132
Change-Id: Ie4b7af4386190e4506d123d7f6457c2bfa3ac944
2021-08-23 17:54:39 +00:00
TreeHugger Robot
7ea24a57b3
[automerger skipped] Merge "[Settings] Fix RTL issue of Calls and SMS" into sc-qpr1-dev am: 0fa8c951e0
am: 289bdbe53a
-s ours
...
am skip reason: Merged-In I022253efbe0ea25f11d5ac6c2b3b0fcd1d9f54aa with SHA-1 95bcd7cb23
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15542135
Change-Id: I28851130a68e4bd4a2bbff6881769bf1c205ebf0
2021-08-23 17:54:34 +00:00
TreeHugger Robot
bb0cd8b022
Merge "[Povider Model] Fix string in SIMs" into sc-qpr1-dev am: 8e98df31a4
am: e1a95327ea
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15542132
Change-Id: I77bf0ed763930b139f6d9ee329421b7a306d154f
2021-08-23 17:54:17 +00:00
TreeHugger Robot
127550a3cf
Merge "[Settings] Fix RTL issue of Calls and SMS" into sc-qpr1-dev am: 0fa8c951e0
am: 9436706f92
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15542135
Change-Id: I148ce6409006fd2a4eb7f1489ff81d322071bc66
2021-08-23 17:54:08 +00:00
TreeHugger Robot
a980758c5c
Merge "[Povider Model] Fix string in SIMs" into sc-qpr1-dev am: 8e98df31a4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15542132
Change-Id: I046e1e97d1f195147c65b7676326afd5e1121fb0
2021-08-23 17:43:14 +00:00
TreeHugger Robot
289bdbe53a
Merge "[Settings] Fix RTL issue of Calls and SMS" into sc-qpr1-dev am: 0fa8c951e0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15542135
Change-Id: I5e5a9a901e0da15da23e1bd5137a84a3ffa0a331
2021-08-23 17:42:56 +00:00
TreeHugger Robot
e1a95327ea
Merge "[Povider Model] Fix string in SIMs" into sc-qpr1-dev am: 8e98df31a4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15542132
Change-Id: I96c1c2cf4ae52d9fad6c0cdf7d4d20cba013e700
2021-08-23 17:42:50 +00:00
TreeHugger Robot
9436706f92
Merge "[Settings] Fix RTL issue of Calls and SMS" into sc-qpr1-dev am: 0fa8c951e0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15542135
Change-Id: Ib777e0648e8b8ca63eb9ac7ca11b34f3ae3408fd
2021-08-23 17:42:33 +00:00