Diya Bera
06a58409b5
Merge "Adding owners" am: b1aabec0db
am: 49ea4e5d22
am: 8a31106496
am: 6fbfec99c8
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2546170
Change-Id: Id79d4e7f1b40509ec145627a86a892d4b3d68d1e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-20 16:59:02 +00:00
Bill Yi
4f7dc016bc
Merge changes from topic "tc_change_23041807_28" into udc-dev am: ddff8a4b4d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22696128
Change-Id: I8e49a528c978f01a04dd990e46b9ab7526c2eb36
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-20 16:54:52 +00:00
Bill Yi
de86fc18b4
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 488128bd1d
am: dc1e24b89e
-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: Ifdeea72838e3264d3bf8814ab4ae24863e7d35ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-20 16:54:43 +00:00
Piotr Wilczyński
2160faafb4
Merge "Back up the smooth display setting" into udc-d1-dev
2023-04-20 13:25:07 +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
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
ccda5d60ce
Merge "Fix uninstall button can't click problem" into udc-dev am: b8d639c8fe
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22645501
Change-Id: Id786ede3ec04b280493ef6a12822ad225b45c1a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-19 13:29:42 +00:00
Pavel Grafov
b8d639c8fe
Merge "Fix uninstall button can't click problem" into udc-dev
2023-04-19 12:50:27 +00:00
Piotr Wilczyński
af320436fb
Back up the smooth display setting
...
- Convert "Smooth display" and "Force peak refresh rate" to a boolean. If they are a boolean, they can be backed up without being device-specific.
- Back up "Smooth display" and add a validator
- Upgrade the settings in SettingsProvider
- Create a utils class - RefreshRateSettingsUtils
Bug: 211737588
Test: atest DisplayModeDirectorTest
Test: atest ForcePeakRefreshRatePreferenceControllerTest
Test: atest PeakRefreshRatePreferenceControllerTest
Test: atest SettingsBackupTest
Test: atest SettingsProviderTest
Change-Id: Ib2cb2dd100f06f5452083b7606109a486e795a0e
2023-04-19 11:35:08 +00:00
Bill Yi
be82b851f0
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 26ca87ddff
am: 411d527b94
-s ours am: 2c5359dd0b
-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: I23a3c024aa1b9761bb917cc22ef6dccb9562285c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-19 09:06:44 +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
ed340caca8
Merge "Fix banner tip buttons visibility and update incompatible tip" into udc-dev am: 3f9363aaff
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22695011
Change-Id: I796a2b706fbce2331ace9388e63244135ddefc60
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-19 08:21:33 +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
446909b4da
Merge "[Settings] Remove the large space when searching language" into udc-dev am: 5614c1e7dc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22713802
Change-Id: I43ce70f1d87fab7093f429b5462fa296f57febb3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-19 05:50:30 +00:00
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
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
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
Diya Bera
33fab7e415
Adding owners
...
Test: N/A
Bug: 278741020
Change-Id: Ife62f56fd0e3c83427347365a1eebfad3ec3ed6d
2023-04-18 22:56:31 +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
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
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
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
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