PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
98,680 Commits 1 Branch 0 Tags
c71fe8cab1d466fd0f1575b2275ffc63e55a6cbd
Commit Graph

98680 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andrew Zeng
c71fe8cab1 Remove unncessary constraintlayout-solver deps 
This will be cp'ed to master later

Bug: 192617148
Test: compiles
Change-Id: Id7a9cf6c26ff9dd464d8f0b0f012b8480ca70b92
 2021-11-29 23:32:10 +00:00
Adam Bookatz
cd429e74db Merge "Use UM.canAddMoreUsers and UM.isUserTypeEnabled" 2021-11-29 21:00:48 +00:00
Etienne Ruffieux
6a709815df Merge "Refactor Bluetooth scan mode APIs" 2021-11-29 20:27:45 +00:00
Bonian Chen
75a5bdaa29 Merge "[Settings] Move display of VPN version into summary text" into sc-v2-dev am: 1026e410f4 am: 12287b2c67 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16341970

Change-Id: I2b908084e6422e9ccbdba8fd5cf67bf123f3ec62
 2021-11-29 06:45:21 +00:00
Bonian Chen
12287b2c67 Merge "[Settings] Move display of VPN version into summary text" into sc-v2-dev am: 1026e410f4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16341970

Change-Id: I37fd544ef7452a3286dd393d68407d626d9ab590
 2021-11-29 06:23:02 +00:00
TreeHugger Robot
fb0ca145aa Merge "Fix overlapped problem in SuW two panes mode" into sc-v2-dev am: cd8a01d2fd am: c6bc7a7c4b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16332784

Change-Id: I8c1f0b3a19239f85a4f67b53dd703ed7a9d3a625
 2021-11-29 06:15:11 +00:00
Bonian Chen
1026e410f4 Merge "[Settings] Move display of VPN version into summary text" into sc-v2-dev 2021-11-29 06:05:40 +00:00
TreeHugger Robot
c6bc7a7c4b Merge "Fix overlapped problem in SuW two panes mode" into sc-v2-dev am: cd8a01d2fd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16332784

Change-Id: Ib37dab22b51da7ec97990230a17b7fe698abee60
 2021-11-29 05:59:08 +00:00
TreeHugger Robot
cd8a01d2fd Merge "Fix overlapped problem in SuW two panes mode" into sc-v2-dev 2021-11-29 05:37:34 +00:00
Charles Chen
a1c4d9b702 Fix different behaviors of deeplink in one/two pane am: a8c97980a6 am: 181853efb0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16339785

Change-Id: I8b990e14ceb2dce116d74dd670d36072d179555d
 2021-11-29 05:20:52 +00:00
Charles Chen
181853efb0 Fix different behaviors of deeplink in one/two pane am: a8c97980a6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16339785

Change-Id: Ie2833c5b9b4f0f05a97432198a949050d3fb3e84
 2021-11-29 05:02:31 +00:00
Treehugger Robot
689086b230 Merge "Minor clean-up for LE audio setting" am: e41d1b9761 am: ad041d78ee am: 7e7b1f720e am: 96d33dbdbe 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1904790

Change-Id: I0afc38c63069b8a1ad43e50e4f39a3d8a77438a9
 2021-11-29 04:56:43 +00:00
Treehugger Robot
96d33dbdbe Merge "Minor clean-up for LE audio setting" am: e41d1b9761 am: ad041d78ee am: 7e7b1f720e 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1904790

Change-Id: I61f187c004e20dc3865764269051b33a09af3ac2
 2021-11-29 04:44:02 +00:00
Treehugger Robot
7e7b1f720e Merge "Minor clean-up for LE audio setting" am: e41d1b9761 am: ad041d78ee 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1904790

Change-Id: I45b1aa93de3633b6fe2ec8b0605fbeac5a4f3d37
 2021-11-29 04:27:25 +00:00
Treehugger Robot
ad041d78ee Merge "Minor clean-up for LE audio setting" am: e41d1b9761 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1904790

