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
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
6a3b697141
Merge "Change the Network preference summary for wifi option" into sc-qpr1-dev
2021-08-26 01:50:56 +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
538af552c0
Merge "[Provider Model] Redirect Settings Internet panel request to SystemUI." into sc-qpr1-dev
2021-08-25 04:29:12 +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
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
8e98df31a4
Merge "[Povider Model] Fix string in SIMs" into sc-qpr1-dev
2021-08-23 17:28:43 +00:00
TreeHugger Robot
0fa8c951e0
Merge "[Settings] Fix RTL issue of Calls and SMS" into sc-qpr1-dev
2021-08-23 17:24:38 +00:00
TreeHugger Robot
fae29c6b33
Merge "Fix Settings crash issue" into sc-qpr1-dev
2021-08-23 16:12:13 +00:00
TreeHugger Robot
eef01580fd
Merge "[Provider Model] Correct the Settings shortcut of the Settings Widget" into sc-qpr1-dev
2021-08-23 16:11:50 +00:00
Bill Yi
1a5b010e20
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 46902bd366
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15649792
Change-Id: If8b78b2722decc2a182fbded4f594db881eaf9ee
2021-08-23 04:38:06 +00:00
Bill Yi
46902bd366
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev
2021-08-23 04:21:54 +00:00
Bill Yi
38f55441d3
Merge changes from topic "presubmit-am-ebe8a352b317462aa31e9ffb6caeb6a5" into sc-qpr1-dev
...
* changes:
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 93eb76377b
Import translations. DO NOT MERGE ANYWHERE
2021-08-23 04:21:54 +00:00
Bill Yi
a09970a7c7
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b762f335e3
-s ours am: 3ed7097ead
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15649787
Change-Id: I75a2d2ff05cb9fd3c74bd16aa06a0893dcf7dd2a
2021-08-22 18:18:05 +00:00
Bill Yi
c4934a29a9
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 70b0c311a5
-s ours am: 7643d374b5
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15649790
Change-Id: I9e63f46f668fab0c59ad240d952d0dc2d63fe09c
2021-08-22 18:17:53 +00:00
Bill Yi
3ed7097ead
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b762f335e3
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15649787
Change-Id: Iccc05891ae6764d10ebfef8e47ac43ffa07956ac
2021-08-22 18:07:39 +00:00
Bill Yi
7643d374b5
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 70b0c311a5
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15649790
Change-Id: Ic0611b0fd5f645d0c69ee539ebc746fddd4d59be
2021-08-22 18:02:27 +00:00
TreeHugger Robot
2bd8661d40
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev
2021-08-22 17:45:19 +00:00
Bill Yi
0f61194307
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I3ea6d77ccace207249eef5d86fc331f22db54dac
2021-08-21 10:49:31 +00:00
Bill Yi
0f5c1fd924
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 93eb76377b
...
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15649792
Change-Id: I0498edec2d10fdf5864be81d71cf0e23c109717b
2021-08-21 10:46:13 +00:00
Bill Yi
93eb76377b
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I4c088fc157f34994615725c8c2e9815e174a6508
2021-08-21 10:45:59 +00:00
Bill Yi
70b0c311a5
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I53bc4eea899bfa40183a478e99878438c78f2d7b
2021-08-21 10:31:37 +00:00
Bill Yi
b762f335e3
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ieab1a39a1764ced3fe6dce11e5e8f9aa2b12498b
2021-08-21 10:17:34 +00:00
Joe Bolinger
f78cec292c
Remove sliceable attribute from biometric preference controllers.
...
This removes the top-level UI switch on some of the boolean preference settings.
Bug: 193438173
Test: atest com.android.settings.biometrics
Change-Id: If1cd2cb9ae456021fcdf0efc5002db4a083b9689
2021-08-20 18:42:50 +00:00
Govinda Wasserman
8351a9a504
Merge "Revert "Revert "Add sensitivity configuration to long press power dialog""" into sc-qpr1-dev
2021-08-20 17:15:31 +00:00
Govinda Wasserman
3869aac6d3
Revert "Revert "Add sensitivity configuration to long press power dialog""
...
This reverts commit c4084d4141
.
Reason for revert: Dependant change has now successfully been propagated to sc-v2-dev child graphs
Change-Id: I1f6126a423c72540d219b99e20b464b51ef65923
2021-08-20 17:06:40 +00:00
TreeHugger Robot
ea4e5a33bf
Merge "Revert "Add sensitivity configuration to long press power dialog"" into sc-qpr1-dev
2021-08-20 10:57:58 +00:00
Sam Chang
c4084d4141
Revert "Add sensitivity configuration to long press power dialog"
...
This reverts commit de2f00df41
.
Reason for revert: This CL will cause build break, b/197290948
Change-Id: Ibee2d4bc5e445e863585c291b4b2741bcb4b4c81
2021-08-20 06:46:33 +00:00
Bill Yi
7931ff7ae4
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 88a0994ed8
-s ours am: 6718e1ee7b
-s ours am: 2906d7dceb
-s ours am: 5333f656cb
-s ours am: cae8b13289
-s ours am: a131a4e35d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15608116
Change-Id: Iba3f93afb07202da274a6cac78445b1bfe92c11c
2021-08-19 19:24:54 +00:00
Bill Yi
011f12be5c
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f391df2089
-s ours am: 6a0b815394
-s ours am: d26b631da5
-s ours am: dbb7139670
-s ours am: f56033304c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15607375
Change-Id: I91d1ecbc4dffb2dd3ab86642f3e22a93fd7245d3
2021-08-19 19:24:50 +00:00
Bill Yi
8fd0c3d73d
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 88a0994ed8
-s ours am: 6718e1ee7b
-s ours am: 2906d7dceb
-s ours am: 5333f656cb
-s ours am: c748a50c90
-s ours am: de6423d2ee
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15608116
Change-Id: I5c590ca000a1bf792c622d33c0ac63d5f8a7d715
2021-08-19 19:24:45 +00:00
Bill Yi
07eddeeb3a
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f391df2089
-s ours am: 6a0b815394
-s ours am: d26b631da5
-s ours am: 214068856c
-s ours am: d46732c0d0
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15607375
Change-Id: I3da8a12210758eda87225874a2206a8c04d6c080
2021-08-19 19:24:10 +00:00
Bill Yi
a131a4e35d
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 88a0994ed8
-s ours am: 6718e1ee7b
-s ours am: 2906d7dceb
-s ours am: 5333f656cb
-s ours am: cae8b13289
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15608116
Change-Id: I1b4c1cf3fe9a91519f752241d93ddf50b7f1db4b
2021-08-19 19:11:00 +00:00
Bill Yi
f56033304c
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f391df2089
-s ours am: 6a0b815394
-s ours am: d26b631da5
-s ours am: dbb7139670
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15607375
Change-Id: I5fa1bc908b59a08170c75434094b8a2ec18de9d9
2021-08-19 19:10:19 +00:00
Bill Yi
de6423d2ee
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 88a0994ed8
-s ours am: 6718e1ee7b
-s ours am: 2906d7dceb
-s ours am: 5333f656cb
-s ours am: c748a50c90
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15608116
Change-Id: Ife7f670a35fb40793148e383f0ec61977befffa5
2021-08-19 19:09:12 +00:00
Bill Yi
d46732c0d0
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f391df2089
-s ours am: 6a0b815394
-s ours am: d26b631da5
-s ours am: 214068856c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15607375
Change-Id: I9dc1c790b19badc9293ccb7ceb8e2719b4f2d9a0
2021-08-19 19:09:03 +00:00
Bill Yi
c748a50c90
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 88a0994ed8
-s ours am: 6718e1ee7b
-s ours am: 2906d7dceb
-s ours am: 5333f656cb
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15608116
Change-Id: I51d44b97eafa5c3d0afba3314060168c75c0cc7c
2021-08-19 18:45:15 +00:00
Bill Yi
cae8b13289
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 88a0994ed8
-s ours am: 6718e1ee7b
-s ours am: 2906d7dceb
-s ours am: 5333f656cb
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15608116
Change-Id: Ic9b3f52f4d391c410ba9fce4dd3c06ff271eb9f5
2021-08-19 18:45:11 +00:00
Bill Yi
214068856c
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f391df2089
-s ours am: 6a0b815394
-s ours am: d26b631da5
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15607375
Change-Id: I1ec620bc435cc8cade11eedcd40b14aecd74a5bc
2021-08-19 18:45:10 +00:00
Bill Yi
dbb7139670
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f391df2089
-s ours am: 6a0b815394
-s ours am: d26b631da5
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15607375
Change-Id: Ia20257ffd7d365143c7f20da2c8694f07695f721
2021-08-19 18:45:08 +00:00
Bill Yi
7cf6899a9f
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 15b602ca6e
-s ours am: 6b38523ea7
-s ours am: d14aa78c7a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15607372
Change-Id: I094bfa812ab417a3e9f2383f3c0606dd6354e4f2
2021-08-19 18:36:45 +00:00
Bill Yi
5104f6c447
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 15b602ca6e
-s ours am: 57f1c163d3
-s ours am: 4b72049845
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15607372
Change-Id: Id4fc45428e44702a9b37541c9daa70de82e078c4
2021-08-19 18:36:11 +00:00
Bill Yi
5333f656cb
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 88a0994ed8
-s ours am: 6718e1ee7b
-s ours am: 2906d7dceb
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15608116
Change-Id: I282f2eb8c069e363b31ff018ff51f1a45b37e757
2021-08-19 18:30:11 +00:00
Bill Yi
d26b631da5
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f391df2089
-s ours am: 6a0b815394
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15607375
Change-Id: I034015cd37baa3a0e64c4821684ecaf08348c2b8
2021-08-19 18:30:04 +00:00
Bill Yi
d14aa78c7a
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 15b602ca6e
-s ours am: 6b38523ea7
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15607372
Change-Id: I471e1732559ef8be5da269d0ac57e8e9248d0b0a
2021-08-19 18:17:42 +00:00