PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
127,328 Commits 1 Branch 0 Tags
3c35c8fe93baed6a31ebbcaa764f1a6ed4559d8c
Commit Graph

127328 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Peter Zhang
15a11c4123 Merge "Expand SettingsLib ProviderTile to support non-switch type of Preferences" into udc-d1-dev 2023-05-12 12:08:00 +00:00
Oli Thompson
c5d6f00d7c Merge "Update Work profile settings" into udc-dev am: 787a054c93 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22252125

Change-Id: I7fb263356e2430ec4aaddf3222c45e1fc9885167
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-12 11:40:19 +00:00
Oli Thompson
6ea5106ae6 Merge "Update Work profile settings" into udc-dev am: 787a054c93 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22252125

Change-Id: I6bc4625b6cdf79aa437d525aff8778b553ed2c4f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-12 11:40:18 +00:00
Oli Thompson
ef25255311 Merge "Update Work profile settings" into udc-dev am: 787a054c93 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22252125

Change-Id: Ida56d040d8ea5361f3aa57dd8fecd62124a438d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-12 11:36:03 +00:00
Oli Thompson
787a054c93 Merge "Update Work profile settings" into udc-dev 2023-05-12 11:05:57 +00:00
Wesley Wang
77deb463a0 Update battery settings remaining time format 
- Update the remaining time format to align with status bar
 - Remove unused test case since no more less than 7 or 15 remaining time
   case for battery settings
 screenshots:
   https://screenshot.googleplex.com/8jPYPj7yznGFU4b.png
   https://screenshot.googleplex.com/5GYXA2tusSUVmVQ.png
   https://screenshot.googleplex.com/3EnB3ejAxAzP28q.png
   https://screenshot.googleplex.com/5jeUxwBEyHotf9d.png

Bug: 281685505
Test: make SettingsLibRoboTests
Change-Id: If33e1828582845f78d8ef666c2b74ab5bba22357
 2023-05-12 11:05:05 +00:00
Chaohui Wang
3988d11ddd Fix Bluetooth tethering toggle status 
The mBluetoothPan is updated async, toggle status is set before data
loaded.

Refresh the status after load to fix this issue.

Fix: 272525310
Test: Manually when Bluetooth tethering is on
Change-Id: Ia306f3648ba8d32a63a8ec6c72260f7f43b830bc
 2023-05-12 09:47:40 +00:00
SongFerngWang
0faf38eadd The UI does not remove the preference 
The LE audio structure have two or more devices, it use CSIP to combine
them with the groupId. It breaks the UI structure, since the UI use the
map to save relationship between the bluetoothDevice and preference.
There are two or more devices using the same UI, it causes UI show the
wrong preference when CSIP do switching of device.
Remove the unuse device when UI refreshing.

Bug: 281697186
Test: Build pass
Test: make RunSettingsRoboTests ROBOTEST_FILTER=AvailableMediaDeviceGroupControllerTest
Change-Id: I798cf9edb590c4a25273913d2f2faf0ed4364ba9
 2023-05-12 17:18:37 +08:00
Tom Hsu
280a15115b Merge "[Settings] Avoid to unregister wrong observer" into udc-dev am: 0af8c60342 am: 77e126db56 am: d263a5921f am: 77c9823925 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23162866

Change-Id: I0484ef090d992590dbb3605469592a39a838bda3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-12 08:12:48 +00:00
Tom Hsu
e37f6e81bb Merge "[Settings] Avoid to unregister wrong observer" into udc-dev am: 0af8c60342 am: db6119e840 am: 112101f8b6 am: 8c65620634 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23162866

Change-Id: Idf53a229efea266b9fd3a8baa048f1f83f309c48
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-12 08:12:15 +00:00
Tom Hsu
d64d10c634 Merge "[Settings] Avoid to unregister wrong observer" into udc-dev am: 0af8c60342 am: 77e126db56 am: 09169f4b1b am: 962281ed71 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23162866

Change-Id: Ie4ffe2c67d779689b2c5c7976e09c2fefefe9ccf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-12 08:11:41 +00:00
Tom Hsu
77c9823925 Merge "[Settings] Avoid to unregister wrong observer" into udc-dev am: 0af8c60342 am: 77e126db56 am: d263a5921f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23162866

