PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
110,623 Commits 1 Branch 0 Tags
7813c4a9a386f2f45ae1080b0d80455047cd16a2
Commit Graph

110623 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Gil Cukierman
a2ddff3865 Honor DISALLOW_CELLULAR_2G User Restriction in Enable2gPreferenceController 
When 2g is disallowed by a device admin the 2g toggle in the preference
screen will implement the following behaviors as a result of being
changed to a RestrictedSwitchPreference:
1. become disabled (greyed out)
2. show a summary message explaining that the preference was disabled by
   an admin
3 show a pop up when a user tries to click on the preference informing
  them that the setting is unusable because it was disabled by an admin.

Additionally, the toggle will show as unchecked (off) when admins
disable 2g.

When 2g is re-enabled by a device admin, the preference screen will go back
to its previous state.

Test: atest Enable2gPreferenceControllerTest
Bug: b/248250240
Change-Id: I7af901f2d9f62ebfe884e01724d8eff845c2968e
 2022-10-19 21:01:17 +00:00
Jason Huang
2bb35ff3fc network: fix binder object leakage in settings 
Summary:
When BT ON and enter into NetworkDashboardFragment, and turning BT OFF and exiting the fragment, the `BluetoothAdapter.closeProfileProxy(BluetoothProfile.PAN)` will not be called.
This causes binder leakage on next time the NetworkDashboardFragment is entered, until killing Settings process.

Reproduce Steps:
1. Turn BT ON
2. Open Settings process
3. Enter "Network & internet" (NetworkDashboardFragment)
4. Turn BT OFF
5. Back to previous page (do not kill Settings process)
* Repeat Step 3-5

Solution:
Do not set value of `mBluetoothPan` to null when `onServiceDisconnected` raised, to ensure the binder object (profile proxy) be closed in lifecycle `onDestroy()`.

Bug: 243128377
Test: enter "Network & internet" page, turn off BT and leave the page
Change-Id: Ieca3e5401c23d1b0ffece1bbb0db96988044262d
 2022-10-19 22:07:55 +08:00
Bonian Chen
5f5bcf56ca Merge "[Settings] align the long press behavior on secondary sim" am: 90dcc7c5c1 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2261204

Change-Id: Icece91f8119388bbf7bca7129b9f077bc0c857a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-19 08:32:33 +00:00
Bonian Chen
90dcc7c5c1 Merge "[Settings] align the long press behavior on secondary sim" 2022-10-19 08:01:34 +00:00
Bonian Chen
7364b9bbe3 [Settings] align the long press behavior on secondary sim 
Within Settings app, long press allows user to copy status/summary part
when it comes to first SIM.

This is a commit to enable the same feature on the second sim.

Test: local
Change-Id: I58d9cf9cbba213196536781d41b9ec81c0142960
 2022-10-19 01:47:11 +00:00
Treehugger Robot
6372ae5e93 Merge "Fix crash when input illegal proxy port number" am: e8160af796 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2255620

Change-Id: Idc35fa976db5cfde013ec9c32191869e84c7801f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-18 20:42:36 +00:00
Treehugger Robot
e8160af796 Merge "Fix crash when input illegal proxy port number" 2022-10-18 20:17:08 +00:00
Treehugger Robot
24e8db3335 Merge "Fix crash when showing error dialog in NetworkRequestDialogActivity" am: d791f7b967 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2255618

Change-Id: I34ec41a3b0cd28029595e70164501dd1350e96b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-18 04:42:26 +00:00
Treehugger Robot
d791f7b967 Merge "Fix crash when showing error dialog in NetworkRequestDialogActivity" 2022-10-18 04:09:49 +00:00
Shen Lin
a911e61ce7 Fix crash when input illegal proxy port number 
Bug: 253951250
Test: manual and atest
Change-Id: I80d2f0e3ce2df86a081b29d8633e06cfc648baeb
 2022-10-18 09:18:57 +08:00
Shen Lin
72e5a7ea21 Fix crash when showing error dialog in NetworkRequestDialogActivity 
Fix: 253913148
Test: manual
Change-Id: I23593da1ef6d72806f22d3501b06a8e7abadb100
 2022-10-17 09:30:16 +08:00
Treehugger Robot
c0904055f4 Merge "Fix "show system apps" status lost when switching on/off dark theme" am: df8e9c630a 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2253577

