Bill Yi
e1bef672d7
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 6c08eb4631
...
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22696129
Change-Id: Ife222d96c49520aa63790f9901d188001be3a6e6
2023-04-18 14:25:39 +00:00
Weng Su
d965ff3049
Fallback to "Extended Compatibility" if Speed feature is not ready
...
- Fallback to the "Extended Compatibility" design when the following conditions occur
- 5 GHz band is not supported on the device
- 5 GHz SAP available channels cannot be obtained from WifiManager
- 6 GHz SAP available channels cannot be obtained from WifiManager
Bug: 272450463
Test: manual test
atest -c WifiTetherSettingsTest
atest -c WifiTetherViewModelTest \
WifiHotspotRepositoryTest \
WifiTetherSecurityPreferenceControllerTest.java \
WifiTetherMaximizeCompatibilityPreferenceControllerTest
Change-Id: If7c8c41ebe86f5e7d8e4737ab7a82d38c9d633de
2023-04-18 20:49:25 +08:00
TreeHugger Robot
92e0bf9b1f
Merge "[Settings] Update the footer link in Regional Preferences" into udc-dev am: c974342073
am: 6abeadaf77
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22700947
Change-Id: Iaf6887c5037b07f2dcc6725ca411db2a3f65b69c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-18 12:04:02 +00:00
TreeHugger Robot
c5900dcf26
Merge "[Settings] Update the footer link in Regional Preferences" into udc-dev am: c974342073
am: 4f2f22f89c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22700947
Change-Id: Ida98b40f1b197b5dabe373213fc43ff1f318df32
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-18 12:02:07 +00:00
TreeHugger Robot
6abeadaf77
Merge "[Settings] Update the footer link in Regional Preferences" into udc-dev am: c974342073
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22700947
Change-Id: Iabc92854c80d421f2941ab04ad86ee46d6e4cedc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-18 11:38:58 +00:00
TreeHugger Robot
4f2f22f89c
Merge "[Settings] Update the footer link in Regional Preferences" into udc-dev am: c974342073
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22700947
Change-Id: I1104418200a50b0923793060615c250b8e22e7e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-18 11:38:24 +00:00
TreeHugger Robot
c974342073
Merge "[Settings] Update the footer link in Regional Preferences" into udc-dev
2023-04-18 11:17:16 +00:00
Zoey Chen
a3c3ae6944
Merge "[Settings] Fix the layout index" into udc-dev am: cd719845d6
am: 4f01523156
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22573648
Change-Id: Ie41a3d6d0ae77e6c6192ddd8745e30914f0f11bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-18 10:54:57 +00:00
Zoey Chen
cfff3dc1c2
Merge "[Settings] Fix the layout index" into udc-dev am: cd719845d6
am: affb6ad3c9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22573648
Change-Id: Id1ec4f1e555b5a29c33fba3ce82d44c1f598c2e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-18 10:54:44 +00:00
Zoey Chen
4f01523156
Merge "[Settings] Fix the layout index" into udc-dev am: cd719845d6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22573648
Change-Id: I887e0086b36b621cfdd8ad3d5000e24914757fef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-18 10:32:39 +00:00
Zoey Chen
affb6ad3c9
Merge "[Settings] Fix the layout index" into udc-dev am: cd719845d6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22573648
Change-Id: I25017a2a897fa689c5f103437ae4bae0594c5259
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-18 10:32:37 +00:00
Zoey Chen
cd719845d6
Merge "[Settings] Fix the layout index" into udc-dev
2023-04-18 10:02:40 +00:00
Zoey Chen
5e987f49dd
[Settings] Update the footer link in Regional Preferences
...
Bug: 277573274
Test: local test
Change-Id: I0c02cee71365f98d89d98e4147e1eb5245b7ede9
2023-04-18 09:59:24 +00:00
Bill Yi
84c81f27dc
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I44e550e9606eb4b356466de5cfe7f3115c245d61
2023-04-18 02:42:44 -07:00
Bill Yi
1191199e91
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I9c7161d4b46e81abb26d8f46ab957268ef620dd0
2023-04-18 02:41:31 -07:00
Bill Yi
4d76486764
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I95c8be5f421f2f6468503877f874a69e86debe8e
2023-04-18 02:28:17 -07:00
Automerger Merge Worker
d0fdc9b978
Merge "Merge "Fix pair another dialog doesn't show up after pairing in all bluetooth device page." into udc-dev am: 80016ad92a
am: 2fb71a4548"
2023-04-18 09:26:18 +00:00
Bill Yi
3d7857f8ee
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I95b6db05d8075a6c648695100b5176de5be9c508
2023-04-18 02:25:55 -07:00
Jason Hsu
dd9803ccf7
Merge "Fix pair another dialog doesn't show up after pairing in all bluetooth device page." into udc-dev am: 80016ad92a
am: d3453f681c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22477523
Change-Id: If2daf9293d431799df85b1a1fd299fd16cd1a790
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-18 09:25:41 +00:00
Jason Hsu
d73c3689c2
Merge "Fix pair another dialog doesn't show up after pairing in all bluetooth device page." into udc-dev am: 80016ad92a
am: 2fb71a4548
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22477523
Change-Id: I52afe43b8a614344d8027d7f289e4acda538e48c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-18 09:25:31 +00:00
Bill Yi
f14bb1c1be
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I0effead0d0a2cad9e240f63b0e27a2c66751b6be
2023-04-18 02:23:03 -07:00
Bill Yi
c14169aedc
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I457601e056da068d5c24229d98cd925aaeac01e4
2023-04-18 02:20:35 -07:00
Philip Junker
58e7b70df3
List apps which requested the TURN_SCREEN_ON appOp permission
...
Bug: 272053372
Test: manually installed an app which requests the permission and verified it shows up correctly in Settings > Apps > special app access > Turn screen on
Test: atest AppFilterRegistryTest
Test: atest TurnScreenOnDetailsTest
Test: m -j RunSettingsRoboTests
Test: adb shell am start -a android.settings.TURN_SCREEN_ON_SETTINGS
Change-Id: I7c47d4b1c0b33c7ba6209bb64acf93cb07d9a717
2023-04-18 09:12:44 +00:00
Jason Hsu
2fb71a4548
Merge "Fix pair another dialog doesn't show up after pairing in all bluetooth device page." into udc-dev am: 80016ad92a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22477523
Change-Id: Ia5edae7485315c2cfab27ad65d533d287d3f60ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-18 09:02:16 +00:00
Jason Hsu
d3453f681c
Merge "Fix pair another dialog doesn't show up after pairing in all bluetooth device page." into udc-dev am: 80016ad92a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22477523
Change-Id: I2d794bf5d149f2301364431114abdbe04352e8ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-18 09:00:43 +00:00
Jason Hsu
80016ad92a
Merge "Fix pair another dialog doesn't show up after pairing in all bluetooth device page." into udc-dev
2023-04-18 08:47:37 +00:00
Zoey Chen
e9f6efa2b6
[Settings] Fix the layout index
...
The index of language label's layout is 0 and index of num layout is 1, so the select tp speak will read the language label first.
The root cause of the incorrect index is, the language label's layout starts with the parent layout instead of the num layout in the hierarchy view. Adjust the language label's layout and add these views one by one in the parent view.
Also fix the layout's jumping when user switches the page to "Remove language"
Bug: 277173513
Test: local test
Change-Id: I0d5879a07183713fa50b38f6321a15dd32582518
2023-04-18 08:46:23 +00:00
Treehugger Robot
a790e85c8f
Merge "[BiometricsV2] fix enrolling rotate failed" into udc-dev am: 2a0d6ead1a
am: 9c37881b64
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22651124
Change-Id: Ibc9bdd1c17f4c8de833e7be3ed2c80f8f24901c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-18 05:45:58 +00:00
Treehugger Robot
01605466a8
Merge "[BiometricsV2] fix enrolling rotate failed" into udc-dev am: 2a0d6ead1a
am: 8cf1fe7757
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22651124
Change-Id: I9431fc80ffe0ce638813ede530267e51108c478c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-18 05:28:15 +00:00
Treehugger Robot
9c37881b64
Merge "[BiometricsV2] fix enrolling rotate failed" into udc-dev am: 2a0d6ead1a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22651124
Change-Id: Id9d4afd348cd1274dc37cee3d5fa73b0e88789b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-18 05:26:25 +00:00
Ken Lin
8809994fce
Smooth Display description error
...
Correct max refresh rate
Bug: 278111301
Test: Settings > Display > Smooth Display (and read description)
Change-Id: I9c701596712606ebd9d7d5640edd7dc3135ff5c9
2023-04-18 05:24:14 +00:00
Treehugger Robot
8cf1fe7757
Merge "[BiometricsV2] fix enrolling rotate failed" into udc-dev am: 2a0d6ead1a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22651124
Change-Id: I43de2b80470465f59792f037bd33ebf081c72474
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-18 05:07:20 +00:00
Treehugger Robot
2a0d6ead1a
Merge "[BiometricsV2] fix enrolling rotate failed" into udc-dev
2023-04-18 04:56:12 +00:00
Bill Yi
630293f38d
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I46820cabb9e344157ab7d70c5242e5ee0f2581d5
2023-04-17 21:35:46 -07:00
Bill Yi
4ff10a38f4
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I1c1512d129c76bdf99c95f921b05177f361736a7
2023-04-17 21:33:14 -07:00
Bill Yi
000f82ddbf
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ifdac29e3ea12c427b173eb6a71c2fb93735bdf62
2023-04-17 21:26:39 -07:00
Bill Yi
26ca87ddff
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ie1f7a198b79b22f7e52cda13589a55549189524a
2023-04-17 21:20:25 -07:00
Bill Yi
80169f481e
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I9b0fdc708bc0a562f34e3b29a1e07734d49791da
2023-04-17 21:18:01 -07:00
Priyanka Advani
e69bc8c90e
Merge "Revert "Add receiver for app install/uninstall events""
2023-04-18 04:14:34 +00:00
Bill Yi
6c08eb4631
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I040ac2ddddb7199dd21d9bc5941eb22c32e535a9
2023-04-17 21:13:50 -07:00
Bill Yi
488128bd1d
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ida5f1de75b985bbea418a20e4537a40b213827e6
2023-04-17 21:08:01 -07:00
YK Hung
5c77d0e9ad
Merge "Cleanup smart battery entries (1/3)" into udc-dev am: d9f390010b
am: 74692be06c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22639713
Change-Id: I359b45c03ad73def2647113cc87798fe22d2769f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-18 02:43:54 +00:00
YK Hung
86711b3099
Merge "Cleanup smart battery entries (1/3)" into udc-dev am: d9f390010b
am: 5b55ef3c9e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22639713
Change-Id: I3eedbe5aaf8f2a6e2cfe262ad67795f0f1f0e682
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-18 02:42:49 +00:00
YK Hung
5b55ef3c9e
Merge "Cleanup smart battery entries (1/3)" into udc-dev am: d9f390010b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22639713
Change-Id: I8e5dde75c20ade2e97220f79893d608d1908be3c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-18 02:25:03 +00:00
YK Hung
74692be06c
Merge "Cleanup smart battery entries (1/3)" into udc-dev am: d9f390010b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22639713
Change-Id: Ib0ce398e1d92751367123891c9930735626ae62f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-18 02:22:49 +00:00
YK Hung
d9f390010b
Merge "Cleanup smart battery entries (1/3)" into udc-dev
2023-04-18 01:59:06 +00:00
Daniel Chapin
b215d94d51
Revert "Destroy activity in onStop()"
...
This reverts commit 7a89f15fed
.
Reason for revert: Droidfood blocking bug b/278178618
Change-Id: Ie26b73e1e9584f632625375d36168a42e95e5f02
2023-04-18 00:16:21 +00:00
Priyanka Advani
57a077f8a5
Revert "Add receiver for app install/uninstall events"
...
This reverts commit 86e092d84a
.
Reason for revert: Probable culprit for b/278615544.
Change-Id: I5ff8730ab3e1974967b8c9f840f0ee3110dad483
2023-04-17 23:05:32 +00:00
Jay Sullivan
70b6694fa1
Merge "[Safety Labels] Filter out auto, wear and tv" into udc-dev am: 4d5ac5a89f
am: a90fd5c5cb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22562077
Change-Id: I22f5c61b69d90595bcfa5769881cd183ad6e54d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-17 20:57:17 +00:00
Becca Hughes
bc5a9b2fd8
[automerger skipped] Merge "Add dialog for enabling a provider in settings" into udc-dev am: e18613ccc6
am: 167ba43c34
-s ours
...
am skip reason: Merged-In I404444115f178faf5545dec9686096fcdfdf73de with SHA-1 b69351b06d
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22605959
Change-Id: I6748ff3f2cb180aae4135104f5111464e9744fa7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-17 20:57:04 +00:00