PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
112,631 Commits 1 Branch 0 Tags
fb2c38dea7e710b527f7cc64b43b2211294c7540
Commit Graph

112631 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
fb2c38dea7 Merge "[Le Audio] Remove the redundant code" 2022-06-29 05:32:47 +00:00
Zoey Chen
2e7cb6f40f [Le Audio] Remove the redundant code 
Bug: 237375847
Test: manual
Change-Id: Ice64a61c92d87eee0981453640a1401e10d6fd83
 2022-06-29 02:03:11 +00:00
Liahav Eitan
21d6249393 Merge "Load work apps in RecentAppStatsMixin" 2022-06-28 15:46:45 +00:00
Liahav Eitan
82e81e23e0 Load work apps in RecentAppStatsMixin 
This change will show work apps and personal apps together in the
recent apps settings page, sorted by decreasing last usage time.

Test: see both work and personal apps in the recent apps page in the
correct order.
Fix: 146921442

Change-Id: I174a556010529bc39c085cc006722bc2947535bd
 2022-06-28 13:20:36 +00:00
SongFerng Wang
3c2aebb28b [automerger skipped] Merge changes from topic "cherrypick-LE_summary_active-smt2rklmox" am: e27d1790f8 am: 2225b7058b am: f0973dfa33 -s ours am: 96aca02753 -s ours am: 84c0900c8a -s ours 
am skip reason: Merged-In Idb746e42480f99846efb5d1e4d4a411a5a9ca296 with SHA-1 cefad1e4b7 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2138453

Change-Id: I2fd320eb64da2967e048ca9097704ac1c0530ccd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-28 12:52:10 +00:00
SongFerngWang
428982fe41 [automerger skipped] The UI only shows the active LE device am: 7f6fcce1d5 am: 787a0e0249 am: 7c173b36f8 -s ours am: 9f1ce23550 -s ours am: 85bda3b09f -s ours 
am skip reason: Merged-In Iac661206def4d43bc40ab9bb1938f084926899c2 with SHA-1 6426382e90 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2138452

Change-Id: Id14e7b6b086eecd103f9c5be6649af690c2c7152
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-28 12:52:08 +00:00
SongFerng Wang
84c0900c8a [automerger skipped] Merge changes from topic "cherrypick-LE_summary_active-smt2rklmox" am: e27d1790f8 am: 2225b7058b am: f0973dfa33 -s ours am: 96aca02753 -s ours 
am skip reason: Merged-In Idb746e42480f99846efb5d1e4d4a411a5a9ca296 with SHA-1 cefad1e4b7 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2138453

Change-Id: I3d6d8cfe7f6412b84a98f6edb3b3f7a2fdec7f58
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-28 12:24:51 +00:00
SongFerngWang
85bda3b09f [automerger skipped] The UI only shows the active LE device am: 7f6fcce1d5 am: 787a0e0249 am: 7c173b36f8 -s ours am: 9f1ce23550 -s ours 
am skip reason: Merged-In Iac661206def4d43bc40ab9bb1938f084926899c2 with SHA-1 6426382e90 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2138452

Change-Id: I87493c9cd5c65b40d1cddf6da98ab0c946b0d7ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-28 12:24:47 +00:00
SongFerng Wang
96aca02753 [automerger skipped] Merge changes from topic "cherrypick-LE_summary_active-smt2rklmox" am: e27d1790f8 am: 2225b7058b am: f0973dfa33 -s ours 
am skip reason: Merged-In Idb746e42480f99846efb5d1e4d4a411a5a9ca296 with SHA-1 cefad1e4b7 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2138453

Change-Id: I7fe8794b536147a489e9689fb174d9435695703f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-28 12:08:51 +00:00
SongFerngWang
9f1ce23550 [automerger skipped] The UI only shows the active LE device am: 7f6fcce1d5 am: 787a0e0249 am: 7c173b36f8 -s ours 
am skip reason: Merged-In Iac661206def4d43bc40ab9bb1938f084926899c2 with SHA-1 6426382e90 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2138452