Change-Id: Id45994bfc25567a8dafca5b1282370e7c6ac8c89
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-12 07:29:16 +00:00
Tom Hsu
8c65620634 Merge "[Settings] Avoid to unregister wrong observer" into udc-dev am: 0af8c60342 am: db6119e840 am: 112101f8b6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23162866

Change-Id: I37db35a8dee50f3543bce6d245deb0974b0a1749
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-12 07:24:06 +00:00
Tom Hsu
962281ed71 Merge "[Settings] Avoid to unregister wrong observer" into udc-dev am: 0af8c60342 am: 77e126db56 am: 09169f4b1b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23162866

Change-Id: I037551db51f7812b43933482e09b314dd2c08b2c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-12 07:23:40 +00:00
Tom Hsu
d263a5921f Merge "[Settings] Avoid to unregister wrong observer" into udc-dev am: 0af8c60342 am: 77e126db56 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23162866

Change-Id: Ia012c94bca619f1d2165a89908341b2c9aed98d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-12 06:48:00 +00:00
Tom Hsu
112101f8b6 Merge "[Settings] Avoid to unregister wrong observer" into udc-dev am: 0af8c60342 am: db6119e840 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23162866

Change-Id: Iafba4887605950791b6a3c1073ddb1957d1c8b6b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-12 06:47:05 +00:00
Tom Hsu
09169f4b1b Merge "[Settings] Avoid to unregister wrong observer" into udc-dev am: 0af8c60342 am: 77e126db56 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23162866

Change-Id: Ic32dc15740c5295a939c76f67dde7ee77444063d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-12 06:44:01 +00:00
Tom Hsu
532b306fb1 Merge "[Settings] Avoid to unregister wrong observer" into udc-dev am: 0af8c60342 am: 2dfa7516f0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23162866

Change-Id: I137bdf47b966c90def67144034e7d61206b8ebac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-12 06:42:24 +00:00
Zoey Chen
7d3f2c211e Merge "[Panlingual] Do not show dialog in recycle. Set LocaleEditor as the parent fragment and control the dialog." into udc-dev am: 4d917d990f am: 7b4f5c8a50 am: eb5eb22acc am: d1612d15ab 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23074017

Change-Id: Ic7aa5cc0c08c3c00aaef4b8643721de63c53dbcf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-12 06:08:51 +00:00
Yanting Yang
bf0f0b1e5b Merge "Make “Reset app preferences” restricted by DISALLOW_APPS_CONTROL" into udc-dev am: f0e440109f am: f2c5b7f2e7 am: 64c085bd19 am: 8d3a7b50da 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23155084

Change-Id: Iaca0fa078a5d951c3b8cfa5eab7c4535f3b1d905
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-12 06:08:37 +00:00
Zoey Chen
81cd4b94e5 Merge "[Panlingual] Do not show dialog in recycle. Set LocaleEditor as the parent fragment and control the dialog." into udc-dev am: 4d917d990f am: 6d57de3418 am: b1b90fa6f1 am: 869ee49aa6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23074017

Change-Id: I7dc1bfcb4d2f4d3bccd7095e01575330107d9cc3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-12 06:08:23 +00:00
Yanting Yang
7aa1e54ada Merge "Make “Reset app preferences” restricted by DISALLOW_APPS_CONTROL" into udc-dev am: f0e440109f am: eb028da005 am: c5362c1c60 am: 5687cc2ce1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23155084

Change-Id: If82e3b78f1aaf44e1b04f1a73a3d5e69e779ba6a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-12 06:07:50 +00:00
Zoey Chen
44d60d887b Merge "[Panlingual] Do not show dialog in recycle. Set LocaleEditor as the parent fragment and control the dialog." into udc-dev am: 4d917d990f am: 7b4f5c8a50 am: dea9562e08 am: b366deb16c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23074017

Change-Id: I47252ba38fb99703cb348118baebd0bfb5b8ff91
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-12 06:06:58 +00:00
Yanting Yang
fe8720449e Merge "Make “Reset app preferences” restricted by DISALLOW_APPS_CONTROL" into udc-dev am: f0e440109f am: f2c5b7f2e7 am: 915d32a8a8 am: cc3502c992 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23155084

Change-Id: I585973bea576310b28343190e4f1a918f89b460e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-12 06:06:01 +00:00
Tom Hsu
77e126db56 Merge "[Settings] Avoid to unregister wrong observer" into udc-dev am: 0af8c60342 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23162866