Change-Id: Ie35b84bc9e348997fc34f58ded21c84e191e6786
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-13 14:35:09 +00:00
Treehugger Robot
df8e9c630a Merge "Fix "show system apps" status lost when switching on/off dark theme" 2022-10-13 14:09:17 +00:00
Shen Lin
d956175333 Fix "show system apps" status lost when switching on/off dark theme 
Bug: 253388290
Test: manual and atest
Change-Id: I5833f94478c2faaf53d40652f0e7ce92adb3e8b6
 2022-10-13 12:19:11 +00:00
Xin Li
5ebaa600a1 Merge "Merge tm-qpr-dev-plus-aosp-without-vendor@9129937" into stage-aosp-master 2022-10-11 17:39:16 +00:00
Treehugger Robot
44431c73e7 Merge "Add fallback summary text if there is no matching screen timeout value" am: 007c215c3e 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2239486

Change-Id: I2a5103f40ff538d327f1db9d1062de044683b615
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-11 06:27:16 +00:00
Treehugger Robot
007c215c3e Merge "Add fallback summary text if there is no matching screen timeout value" 2022-10-11 05:51:12 +00:00
Shen Lin
97a61bad7d Add fallback summary text if there is no matching screen timeout value 
Screen timeout summary string can be null if there is no matching candidate, so we need a fallback summary here to avoid showing unexpected summary text.

Bug: 252340891
Test: manual

Change-Id: I939ae97a50063b2ffe84029135c3f340aeedf4c7
 2022-10-09 01:59:02 +00:00
Xin Li
302b01f8e2 Merge tm-qpr-dev-plus-aosp-without-vendor@9129937 
Bug: 248070379
Merged-In: I9ebe26c6a8058798ea654523ad1405a8447268b8
Change-Id: Ib8c6441f2165784804a1863bcfce6b05d20ecfd3
 2022-10-06 12:22:57 -07:00
Xin Li
ec0cf19aad Merge "Merge TP1A.221005.003" am: 2af8366306 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2240893

Change-Id: Ic9f25644a305419732cb5406b96166e8708a3975
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-05 22:39:29 +00:00
Xin Li
2af8366306 Merge "Merge TP1A.221005.003" 2022-10-05 22:20:14 +00:00
Treehugger Robot
fe38c3c91e Merge "Remove A2dp offload disabled and LE audio offload enabled combination" am: bcde51cf09 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2240358

Change-Id: I4ecfd48d3e62eeaf01452283111d2ddaf7acb29c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-05 16:26:25 +00:00
Treehugger Robot
bcde51cf09 Merge "Remove A2dp offload disabled and LE audio offload enabled combination" 2022-10-05 16:04:05 +00:00
Alice Kuo
7cc845026c Remove A2dp offload disabled and LE audio offload enabled combination 
In order to reduce the complexity, LE audio offload couldn't be
enabled as a2dp offload disabled. Remove the combination from the
developer option
1. As a2dp offload disabled, LE audio offload couldn't be switched.
2. As the user disable a2dp offload, LE audio offload would be disabled
   as well

Bug: 238268927
Test: make RunSettingsRoboTests ROBOTEST_FILTER=BluetoothLeAudioHwOffloadPreferenceControllerTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=BluetoothA2dpHwOffloadPreferenceControllerTest
Change-Id: I9ebe26c6a8058798ea654523ad1405a8447268b8
 2022-10-04 23:48:11 +08:00
Xin Li
f51d201af3 Merge TP1A.221005.003 
Merged-In: Ia825853dde2e966e3d390cecfbe1a99f6439d31e
Change-Id: Ia7b51d3cc694287b930d240c77e5ba0ed9a527f4
 2022-10-03 13:17:48 -07:00
Android Build Coastguard Worker
6dfbfc6c55 Snap for 9130001 from db09b990a0 to tm-qpr1-release 
Change-Id: Id8bed0cb07ab0ea90a1839fe18664b2d18568216
 2022-10-02 21:30:07 +00:00