Change-Id: Icc8ed52e3eeaa0aefe4ccc0e65440e58cb0faedd
 2021-11-29 03:58:28 +00:00
Treehugger Robot
e41d1b9761 Merge "Minor clean-up for LE audio setting" 2021-11-29 03:41:49 +00:00
Treehugger Robot
a38e83e80a [automerger skipped] Merge changes I094ba6be,Idbdd21a1,I03dfdc25,I40afabb0,I01e0ec91, ... am: 8f91ac3e83 am: 0a69b346c8 am: ff1ebb31d4 am: afa860da18 -s ours 
am skip reason: Merged-In I094ba6beb66fdebd7f3ef0a7c12bbed0e5b870e8 with SHA-1 fa0aec49e3 is already in history

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

Change-Id: Ib67c1dad9fbe0ca14506c19bc1c2d0b8e3f45074
 2021-11-29 03:19:23 +00:00
Alice Kuo
9bc8b1450d [automerger skipped] Handle csip set member automatic pair in Setting am: 629611a43e am: eb412a0614 am: 6097f9b830 am: 2d0025761b -s ours 
am skip reason: Merged-In Idbdd21a1f15b04cc91cbc2d30a5cb4e9b24174b9 with SHA-1 ebea73e36b is already in history

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

Change-Id: Ifc808ce832f9c35cf442f561abebe2520e51df85
 2021-11-29 03:19:21 +00:00
Alice Kuo
b15a241343 [automerger skipped] Do not update the previously connected devices for the sub device am: c78fb83aee am: f6f0126b8e am: 1da3264140 am: 3d17582b0b -s ours 
am skip reason: Merged-In I03dfdc25b57e614194fb8de2c9265edd50760d30 with SHA-1 a6d549fee3 is already in history

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

Change-Id: I525a8b4366da12423d27b38a1be851d2a6e5ac41
 2021-11-29 03:19:20 +00:00
Alice Kuo
4283b7c1dc [automerger skipped] Accept the pairing request automatically for the set member pairing am: 61460a1ab1 am: 6aa53808f3 am: c932678888 am: 31e82a325c -s ours 
am skip reason: Merged-In I40afabb09b4cb12a0253035452c9f6974799ed05 with SHA-1 e920efeb3a is already in history

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

Change-Id: Ie0d87b73b8df1a6f0fea8e0f4bc0c09778abfe10
 2021-11-29 03:19:19 +00:00
Alice Kuo
4c9912b73b [automerger skipped] Show the multiple Mac address for the coordinated set am: 9f11a4cddf am: f0b73dade7 am: e3680e211a am: 2240418de8 -s ours 
am skip reason: Merged-In I01e0ec91e5c856481318d6435d174b5a2018d820 with SHA-1 133c2cc1cc is already in history

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

Change-Id: I0256cff2f3398b684ba78dd9a1c945575f376351
 2021-11-29 03:19:17 +00:00
Alice Kuo
14be1d377e [automerger skipped] Add the pairing string for CSIP supported device am: f57f720c38 am: 5d1aee76c2 am: 2135db2eac am: 6943c0356c -s ours 
am skip reason: Merged-In I5432b7264652dd4485e2669f6004caa4f7459238 with SHA-1 02cadb9b32 is already in history

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

Change-Id: Ie17bf43f8755ead22ff544be33dca53a8e73978c
 2021-11-29 03:19:16 +00:00
Treehugger Robot
afa860da18 Merge changes I094ba6be,Idbdd21a1,I03dfdc25,I40afabb0,I01e0ec91, ... am: 8f91ac3e83 am: 0a69b346c8 am: ff1ebb31d4 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1903835

Change-Id: I8273612ded6c7f489baec255a8872e5ebb301741
 2021-11-29 03:04:16 +00:00
Alice Kuo
2d0025761b Handle csip set member automatic pair in Setting am: 629611a43e am: eb412a0614 am: 6097f9b830 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1903834

Change-Id: Icace2cf11100209eaa945971704b3319e9628e75
 2021-11-29 03:04:15 +00:00