Change-Id: I4c31c0f22b392025b8430d8e9fcc75b0eb2e54d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-12 06:04:41 +00:00
Tom Hsu
2dfa7516f0 Merge "[Settings] Avoid to unregister wrong observer" into udc-dev am: 0af8c60342 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23162866

Change-Id: I7f0712c0b0da36e8b81ebe6a425bb1f6fa352fe5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-12 06:04:38 +00:00
Tom Hsu
db6119e840 Merge "[Settings] Avoid to unregister wrong observer" into udc-dev am: 0af8c60342 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23162866

Change-Id: I968669dafda341eb56e4f8d43fd4c51854595b7b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-12 06:00:22 +00:00
jasonwshsu
212470d0a6 Move 'Audio Output' to Accessibility hearing device page 
* Extract the common part into HearingAidHelper.
* Remove abstract getHearingDevice(). Change to get the hearing device when needed.
* Move several classes from Bluetooth into Accessibility

Bug: 281783079
Test: make RunSettingsRoboTests ROBOTEST_FILTER="(HearingDeviceAudioRoutingBasePreferenceControllerTest|AccessibilityHearingAidPreferenceControllerTest|HearingAidHelperTest|HearingAidAudioRoutingPreferenceControllerTest|HearingDeviceCallRoutingPreferenceControllerTest)"
Change-Id: I79049107409b7086c6dcc8d48a6323e171ed1535
 2023-05-12 13:46:53 +08:00
Zoey Chen
d1612d15ab Merge "[Panlingual] Do not show dialog in recycle. Set LocaleEditor as the parent fragment and control the dialog." into udc-dev am: 4d917d990f am: 7b4f5c8a50 am: eb5eb22acc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23074017

Change-Id: I291150d24fe8f379ca7cf9153d3f82d87bf0ac45
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-12 05:22:06 +00:00
Yanting Yang
8d3a7b50da Merge "Make “Reset app preferences” restricted by DISALLOW_APPS_CONTROL" into udc-dev am: f0e440109f am: f2c5b7f2e7 am: 64c085bd19 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23155084

Change-Id: I76de86e986a6f36a681d0b9c8b736a86e232b09f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-12 05:21:55 +00:00
Zoey Chen
869ee49aa6 Merge "[Panlingual] Do not show dialog in recycle. Set LocaleEditor as the parent fragment and control the dialog." into udc-dev am: 4d917d990f am: 6d57de3418 am: b1b90fa6f1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23074017

Change-Id: I0736117961fea644e9f03a0a040ebba756def342
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-12 05:18:02 +00:00
Yanting Yang
5687cc2ce1 Merge "Make “Reset app preferences” restricted by DISALLOW_APPS_CONTROL" into udc-dev am: f0e440109f am: eb028da005 am: c5362c1c60 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23155084

Change-Id: I106150778012cab3ed0ddf7135cb6a1832ea106b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-12 05:17:55 +00:00
Zoey Chen
b366deb16c Merge "[Panlingual] Do not show dialog in recycle. Set LocaleEditor as the parent fragment and control the dialog." into udc-dev am: 4d917d990f am: 7b4f5c8a50 am: dea9562e08 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23074017

Change-Id: I0a0faadbc6b375139b1b1610a3501f974680b3cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-12 05:17:40 +00:00
Yanting Yang
cc3502c992 Merge "Make “Reset app preferences” restricted by DISALLOW_APPS_CONTROL" into udc-dev am: f0e440109f am: f2c5b7f2e7 am: 915d32a8a8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23155084

Change-Id: I7eb4192f76e354bda7b24308ffbeec90449b881f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-12 05:17:02 +00:00
Tom Hsu
0af8c60342 Merge "[Settings] Avoid to unregister wrong observer" into udc-dev 2023-05-12 05:16:28 +00:00
Zoey Chen
b1b90fa6f1 Merge "[Panlingual] Do not show dialog in recycle. Set LocaleEditor as the parent fragment and control the dialog." into udc-dev am: 4d917d990f am: 6d57de3418 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23074017

Change-Id: I8cd9ec695210a0f2de01e5cd1f08f48bba2d67df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-12 04:40:00 +00:00
Yanting Yang
c5362c1c60 Merge "Make “Reset app preferences” restricted by DISALLOW_APPS_CONTROL" into udc-dev am: f0e440109f am: eb028da005 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23155084

