Bill Yi
a3d465081c
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 16148bb1bb -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22696134
Change-Id: Iafb69c48922b83ec80ab6f0c15d7b91cd4258387
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-19 05:45:33 +00:00
Bill Yi
1ab0953e8f
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 630293f38d -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22696134
Change-Id: Ie3eeb57357c8264f5b16848e724d23f59d791c01
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-19 05:45:27 +00:00
Bill Yi
bc5e8d9f68
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 7fc901a9ed -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22696132
Change-Id: I4469947383923e11fb91efdb786c211e2a98d6ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-19 05:45:15 +00:00
Bill Yi
59c2d1b5ed
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 000f82ddbf -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22696132
Change-Id: I053e455105db28b1fe2a9fc0c9e86e85c2fd5688
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-19 05:45:02 +00:00
Bill Yi
d0a2e9fe6b
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 5bd7827d1e -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22696130
Change-Id: I81629a7373bb6c8c69651e8ebb5391c10adc916d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-19 05:44:41 +00:00
Bill Yi
1067dfedf0
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 80169f481e -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22696130
Change-Id: Ia4ef6165e70b273da968d15e6c66b163950521d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-19 05:44:24 +00:00
Bill Yi
16148bb1bb
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev
2023-04-19 04:54:01 +00:00
Bill Yi
7fc901a9ed
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev
2023-04-19 04:54:01 +00:00
Bill Yi
5bd7827d1e
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev
2023-04-19 04:54:01 +00:00
Treehugger Robot
520803758a
Merge changes from topic "tc_change_23041807_29" into udc-dev am: b9faf7089d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22696129
Change-Id: I25b8c46633526be2b7562f4bfef198fe84febf05
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-19 01:53:42 +00:00
Bill Yi
7a75e2eea3
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 6c08eb4631 am: e1bef672d7 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22696129
Change-Id: I2156a63f31fea0a141f4ee93307d7b2a64faa906
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-19 01:53:34 +00:00
Treehugger Robot
c04510b030
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev
2023-04-19 01:47:24 +00:00
Treehugger Robot
ba1e5f7d00
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev
2023-04-19 01:47:24 +00:00
Treehugger Robot
363f246acd
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev
2023-04-19 01:47:24 +00:00
Treehugger Robot
b9faf7089d
Merge changes from topic "tc_change_23041807_29" into udc-dev
...
* changes:
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 6c08eb4631
Import translations. DO NOT MERGE ANYWHERE
2023-04-19 01:43:57 +00:00
Linyu He
e6c3d5d893
Merge "Revert "List apps which requested the TURN_SCREEN_ON appOp permi..."" into udc-dev am: e346dc6779
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22715841
Change-Id: I0a228f9c512ee444a245e67b10a83849e53ed51b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-18 20:04:09 +00:00
Treehugger Robot
4ec47457ec
Merge "Revert "Destroy activity in onStop()"" into udc-dev am: 6112e583d7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22691451
Change-Id: Ib9d623e75db46f94f9b617077c9f7f96926f427f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-18 19:58:43 +00:00
Linyu He
e346dc6779
Merge "Revert "List apps which requested the TURN_SCREEN_ON appOp permi..."" into udc-dev
2023-04-18 19:36:45 +00:00
Treehugger Robot
6112e583d7
Merge "Revert "Destroy activity in onStop()"" into udc-dev
2023-04-18 19:07:33 +00:00
Liana Kazanova
94f08e4ba1
Revert "List apps which requested the TURN_SCREEN_ON appOp permi..."
...
Revert submission 22338257-turnScreenOnPermission_pregrant
Reason for revert: b/278739832
Reverted changes: /q/submissionid:22338257-turnScreenOnPermission_pregrant
Change-Id: Iada276497c37c0e89a2cde8706394949d468e8e5
2023-04-18 17:47:14 +00:00
Treehugger Robot
b24b622c3c
Merge "Fallback to "Extended Compatibility" if Speed feature is not ready" into udc-dev am: dc02736824
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22651125
Change-Id: I655b1178eaea787df684067ee4e09283f3969625
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-18 16:56:25 +00:00
Treehugger Robot
dc02736824
Merge "Fallback to "Extended Compatibility" if Speed feature is not ready" into udc-dev
2023-04-18 16:21:11 +00:00
Philip Junker
821e2b5d8b
Merge "List apps which requested the TURN_SCREEN_ON appOp permission" into udc-dev am: c57e5c0e2c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22223104
Change-Id: I35d6b22c7ca33e80abb265a9f0bb1fbaf1eb2279
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-18 15:53:33 +00:00
Philip Junker
c57e5c0e2c
Merge "List apps which requested the TURN_SCREEN_ON appOp permission" into udc-dev
2023-04-18 15:36:55 +00:00
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
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
c974342073
Merge "[Settings] Update the footer link in Regional Preferences" into udc-dev
2023-04-18 11:17:16 +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
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
4d76486764
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I95c8be5f421f2f6468503877f874a69e86debe8e
2023-04-18 02:28:17 -07: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
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
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
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
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
80169f481e
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I9b0fdc708bc0a562f34e3b29a1e07734d49791da
2023-04-17 21:18:01 -07: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
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
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
Jay Sullivan
d8ca8de897
Merge "[Safety Labels] Filter out auto, wear and tv" into udc-dev am: 4d5ac5a89f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22562077
Change-Id: I4fdeabc560b05e96633729158e904243d08b8aec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-17 20:23:56 +00:00
Becca Hughes
7d818f8f53
Merge "Add dialog for enabling a provider in settings" into udc-dev am: e18613ccc6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22605959
Change-Id: Ifd7a9e4a9aa944b320db9f92add53accc7be9478
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-17 20:11:44 +00:00
Jay Sullivan
4d5ac5a89f
Merge "[Safety Labels] Filter out auto, wear and tv" into udc-dev
2023-04-17 19:53:43 +00:00