Alice Kuo
3d17582b0b Do not update the previously connected devices for the sub device am: c78fb83aee am: f6f0126b8e am: 1da3264140 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1903833

Change-Id: I4e83de75cd61c7f3fcf418bfdefc79d655c063f9
 2021-11-29 03:04:13 +00:00
Alice Kuo
31e82a325c Accept the pairing request automatically for the set member pairing am: 61460a1ab1 am: 6aa53808f3 am: c932678888 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1903832

Change-Id: I205a7824d84a42128be5be2e77974689510d190a
 2021-11-29 03:04:12 +00:00
Alice Kuo
2240418de8 Show the multiple Mac address for the coordinated set am: 9f11a4cddf am: f0b73dade7 am: e3680e211a 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1903831

Change-Id: I126e164160dae141978a59b02cea9f0091b7265f
 2021-11-29 03:04:10 +00:00
Alice Kuo
6943c0356c Add the pairing string for CSIP supported device am: f57f720c38 am: 5d1aee76c2 am: 2135db2eac 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1903830

Change-Id: I000242e2e51627507bb49e7f6f51d8a5602de493
 2021-11-29 03:04:07 +00:00
Treehugger Robot
ff1ebb31d4 Merge changes I094ba6be,Idbdd21a1,I03dfdc25,I40afabb0,I01e0ec91, ... am: 8f91ac3e83 am: 0a69b346c8 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1903835

Change-Id: I6cbdf1b5d405aceb82b4714b4d8101a1f33de239
 2021-11-29 02:48:47 +00:00
Alice Kuo
6097f9b830 Handle csip set member automatic pair in Setting am: 629611a43e am: eb412a0614 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1903834

Change-Id: Ibb8140b8af96036750457a6866eb9ba410bc0b84
 2021-11-29 02:48:46 +00:00
Alice Kuo
1da3264140 Do not update the previously connected devices for the sub device am: c78fb83aee am: f6f0126b8e 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1903833

Change-Id: I2f2bf3cac4b0712b8e06beb84b15e6647ccb3130
 2021-11-29 02:48:46 +00:00
Alice Kuo
c932678888 Accept the pairing request automatically for the set member pairing am: 61460a1ab1 am: 6aa53808f3 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1903832

Change-Id: Ic7bc92ee8409a22c74e701b0a7b52d841fc12a4d
 2021-11-29 02:48:45 +00:00
Alice Kuo
e3680e211a Show the multiple Mac address for the coordinated set am: 9f11a4cddf am: f0b73dade7 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1903831

Change-Id: I65a4d227e8f92b155636d8aa51b4e5e83bac2b3d
 2021-11-29 02:48:44 +00:00
Alice Kuo
2135db2eac Add the pairing string for CSIP supported device am: f57f720c38 am: 5d1aee76c2 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1903830

Change-Id: I51ff75f8a8005985a9696616edd1c8c5cdd651fe
 2021-11-29 02:48:43 +00:00
Treehugger Robot
0a69b346c8 Merge changes I094ba6be,Idbdd21a1,I03dfdc25,I40afabb0,I01e0ec91, ... am: 8f91ac3e83 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1903835

Change-Id: I1e70974396efc1eaf4e389cc35a2789849e696af
 2021-11-29 02:29:32 +00:00
Alice Kuo
eb412a0614 Handle csip set member automatic pair in Setting am: 629611a43e 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1903834

Change-Id: If9172095a2688a0fbe588ccbae96076e9cf8b133
 2021-11-29 02:29:32 +00:00
Alice Kuo
f6f0126b8e Do not update the previously connected devices for the sub device am: c78fb83aee 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1903833

Change-Id: I3c062b23b8772496cb149ad1eff8483836a79289
 2021-11-29 02:29:31 +00:00
Alice Kuo
6aa53808f3 Accept the pairing request automatically for the set member pairing am: 61460a1ab1 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1903832

Change-Id: I2cce585de893512005af7abf35f5729351512cea
 2021-11-29 02:29:30 +00:00
Alice Kuo
f0b73dade7 Show the multiple Mac address for the coordinated set am: 9f11a4cddf 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1903831