Change-Id: I4147d575a97d5df1d8e92fe2a192eddacc8b23d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-12 04:39:45 +00:00
Zoey Chen
eb5eb22acc Merge "[Panlingual] Do not show dialog in recycle. Set LocaleEditor as the parent fragment and control the dialog." into udc-dev am: 4d917d990f am: 7b4f5c8a50 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23074017

Change-Id: Ie28b6c967247bc6206aeac6cb91da9ab216b0a14
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-12 04:38:53 +00:00
Yanting Yang
64c085bd19 Merge "Make “Reset app preferences” restricted by DISALLOW_APPS_CONTROL" into udc-dev am: f0e440109f am: f2c5b7f2e7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23155084

Change-Id: Icf34fd8963fb99eb9a5b85c8a14489290bfd7f80
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-12 04:38:46 +00:00
Zoey Chen
dea9562e08 Merge "[Panlingual] Do not show dialog in recycle. Set LocaleEditor as the parent fragment and control the dialog." into udc-dev am: 4d917d990f am: 7b4f5c8a50 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23074017

Change-Id: I3e70cc01ec8c768f93f01030b4b06b94381c235b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-12 04:34:49 +00:00
Zoey Chen
814bcdc33d Merge "[Panlingual] Do not show dialog in recycle. Set LocaleEditor as the parent fragment and control the dialog." into udc-dev am: 4d917d990f am: 34911e336c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23074017

Change-Id: Ie1affc5347d3bad2da6672efe2faffca5536c0bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-12 04:34:46 +00:00
Yanting Yang
c164a9af40 Merge "Make “Reset app preferences” restricted by DISALLOW_APPS_CONTROL" into udc-dev am: f0e440109f am: 76d3a97aa9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23155084

Change-Id: Ie538852e678cb710fff0986ae4f7f2da0ad0f9b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-12 04:34:38 +00:00
Yanting Yang
915d32a8a8 Merge "Make “Reset app preferences” restricted by DISALLOW_APPS_CONTROL" into udc-dev am: f0e440109f am: f2c5b7f2e7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23155084

Change-Id: I58d5f3e974ae451a1b3305410ccbabc7ce203b31
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-12 04:34:28 +00:00
TreeHugger Robot
30e7613a0e Merge "Fix failing test cases in MobileNetworkSummaryControllerTest" into udc-dev am: b7b444896e am: d084c192be am: 5f40973695 am: 25c5ed3775 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23157345

Change-Id: If60bc38d22da8267443b1b4bde7d156ed4080c72
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-12 03:57:55 +00:00
Zoey Chen
7b4f5c8a50 Merge "[Panlingual] Do not show dialog in recycle. Set LocaleEditor as the parent fragment and control the dialog." into udc-dev am: 4d917d990f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23074017

Change-Id: I5ddea663b4ddb872a91e3e08bc29466fd48f3d0b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-12 03:57:18 +00:00
Zoey Chen
34911e336c Merge "[Panlingual] Do not show dialog in recycle. Set LocaleEditor as the parent fragment and control the dialog." into udc-dev am: 4d917d990f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23074017

Change-Id: Iad371a6c3dcd90fcf260acb3a5162eea8620c19a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-12 03:57:12 +00:00
Yanting Yang
f2c5b7f2e7 Merge "Make “Reset app preferences” restricted by DISALLOW_APPS_CONTROL" into udc-dev am: f0e440109f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23155084

Change-Id: Ia8fc7ff7f82323e2bd55ad023e90bf6e50431197
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-12 03:57:04 +00:00
Yanting Yang
76d3a97aa9 Merge "Make “Reset app preferences” restricted by DISALLOW_APPS_CONTROL" into udc-dev am: f0e440109f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23155084

Change-Id: I5bd7d6ec4d0f5685a3d629722cc40d8794b378e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-12 03:57:02 +00:00
Zoey Chen
6d57de3418 Merge "[Panlingual] Do not show dialog in recycle. Set LocaleEditor as the parent fragment and control the dialog." into udc-dev am: 4d917d990f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23074017

Change-Id: I7b86992ad5572b2c4bd86b1c5935839bceaa1186
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-12 03:54:12 +00:00
Yanting Yang
eb028da005 Merge "Make “Reset app preferences” restricted by DISALLOW_APPS_CONTROL" into udc-dev am: f0e440109f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23155084

Change-Id: I6d727ab9e5e30f1db9a3b6eb9f0ea63ea44c664d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-12 03:52:46 +00:00