Change-Id: I59e3dc774cd97748239407b1f89374dfd09e9827
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-28 12:08:47 +00:00
Amy Hsu
614fd14a91 Merge "[RRS] Avoid the resolution switch too rapidly." into tm-d1-dev am: d5279ceae3 am: 414d2bf243 am: c013013dfc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18800521

Change-Id: Ied5ef6b5ca5024f5a4da821210a26e25f5a36256
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-28 11:45:20 +00:00
Amy Hsu
e20ff93aad Merge "[RRS] Avoid the resolution switch too rapidly." into tm-d1-dev am: d5279ceae3 am: 6de8a405d7 am: 2ecdab0154 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18800521

Change-Id: I994bd304b2213d8bf300e16abc5845409d8bc89f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-28 11:45:10 +00:00
SongFerng Wang
f0973dfa33 Merge changes from topic "cherrypick-LE_summary_active-smt2rklmox" am: e27d1790f8 am: 2225b7058b 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2138453

Change-Id: Iecbe5647bbe469a0239b594692f66c0226e16df8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-28 11:45:09 +00:00
SongFerngWang
7c173b36f8 The UI only shows the active LE device am: 7f6fcce1d5 am: 787a0e0249 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2138452

Change-Id: I6e57db85b4d10586d111e39dcd7ee77e67fd9d74
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-28 11:45:05 +00:00
Amy Hsu
c013013dfc Merge "[RRS] Avoid the resolution switch too rapidly." into tm-d1-dev am: d5279ceae3 am: 414d2bf243 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18800521

Change-Id: I6301ed46ad49e77164eada14ff50cb4916c9eb19
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-28 11:24:39 +00:00
Amy Hsu
2ecdab0154 Merge "[RRS] Avoid the resolution switch too rapidly." into tm-d1-dev am: d5279ceae3 am: 6de8a405d7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18800521

Change-Id: I6c0d60693e62bf0fbed8f58ee5571dcf2702638f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-28 11:24:19 +00:00
SongFerng Wang
2225b7058b Merge changes from topic "cherrypick-LE_summary_active-smt2rklmox" am: e27d1790f8 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2138453

Change-Id: I45a7c8fd77798a873db7ea10683b861ee83b8622
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-28 10:10:23 +00:00
SongFerngWang
787a0e0249 The UI only shows the active LE device am: 7f6fcce1d5 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2138452

Change-Id: I19dc6c505e7ec9824cf520824ea1ed2d9dcfc196
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-28 10:10:22 +00:00
Amy Hsu
414d2bf243 Merge "[RRS] Avoid the resolution switch too rapidly." into tm-d1-dev am: d5279ceae3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18800521

Change-Id: I7adc73353a1674fd950ef211cedc857da1d235c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-28 09:35:42 +00:00
Amy Hsu
6de8a405d7 Merge "[RRS] Avoid the resolution switch too rapidly." into tm-d1-dev am: d5279ceae3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18800521

Change-Id: Ia2572f07b47813095947d15d4665a378c1756f18
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-28 09:35:41 +00:00
SongFerng Wang
e27d1790f8 Merge changes from topic "cherrypick-LE_summary_active-smt2rklmox" 
* changes:
  Fix the testcase error
  The UI only shows the active LE device
 2022-06-28 09:27:02 +00:00
Amy Hsu
d5279ceae3 Merge "[RRS] Avoid the resolution switch too rapidly." into tm-d1-dev 2022-06-28 09:09:23 +00:00
SongFerngWang
30a312975c Fix the testcase error 
The BluetoothDeviceUdater added the checking whether the item is in the
list. It caused this testcase failed.
Add more mocks for this testcase.

Bug: 237223797
Test: make RunSettingsRoboTests ROBOTEST_FILTER=BluetoothDevicesSliceTest
Change-Id: Idb746e42480f99846efb5d1e4d4a411a5a9ca296
Merged-In: Idb746e42480f99846efb5d1e4d4a411a5a9ca296
 2022-06-28 15:18:39 +08:00
SongFerng Wang
c1078b43b3 Merge "Fix the testcase error" into tm-d1-dev am: 602fe375d9 am: 2bcd1f3897 am: 87b049196b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19083766