Change-Id: I9a8a0fe9d95a4ff4adc0599ce4c9a35501968f71
 2021-11-29 02:29:29 +00:00
Alice Kuo
5d1aee76c2 Add the pairing string for CSIP supported device am: f57f720c38 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1903830

Change-Id: I809634c657558da125e72bb1fcbddaf3db46a093
 2021-11-29 02:29:27 +00:00
Alice Kuo
0d964f7633 Minor clean-up for LE audio setting 
Bug: 178981521
Test: build pass
Change-Id: Ica8bd68bea494ee72fa53fbb8f9101dc535470b6
 2021-11-29 10:18:47 +08:00
Treehugger Robot
8f91ac3e83 Merge changes I094ba6be,Idbdd21a1,I03dfdc25,I40afabb0,I01e0ec91, ... 
* changes:
  Update the LE audio device into the media device category
  Handle csip set member automatic pair in Setting
  Do not update the previously connected devices for the sub device
  Accept the pairing request automatically for the set member pairing
  Show the multiple Mac address for the coordinated set
  Add the pairing string for CSIP supported device
 2021-11-29 02:11:27 +00:00
Sunny Shao
644a2b9bc6 Fix overlapped problem in SuW two panes mode 
- The previous preview page will overlap the right pane in RTL language.
- The root cause is the false value of the clipToPadding and
  clipChildren.
- Use the TTheme.DeviceDefault.Settings.

Fixes: 204955818
Test: manual test
Change-Id: I75c7f419cf93ebe9c4e9e3cb24835163a6b01e11
 2021-11-26 17:20:50 +08:00
Charles Chen
a8c97980a6 Fix different behaviors of deeplink in one/two pane 
Test: manual - Reproducible steps mentioned in bug
fixes: 207740082
Change-Id: I1163e38c177307ccac8798eb649271d0466ab1c8
 2021-11-26 07:54:42 +00:00
Sergey Nikolaienkov
13d7e086e6 Merge "Fix usage of the updated CDM APIs" 2021-11-26 06:38:03 +00:00
Alice Kuo
3487843496 Update the LE audio device into the media device category 
Bug: 178981521
Test: make RunSettingsRoboTests
ROBOTEST_FILTER=AvailableMediaBluetoothDeviceUpdater
Test: make RunSettingsRoboTests
ROBOTEST_FILTER=ConnectedBluetoothDeviceUpdater

Change-Id: I094ba6beb66fdebd7f3ef0a7c12bbed0e5b870e8
Merged-In: I094ba6beb66fdebd7f3ef0a7c12bbed0e5b870e8
 2021-11-26 14:02:07 +08:00
Bonian Chen
14e76c3233 [Settings] Move display of VPN version into summary text 
Move the display of version text within VPN into summary part of the
display, and limit the height of summary area.

Bug: 205460459
Test: local
Change-Id: I666b9db356feeebf04e3be688897c2d9110a5275
(cherry picked from commit 144f295d7a)
 2021-11-26 05:53:46 +00:00
Alice Kuo
629611a43e Handle csip set member automatic pair in Setting 
Move the set member handle to setting. SystemUI and Setting have the
individual settingLib instance. If we trigger pairing inside settingLib,
the action would be called twice. SystemUI does not contain the concept
to handle the pair interaction. Setting would take the action to
createBond for CSIP automatically.

Bug: 201758444
Bug: 150670922
Test: Pair the coordinated set devices, and check the set member pairing
would be done automatically without the pairing dialog

Change-Id: Idbdd21a1f15b04cc91cbc2d30a5cb4e9b24174b9
Merged-In: Idbdd21a1f15b04cc91cbc2d30a5cb4e9b24174b9
 2021-11-26 13:53:46 +08:00
Bonian Chen
c74232597e Merge "[Settings] Move display of VPN version into summary text" 2021-11-26 05:44:35 +00:00
Vineeth Bhende
f28a1afac9 Merge "Typo fix in media settings title variable" 2021-11-26 05:44:02 +00:00