Bill Yi
34a76b5ade
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: b660ca5570
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22696128
Change-Id: I8708ea492ca3c6534ff43d95fae2379304c79a88
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-19 18:25:57 +00:00
Bill Yi
436870a9f8
Merge changes from topic "tc_change_23041807_35" into tm-qpr-dev-plus-aosp am: 7d7a461c85
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22696133
Change-Id: I18e3868170489566921fc1d8cfed9b135739831e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-19 18:19:06 +00:00
Bill Yi
c173d9de53
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 4ff10a38f4
am: 7fc6abdfb9
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22696133
Change-Id: Idf57fa8698bf03665f9588a3182729cff63192c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-19 18:18:23 +00:00
Bill Yi
7d7a461c85
Merge changes from topic "tc_change_23041807_35" into tm-qpr-dev-plus-aosp
...
* changes:
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 4ff10a38f4
Import translations. DO NOT MERGE ANYWHERE
2023-04-19 17:59:19 +00:00
Diya Bera
6fbfec99c8
Merge "Adding owners" am: b1aabec0db
am: 49ea4e5d22
am: 8a31106496
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2546170
Change-Id: Ie1505f0272340b867648341bfe01f26e948f14b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-19 17:54:50 +00:00
Bill Yi
b660ca5570
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod
2023-04-19 17:44:26 +00:00
Bill Yi
ddff8a4b4d
Merge changes from topic "tc_change_23041807_28" into udc-dev
...
* changes:
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 488128bd1d
Import translations. DO NOT MERGE ANYWHERE
2023-04-19 17:44:25 +00:00
Diya Bera
8a31106496
Merge "Adding owners" am: b1aabec0db
am: 49ea4e5d22
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2546170
Change-Id: Ibfc5a6684f98c842f95f5cb125310d89a0035644
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-19 17:39:42 +00:00
Diya Bera
49ea4e5d22
Merge "Adding owners" am: b1aabec0db
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2546170
Change-Id: Ib03f9e473201e6a826cb7810e32b00ad1e3da965
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-19 17:11:26 +00:00
Diya Bera
b1aabec0db
Merge "Adding owners"
2023-04-19 16:30:18 +00:00
Pavel Grafov
b8d639c8fe
Merge "Fix uninstall button can't click problem" into udc-dev
2023-04-19 12:50:27 +00:00
Bill Yi
2c5359dd0b
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 26ca87ddff
am: 411d527b94
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22696131
Change-Id: I96be7c465959b1301eb2ca154f8cc93369685d37
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-19 08:25:57 +00:00
YK Hung
3f9363aaff
Merge "Fix banner tip buttons visibility and update incompatible tip" into udc-dev
2023-04-19 07:40:45 +00:00
ykhung
ab07b53ea1
Fix banner tip buttons visibility and update incompatible tip
...
Fix the battery settings banner tip buttons visibility not reset issue
and update the incompatible charging tip into the colored primary button
Bug: 246960554
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.fuelgauge.*
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.widget.CardPreferenceTest
Change-Id: I9b72fccc7838d974d3b60d0f9684780841623cbb
2023-04-19 06:24:51 +00:00
Zoey Chen
5614c1e7dc
Merge "[Settings] Remove the large space when searching language" into udc-dev
2023-04-19 05:19:56 +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
ot904699
f1f4097f20
Fix uninstall button can't click problem
...
Install CtsVerifier.apk and CtsEmptyDeviceAdmin.apk. When CtsEmptyDeviceAdmin is active device administrator, “Uninstall” button can’t click, we can’t uninstall the apk.
Compared with Android T, the ability to uninstall Active admin's apk is disabled by default on Android U. Make this cts test pass after modifying the setup code
Bug: 277545241
Test: manually
1. Enter the CtsVerifier apk
2. Click “Device Admin Uninstall Test”
3. Click “ENABLE ADMIN”, then click “Activate this device admin app”
4. Click “LAUNCH SETTINGS”
(cherry picked from https://partner-android-review.googlesource.com/q/commit:67ecb5aef52d18332402d88a418aa4b87d047b87 )
Merged-In: I200cfe56a3529e9c6ee5eebf4b2606237608a4b2
Change-Id: I200cfe56a3529e9c6ee5eebf4b2606237608a4b2
2023-04-19 03:21:53 +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
Diya Bera
33fab7e415
Adding owners
...
Test: N/A
Bug: 278741020
Change-Id: Ife62f56fd0e3c83427347365a1eebfad3ec3ed6d
2023-04-18 22:56:31 +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
Zoey Chen
7026760615
[Settings] Remove the large space when searching language
...
Don't expand the tool bar when users search the language because they will see a large space on the top.
Bug: 254387685
Test: local test
Change-Id: I52fbf4be47885ea6c7d2b6abb75db99c1690edca
2023-04-18 17:20:42 +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
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
411d527b94
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 26ca87ddff
...
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22696131
Change-Id: Ie14298c9668f64979607171a25d97bae63266787
2023-04-18 14:31:18 +00:00
Bill Yi
7fc6abdfb9
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 4ff10a38f4
...
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22696133
Change-Id: Id8ec8521ee5f526a2e3e88c310371115cee8011c
2023-04-18 14:29:59 +00:00
Bill Yi
dc1e24b89e
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 488128bd1d
...
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22696128
Change-Id: I7e6b0f985caf0ebf223b5556d0074101a748d43e
2023-04-18 14:25:46 +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
c974342073
Merge "[Settings] Update the footer link in Regional Preferences" into udc-dev
2023-04-18 11:17:16 +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
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
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
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
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
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
4d5ac5a89f
Merge "[Safety Labels] Filter out auto, wear and tv" into udc-dev
2023-04-17 19:53:43 +00:00
Becca Hughes
e18613ccc6
Merge "Add dialog for enabling a provider in settings" into udc-dev
2023-04-17 19:42:57 +00:00