TreeHugger Robot
7b435b6111 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 5b8a3aabaa -s ours am: 353daaa2f7 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1ecf75b27f5ed85648f2d4dd26ccbedb8adbc399
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-02 08:23:48 +00:00
Bill Yi
7a3ba54d23 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3ce9e908f9 -s ours am: 567c6dd3ca -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib340ffec431f5a77e5b181830192ec9516c8d8a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-02 08:23:25 +00:00
TreeHugger Robot
1f0962c3c1 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 5b8a3aabaa -s ours am: db09b990a0 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic00f62d2e84db365ddfcd3eb0d629c1da51f1de2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-02 08:21:26 +00:00
Bill Yi
02fa63e2fc [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3ce9e908f9 -s ours am: 0aca2c219d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I81058835048aa75939c95147f0a8b71dc19584bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-02 08:21:09 +00:00
TreeHugger Robot
353daaa2f7 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 5b8a3aabaa -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia73419f75f327782d073cefa48ad1d65a87e9b7a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-02 07:54:35 +00:00
TreeHugger Robot
db09b990a0 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 5b8a3aabaa -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I91e0858307d1055b300a67ae7ba22b9897bac4b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-02 07:54:31 +00:00
Bill Yi
567c6dd3ca [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3ce9e908f9 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0c47748f2ea5d2e6691937acee6c91d96bcc5122
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-02 07:54:12 +00:00
Bill Yi
0aca2c219d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3ce9e908f9 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6dd06d608b1b319d2214514a145b7c178378bbd3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-02 07:54:11 +00:00
TreeHugger Robot
5b8a3aabaa Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev 2022-10-02 07:26:20 +00:00
Android Build Coastguard Worker
9569475d69 Snap for 9128530 from e5a4e38c8c to tm-qpr1-release 
Change-Id: I3f88b572d129b218f7b7d914eba70f839421daf4
 2022-10-01 21:29:51 +00:00
Android Build Coastguard Worker
8c1741bd4d Snap for 9127121 from e7722ef90c to tm-qpr1-release 
Change-Id: I0ba2d20fe20ca05b0b197d57970f673d3fa7f4a6
 2022-10-01 01:26:00 +00:00
Bill Lin
6b763d1999 Merge "Do not override SUW Glif theme when onApplyThemeResource() callback" into tm-qpr-dev am: e5a4e38c8c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20080179

Change-Id: I5a16ac472b0a08273d2410b39741675a6f998f51
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-01 00:22:29 +00:00
Bill Lin
e5a4e38c8c Merge "Do not override SUW Glif theme when onApplyThemeResource() callback" into tm-qpr-dev 2022-09-30 23:54:31 +00:00
Bill Yi
ba331be678 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e289b0f368 -s ours am: 4bf99a1f0f -s ours am: 148f0a8591 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I59052a6cddf76148650c3def3f875a3c7f3650ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-30 21:40:34 +00:00
Bill Yi
6c8ff68ac2 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e289b0f368 -s ours am: 6cf6175ec3 -s ours am: 3a2a9c27a2 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6b48eeedb2292e93045ca38617113ee3ccb62e91
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-30 21:17:07 +00:00
Bill Yi
e6d49db2fc [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e289b0f368 -s ours am: 4bf99a1f0f -s ours am: e7722ef90c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib5f00df6d8bf3d9543a1d41c96af4f8a1ee7b911
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-30 21:08:39 +00:00
Bill Yi
148f0a8591 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e289b0f368 -s ours am: 4bf99a1f0f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I07f8debb98eeee861b53234a5e1ea81d22e24a31
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-30 20:57:39 +00:00
Bill Yi
e7722ef90c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e289b0f368 -s ours am: 4bf99a1f0f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ice33ed5798d03b887d2d0feb637ddeb37223c7d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-30 20:56:21 +00:00
Bill Yi
3a2a9c27a2 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e289b0f368 -s ours am: 6cf6175ec3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iaa63d8f87752e9f593cc5f79a4d87116a86f6239
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-30 20:48:01 +00:00
Bill Yi
4bf99a1f0f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e289b0f368 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I494de493df292a1ae0cb827d75b1a3458f4c65b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-30 20:46:53 +00:00
Bill Yi
6cf6175ec3 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e289b0f368 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib3d599dccb4076c42bc05cfbdec0036e72ec9177
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-30 20:44:09 +00:00
TreeHugger Robot
2525056f1d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 12a1ed5662 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iea8b7d3d8ac230245faf4d58b3692ed99702dcef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-30 18:44:32 +00:00
Bill Yi
6ba4170976 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cf54fdb73b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4d9fc13a34443adb3241eab58c2e8f9d2c770169
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-30 18:44:20 +00:00
TreeHugger Robot
12a1ed5662 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2022-09-30 18:14:33 +00:00