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

112652 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
menghanli
d95d799d86 Fix extra dim turns on failed in setting search bar 
Root cause: Don't call displayPreference before setChecked called.
Solution: Don't show quick settings tooltips if preference is not ready.

Bug: 237850687
Test: make RunSettingsRoboTests ROBOTEST_FILTER=AccessibilityQuickSettingsPrimarySwitchPreferenceControllerTest
Change-Id: I52425190cce4ab3cf31be025a743bf8b212fa1f9
 2022-07-07 09:04:53 +08:00
Menghan Li
9450735e38 Merge "Refactor CaptionPropertiesFragment to improve maintainability" 2022-06-30 03:48:33 +00:00
Xin Li
f2422d23d7 [automerger skipped] Merge tm-dev-plus-aosp-without-vendor@8763363 am: b8d6e73355 -s ours am: 5c022ddef7 -s ours am: 75f92deb34 -s ours am: d02caacd56 -s ours 
am skip reason: Merged-In Ifcb9d4c564839199d998bd503f390f021c6bf3ad with SHA-1 d10618d489 is already in history

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

Change-Id: Ie1900d90ff955950638c84e357e6a23156c7dd7c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-30 01:05:04 +00:00
menghanli
1d26b6d898 Refactor CaptionPropertiesFragment to improve maintainability 
Root cause: There is a bunch of different logic of preferences in CaptionPropertiesFragment. It’s hard to implement new features and hard to maintain and hard to be testable.
Solution: Move out different logic of CaptionPropertiesFragment into controllers to reduce the complexity of the relationship between preference and fragment.

Bug: 197695932
Test: make RunSettingsRoboTests ROBOTEST_FILTER=CaptionPropertiesFragmentTest CaptionTogglePreferenceControllerTest
Change-Id: I7013a7aa284b587c329c2e678dbb079e553ea94d
 2022-06-30 09:01:13 +08:00
Menghan Li
5a3498c9bc Merge "Refactor CaptionMoreOptionsFragment to improve maintainability" 2022-06-30 00:16:54 +00:00
menghanli
deb72e29ef Refactor CaptionMoreOptionsFragment to improve maintainability 
Root cause: There is a bunch of different logic of preferences in CaptionMoreOptionsFragment. It’s hard to implement new features and hard to maintain and hard to be testable.
Solution: Move out different logic of CaptionMoreOptionsFragment into controllers to reduce the complexity of the relationship between preference and fragment.

Bug: 197695932
Test: make RunSettingsRoboTests ROBOTEST_FILTER=CaptionMoreOptionsFragmentTest CaptionLocalePreferenceControllerTest
Change-Id: Ifdf3e22b027328a9f8eb13d756730ca047ece047
 2022-06-30 00:16:19 +00:00
Xin Li
d02caacd56 [automerger skipped] Merge tm-dev-plus-aosp-without-vendor@8763363 am: b8d6e73355 -s ours am: 5c022ddef7 -s ours am: 75f92deb34 -s ours 
am skip reason: Merged-In Ifcb9d4c564839199d998bd503f390f021c6bf3ad with SHA-1 d10618d489 is already in history

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

Change-Id: I7332141f16b200c4bd36baac52b46c04065f7568
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-30 00:02:31 +00:00
Xin Li
75f92deb34 [automerger skipped] Merge tm-dev-plus-aosp-without-vendor@8763363 am: b8d6e73355 -s ours am: 5c022ddef7 -s ours 
am skip reason: Merged-In Ifcb9d4c564839199d998bd503f390f021c6bf3ad with SHA-1 d10618d489 is already in history

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

Change-Id: I2e9dc310e15431b643c709b99507f6f8b045aae7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-29 22:56:48 +00:00
Xin Li
5c022ddef7 [automerger skipped] Merge tm-dev-plus-aosp-without-vendor@8763363 am: b8d6e73355 -s ours 
am skip reason: Merged-In Ifcb9d4c564839199d998bd503f390f021c6bf3ad with SHA-1 d10618d489 is already in history

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

Change-Id: I9e74383c3f36d139ef3a2838d937532fa55cd6c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-29 22:13:18 +00:00
Joshua Mccloskey
dea413b578 Merge "Fixed unicorn multi-enrollment flow." into tm-d1-dev am: 431542dddc am: 70a6062446 am: cbb99980b3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19093051

Change-Id: Ie61a415defe485a6d431cfb2eff8a57f10469b8b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-29 18:03:29 +00:00
Joshua Mccloskey
a30bfbd90d Merge "Fixed unicorn multi-enrollment flow." into tm-d1-dev am: 431542dddc am: e30a71787e am: 54b7ac755a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19093051

Change-Id: I8a39ef5bcd58b5d525e5933a95bbbf28ae1a30c7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-29 18:03:20 +00:00
Joshua Mccloskey
cbb99980b3 Merge "Fixed unicorn multi-enrollment flow." into tm-d1-dev am: 431542dddc am: 70a6062446 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19093051

Change-Id: Iab2bb36460d7ba8b284fb0050a62e0918954e368
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-29 17:37:57 +00:00
Joshua Mccloskey
54b7ac755a Merge "Fixed unicorn multi-enrollment flow." into tm-d1-dev am: 431542dddc am: e30a71787e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19093051

Change-Id: I80312c96248ff2231386c154ebe0f9bf54ae4f34
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-29 17:37:37 +00:00
Joshua Mccloskey
70a6062446 Merge "Fixed unicorn multi-enrollment flow." into tm-d1-dev am: 431542dddc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19093051

Change-Id: If3bf0ca501d6a5bb460fa0ab05ae39239f34720e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-29 17:12:08 +00:00
Joshua Mccloskey
e30a71787e Merge "Fixed unicorn multi-enrollment flow." into tm-d1-dev am: 431542dddc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19093051

Change-Id: I4574d7014cfb6ca9050428e451654b9e8002995b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-29 17:12:05 +00:00
Joshua Mccloskey
431542dddc Merge "Fixed unicorn multi-enrollment flow." into tm-d1-dev 2022-06-29 16:48:53 +00:00
Angela Wang
b4e3cd1e77 Merge "Update source metric category of HearingAidDialogFragment and HearingAidPairingDialogFragment" 2022-06-29 11:38:17 +00:00
Edgar Wang
1496ba9276 confirm SIM deletion should be disabled when the guest mode is enabled. 
Bug: 228451314
Change-Id: I83337980fe4bcfa6771de290fd0e44217ea51dec
Test: manual
 2022-06-29 06:02:35 +00:00
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
Xin Li
b8d6e73355 Merge tm-dev-plus-aosp-without-vendor@8763363 
Bug: 236760014
Merged-In: Ifcb9d4c564839199d998bd503f390f021c6bf3ad
Change-Id: I9d69bcbc6916176beece2616f152ebd3d74fc0f8
 2022-06-28 21:23:28 +00:00
Joshua McCloskey
cdb654f9be Fixed unicorn multi-enrollment flow. 
Test: Verified that Unicorn SUW flows can now
enroll a face.
Test: Verified normal SUW flow works as expected.

Fixes: 237088482
Fixes: 234663447
Change-Id: I9c4100f61b5e7d40fc9ed67c6918ec7bf31fc30a
 2022-06-28 17:08:40 +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