Change-Id: I63a5590a3ad6cb4f831a36ba432c5b0bcc6a007f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-28 07:11:21 +00:00
SongFerng Wang
6e7c0eee58 Merge "Fix the testcase error" into tm-d1-dev am: 602fe375d9 am: c150fe528d am: 8a00f325f4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19083766

Change-Id: I466d8c2a5298d0821d71263b929b406b047ca955
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-28 07:11:09 +00:00
SongFerngWang
7f6fcce1d5 The UI only shows the active LE device 
At the media device, it only shows the active LE device which is
connected.

Bug: 232892046
Test: make RunSettingsRoboTests ROBOTEST_FILTER=AvailableMediaBluetoothDeviceUpdaterTest
make RunSettingsRoboTests ROBOTEST_FILTER=ConnectedBluetoothDeviceUpdaterTest
make RunSettingsRoboTests ROBOTEST_FILTER=SavedBluetoothDeviceUpdaterTest

Change-Id: Iac661206def4d43bc40ab9bb1938f084926899c2
Merged-In: Iac661206def4d43bc40ab9bb1938f084926899c2
 2022-06-28 15:03:07 +08:00
SongFerng Wang
87b049196b Merge "Fix the testcase error" into tm-d1-dev am: 602fe375d9 am: 2bcd1f3897 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19083766

Change-Id: If8ec1bb3d52f4254a46d9d21e31ec1a9372978a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-28 06:36:09 +00:00
SongFerng Wang
8a00f325f4 Merge "Fix the testcase error" into tm-d1-dev am: 602fe375d9 am: c150fe528d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19083766

Change-Id: Icfcdf386740d4ad79d45923a9a0fce5c4306a5e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-28 06:35:52 +00:00
SongFerng Wang
2bcd1f3897 Merge "Fix the testcase error" into tm-d1-dev am: 602fe375d9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19083766

Change-Id: Ic44ab60d81ed96478ace362f50df8919fcfa52cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-28 06:20:38 +00:00
SongFerng Wang
c150fe528d Merge "Fix the testcase error" into tm-d1-dev am: 602fe375d9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19083766

Change-Id: I2e79ea4100840627a21bd8797c9f1875b09c9161
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-28 06:20:37 +00:00
SongFerng Wang
602fe375d9 Merge "Fix the testcase error" into tm-d1-dev 2022-06-28 05:57:21 +00:00
SongFerng Wang
e6d8b341c9 Merge "The UI only shows the active LE device" into tm-d1-dev am: dc72a4a14f am: 7b3320804e am: b1180d259f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18910989

Change-Id: I02acf0b7049397c2833515227df51164e9f61b75
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-27 20:25:05 +00:00
SongFerng Wang
b1180d259f Merge "The UI only shows the active LE device" into tm-d1-dev am: dc72a4a14f am: 7b3320804e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18910989

Change-Id: I3f6baf8c93cc362f6040f068ceb249591a83f58d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-27 20:05:18 +00:00
TreeHugger Robot
08ce133d01 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 91d1b5cc61 -s ours am: 3c670f625b -s ours am: 2ff94793bb -s ours am: 1f909f731d -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19038236

Change-Id: Ifa597cc454287f39287842b3cfc82a16e4f69628
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-27 20:03:55 +00:00
Bill Yi
6a3109f4a7 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 07bfd0bbd9 -s ours am: 1b6e655273 -s ours am: 49301ea290 -s ours am: a17a95b586 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19038236

Change-Id: I51e2de79cd083520083e773c2c7d5f30ce449709
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-27 20:03:42 +00:00
TreeHugger Robot
6f168ae15c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 8b49ce00c2 -s ours am: 70e38435d3 -s ours am: a401e8ac3b -s ours am: 48928b9b27 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19038235

Change-Id: I9d206744ab60d701894de7eecbac10d0d91befa9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-27 20:03:30 +00:00
Bill Yi
7180955512 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b070ddda17 -s ours am: e780500266 -s ours am: 5a73a597b3 -s ours am: 59fd3438f5 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19038235

Change-Id: I3fbd5785d659a04ddaf2ad6d9b34c87829705488
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-27 20:03:26 +00:00
TreeHugger Robot
48526c907e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 91d1b5cc61 -s ours am: d1ff298845 -s ours am: 78bbedd0ed -s ours am: 35ea0b31a9 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19038236

Change-Id: I6ee8f93b35b9b50a32e7bd402a5c09de8d8a59f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-27 19:59:11 +00:00
Bill Yi
798db0647f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 07bfd0bbd9 -s ours am: 0a28003111 -s ours am: 2639731d35 -s ours am: 6be7aafb50 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19038236

Change-Id: Ie4ce2e2a1de20d63645bb06375bbe2ca7668bb9f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-27 19:59:04 +00:00
TreeHugger Robot
2b0816e008 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 8b49ce00c2 -s ours am: 83d410a6de -s ours am: bf69f2e66c -s ours am: 31a3c96261 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19038235

Change-Id: I15b0fc443f555398fd022f490ca598b5299c6a1f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-27 19:58:52 +00:00
Bill Yi
2777301f40 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b070ddda17 -s ours am: 9dbc2805b8 -s ours am: 54a69e25e9 -s ours am: a60e8e9597 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19038235

Change-Id: I5d73177a046c37fad903c1eb38eb467215ccf77c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-27 19:58:37 +00:00
TreeHugger Robot
1f909f731d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 91d1b5cc61 -s ours am: 3c670f625b -s ours am: 2ff94793bb -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19038236

Change-Id: I0feb1fce5b63b98a9ac4228d7cf32dfcefa5b365
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-27 19:53:21 +00:00
Bill Yi
a17a95b586 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 07bfd0bbd9 -s ours am: 1b6e655273 -s ours am: 49301ea290 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19038236

Change-Id: Iba7eaeb887cd7b061e5d308baceae4dda40af55f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-27 19:53:09 +00:00
TreeHugger Robot
48928b9b27 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 8b49ce00c2 -s ours am: 70e38435d3 -s ours am: a401e8ac3b -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19038235

Change-Id: Id58b3e27a3d5f9414636fd9fbd6c8574aeea5b97
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-27 19:52:57 +00:00
Bill Yi
59fd3438f5 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b070ddda17 -s ours am: e780500266 -s ours am: 5a73a597b3 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19038235

Change-Id: Ic75b6c119089589ff10005b756af5de402fdb6c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-27 19:52:47 +00:00
TreeHugger Robot
35ea0b31a9 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 91d1b5cc61 -s ours am: d1ff298845 -s ours am: 78bbedd0ed -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19038236

Change-Id: Ic71f887be5786242a16af08d88b8da278bdb11ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-27 19:50:50 +00:00
Bill Yi
6be7aafb50 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 07bfd0bbd9 -s ours am: 0a28003111 -s ours am: 2639731d35 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19038236

Change-Id: I88e551bb0c8ea0bbf2996e4d3ca1697d0d5e2ff7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-27 19:50:44 +00:00
TreeHugger Robot
31a3c96261 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 8b49ce00c2 -s ours am: 83d410a6de -s ours am: bf69f2e66c -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19038235

Change-Id: Ie0b680aed0d9f0984f9bdbc26ecf2ae86cbad31b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-27 19:50:31 +00:00
Bill Yi
a60e8e9597 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b070ddda17 -s ours am: 9dbc2805b8 -s ours am: 54a69e25e9 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19038235

Change-Id: I975a317f8bb6b20ad1f3ebafa74c939767fe4c8c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-27 19:50:16 +00:00
Amy Hsu
088a212a35 [RRS] Avoid the resolution switch too rapidly. 
Make sure previous setting has been completed before we set current
resolution. Register a display listner to listen onDisplayChanged
callback. So that we can know when display resolution change completed.

Bug: 232440665
Test: Switch resolution quickly and check display situation.
Change-Id: I1460c1db191250d8e51dd639cd969e4323f71abd
 2022-06-28 01:41:24 +08:00