PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
100,371 Commits 1 Branch 0 Tags
017545c6d1faddcf7f43da3a6e085e5fb46bfd8c
Commit Graph

100371 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Treehugger Robot
b37895268a [automerger skipped] Merge "Merge SQ1A.220205.002" am: c45b4ab9ae am: 428e9e636e -s ours 
am skip reason: Merged-In Ia9dc251c853526b2ce66c9f8ff595d496b7f1bc4 with SHA-1 fca5cb3748 is already in history

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

Change-Id: I406df0fb04ab8e070c78dd8b4c6ed6634b5a3b84
 2022-02-08 19:44:40 +00:00
Treehugger Robot
428e9e636e Merge "Merge SQ1A.220205.002" am: c45b4ab9ae 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1976020

Change-Id: I38d97dff8fcb284120608d2bbfb369a7374a4398
 2022-02-08 19:12:24 +00:00
Treehugger Robot
c45b4ab9ae Merge "Merge SQ1A.220205.002" 2022-02-08 18:52:08 +00:00
Matt Pietal
d7314e11b9 Add supervised user support 
SystemUI also needs also to this activity in order to support
supervised user creation. This activity is temporary and is scheduled
to be removed.

Fixes: 218310361
Test: atest UserSwitcherControllerTest KeyguardUserSwitcherAdapterTest UserDetailViewAdapterTest KeyguardSecurityContainerTest
Change-Id: Ib79dcde2c726cc9508aef667b43662152d047137
 2022-02-08 12:19:19 -05:00
Kate Montgomery
e7788a7148 Merge "Clear recent access list when fragment is paused." 2022-02-08 16:22:52 +00:00
Pavel Grafov
0b3c4b8a53 Make distinction between null and empty IM list. 
* null means no policy is enfrced, any IM is allowed.
* empty means no IMs is allowed except system IMs.

Bug: 211063191
Test: manual, CtsVerifier/BYOD managed provisioning/Policy transparency
Change-Id: I35665a547c1e99129c70c834083b3183ba00208d
 2022-02-08 14:47:36 +00:00
William Escande
4a5c128624 Resolve bluetooth hidden API usages 
Bug: 143245666
Test: build
Change-Id: Idadf84873c88155382c48bb9108cf28d88aaef0a
 2022-02-08 15:37:56 +01:00
SongFerng Wang
dabf224f67 Merge "[MEP] Refactor SlotSidecar API for all of sim page." 2022-02-08 13:06:31 +00:00
Treehugger Robot
e9e4c5bc6a [automerger skipped] Merge "Settings: Fix FC when learn more textview help intent is NULL" am: 17e8159641 am: 6040d46cb0 am: 3210089fc6 -s ours am: df5a05a704 -s ours 
am skip reason: Merged-In I4e7a7c926205be1179d55d33ada345024c8a44ab with SHA-1 8f0291cd1a is already in history

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

Change-Id: Ic2a0651aa5f77910fce7b7d63a09a24b6e18b674
 2022-02-08 11:46:49 +00:00
Steven Ng
89f5e2e497 Show "Turns on at bedtime" in Dark theme setting based on feature flag 
Test: atest SettingsRoboTests:com.android.settings.display.darkmode.*
Bug: 217866453
Change-Id: Ic40975d4506f812790768339e48441a048529df3
 2022-02-08 11:45:39 +00:00
Chienyuan
84a9b23ba8 Show identity address in the bluetooth details page 
Bug: 197044261
Test: build pass
Change-Id: Ic1ef1d575f35c4b37d6f9195ec10dd31ed5bdd5b
 2022-02-08 11:29:03 +00:00
Remi NGUYEN VAN
74cf5865cf Remove dependencies on hidden network stats APIs 
Replace usage with equivalent stable APIs.

Bug: 197717846
Test: atest SettingsRoboTests
  (cherry-picked from ag/16779860)
Change-Id: I4151b831fc83dee9b36292cd7991f9b294ed4ff2
Merged-In: I4151b831fc83dee9b36292cd7991f9b294ed4ff2
 2022-02-08 19:06:02 +08:00
Raj Garg
949ee0518c Merge "Adding configuration to timeout for "Android is starting message"" 2022-02-08 10:47:19 +00:00
Treehugger Robot
df5a05a704 [automerger skipped] Merge "Settings: Fix FC when learn more textview help intent is NULL" am: 17e8159641 am: 6040d46cb0 am: 3210089fc6 -s ours 
am skip reason: Merged-In I4e7a7c926205be1179d55d33ada345024c8a44ab with SHA-1 8f0291cd1a is already in history

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

Change-Id: If4a72056e659579e6ed6928df26a7cf5f6155b43
 2022-02-08 10:33:06 +00:00
Treehugger Robot
3210089fc6 Merge "Settings: Fix FC when learn more textview help intent is NULL" am: 17e8159641 am: 6040d46cb0 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1961121

Change-Id: I9f8bb883a0fa1d902144fbf1f4aba9f03f623728
 2022-02-08 09:52:04 +00:00
SongFerngWang
4d0749febd [MEP] Refactor SlotSidecar API for all of sim page. 
remove the SlotSidecar's run() and using new run() with port id
information.

Bug: 218439715
Test: manual test for UI
Change-Id: I81479a0c514f2b8f58b9167b31d357f017732482
 2022-02-08 17:40:12 +08:00
Treehugger Robot
6040d46cb0 Merge "Settings: Fix FC when learn more textview help intent is NULL" am: 17e8159641 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1961121

Change-Id: If94e29e72c3ce461e27d028148d2c0e4bdbba9e9
 2022-02-08 09:36:17 +00:00
Treehugger Robot
17e8159641 Merge "Settings: Fix FC when learn more textview help intent is NULL" 2022-02-08 09:15:53 +00:00
Xin Li
3160c1adb3 Merge SQ1A.220205.002 
Bug: 213904741
Merged-In: Ia9dc251c853526b2ce66c9f8ff595d496b7f1bc4
Change-Id: I6008378cd10c04b931186540b36c93705de6b5c8
 2022-02-07 23:19:53 -08:00
Tom Hsu
64e203ad43 Merge "[Panlingual] Add PackageManager api to Per app language." 2022-02-08 07:05:29 +00:00
Jack Yu
387566c7d3 [automerger skipped] Do not let guest user disable secure nfc am: 4e543a38f6 am: 46bd9ba5a5 -s ours am: cd6ce52ea4 -s ours am: 7093dea7f7 -s ours am: 5163fd7aea -s ours am: b3762ca5f4 -s ours am: 3e076f98b5 -s ours am: 658476219d -s ours 
am skip reason: Merged-In I7253f7f08fde04e30400a30d9a0d24f1ceff04b0 with SHA-1 a579ca7554 is already in history

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

Change-Id: I4d8cefbc0952cae4282f5ff6586a28255aa0b8d1
 2022-02-08 04:06:31 +00:00
Jack Yu
cc53a54f0a [automerger skipped] Do not let guest user disable secure nfc am: 4e543a38f6 am: 46bd9ba5a5 -s ours am: cd6ce52ea4 -s ours am: 7093dea7f7 -s ours am: 5163fd7aea -s ours am: b3762ca5f4 -s ours am: 1b4a91414e -s ours am: 00682396b3 -s ours 
am skip reason: Merged-In I7253f7f08fde04e30400a30d9a0d24f1ceff04b0 with SHA-1 a579ca7554 is already in history

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

Change-Id: Ibacc48f6e26ae5d7d5c2522d08c27b7b47b8f7e5
 2022-02-08 04:05:44 +00:00
Jack Yu
658476219d [automerger skipped] Do not let guest user disable secure nfc am: 4e543a38f6 am: 46bd9ba5a5 -s ours am: cd6ce52ea4 -s ours am: 7093dea7f7 -s ours am: 5163fd7aea -s ours am: b3762ca5f4 -s ours am: 3e076f98b5 -s ours 
am skip reason: Merged-In I7253f7f08fde04e30400a30d9a0d24f1ceff04b0 with SHA-1 a579ca7554 is already in history

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

Change-Id: I0e64f8d20e1849696f759b1a19feb7f6eae6ddfc
 2022-02-08 03:48:08 +00:00
Jack Yu
00682396b3 [automerger skipped] Do not let guest user disable secure nfc am: 4e543a38f6 am: 46bd9ba5a5 -s ours am: cd6ce52ea4 -s ours am: 7093dea7f7 -s ours am: 5163fd7aea -s ours am: b3762ca5f4 -s ours am: 1b4a91414e -s ours 
am skip reason: Merged-In I7253f7f08fde04e30400a30d9a0d24f1ceff04b0 with SHA-1 a579ca7554 is already in history

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

Change-Id: I2ca009158991817d9bb19fe59a9be319bbb97505
 2022-02-08 03:47:55 +00:00
Jack Yu
3e076f98b5 [automerger skipped] Do not let guest user disable secure nfc am: 4e543a38f6 am: 46bd9ba5a5 -s ours am: cd6ce52ea4 -s ours am: 7093dea7f7 -s ours am: 5163fd7aea -s ours am: b3762ca5f4 -s ours 
am skip reason: Merged-In I7253f7f08fde04e30400a30d9a0d24f1ceff04b0 with SHA-1 a579ca7554 is already in history

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

Change-Id: I3c907ca25472d4bd87a09599d67aac7f480ef71c
 2022-02-08 03:31:02 +00:00
Jack Yu
1b4a91414e [automerger skipped] Do not let guest user disable secure nfc am: 4e543a38f6 am: 46bd9ba5a5 -s ours am: cd6ce52ea4 -s ours am: 7093dea7f7 -s ours am: 5163fd7aea -s ours am: b3762ca5f4 -s ours 
am skip reason: Merged-In I7253f7f08fde04e30400a30d9a0d24f1ceff04b0 with SHA-1 a579ca7554 is already in history

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

Change-Id: I4efdd94e0ea6979f90dc47df191412b177a2325a
 2022-02-08 03:31:02 +00:00
Jack Yu
4536cb07ab [automerger skipped] Do not let guest user disable secure nfc am: 4e543a38f6 am: 46bd9ba5a5 -s ours am: cd6ce52ea4 -s ours am: 7093dea7f7 -s ours am: 5163fd7aea -s ours am: 93bb6265de -s ours 
am skip reason: Merged-In I7253f7f08fde04e30400a30d9a0d24f1ceff04b0 with SHA-1 a579ca7554 is already in history

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

Change-Id: Ie70cae0b6f11fdd5a97afddcf97f2e205d2f5758
 2022-02-08 03:29:45 +00:00
tom hsu
b48802c152 [Panlingual] Add PackageManager api to Per app language. 
Bug: 216099500
Test: atest pass
Test: local test with Settings app
Change-Id: Icbdb1475d45e0652de369711ea21b5043f36dc19
 2022-02-08 03:25:03 +00:00
Jack Yu
b3762ca5f4 [automerger skipped] Do not let guest user disable secure nfc am: 4e543a38f6 am: 46bd9ba5a5 -s ours am: cd6ce52ea4 -s ours am: 7093dea7f7 -s ours am: 5163fd7aea -s ours 
am skip reason: Merged-In I7253f7f08fde04e30400a30d9a0d24f1ceff04b0 with SHA-1 a579ca7554 is already in history

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

Change-Id: I8654c830eaebe72d6f84f8966c43ea74979b14af
 2022-02-08 03:12:04 +00:00
Jack Yu
93bb6265de [automerger skipped] Do not let guest user disable secure nfc am: 4e543a38f6 am: 46bd9ba5a5 -s ours am: cd6ce52ea4 -s ours am: 7093dea7f7 -s ours am: 5163fd7aea -s ours 
am skip reason: Merged-In I7253f7f08fde04e30400a30d9a0d24f1ceff04b0 with SHA-1 a579ca7554 is already in history

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

Change-Id: I1aeb78925da456f0b112ef60a7b5d3c6fc51aea2
 2022-02-08 03:10:51 +00:00
Edgar Wang
b1a48df4f7 Remove restricted icon 
Bug: 195401182
Test: robotest
Change-Id: I6b22b3b9b62812eb08f10492bd2d7908cce89d39
 2022-02-08 03:09:50 +00:00
Jack Yu
5163fd7aea [automerger skipped] Do not let guest user disable secure nfc am: 4e543a38f6 am: 46bd9ba5a5 -s ours am: cd6ce52ea4 -s ours am: 7093dea7f7 -s ours 
am skip reason: Merged-In I7253f7f08fde04e30400a30d9a0d24f1ceff04b0 with SHA-1 a579ca7554 is already in history

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

Change-Id: Ie7899cd8137c524e3fd39a0b50016fbae5d37120
 2022-02-08 02:59:06 +00:00
Jack Yu
7093dea7f7 [automerger skipped] Do not let guest user disable secure nfc am: 4e543a38f6 am: 46bd9ba5a5 -s ours am: cd6ce52ea4 -s ours 
am skip reason: Merged-In I7253f7f08fde04e30400a30d9a0d24f1ceff04b0 with SHA-1 a579ca7554 is already in history

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

Change-Id: I186c750238d8f159b2d33e309c2aa9badf60ff64
 2022-02-08 02:43:45 +00:00
Jack Yu
cd6ce52ea4 [automerger skipped] Do not let guest user disable secure nfc am: 4e543a38f6 am: 46bd9ba5a5 -s ours 
am skip reason: Merged-In I7253f7f08fde04e30400a30d9a0d24f1ceff04b0 with SHA-1 a579ca7554 is already in history

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

Change-Id: Ief5899b4af766d3d1c9283e4a5a4500ff66b9009
 2022-02-08 02:30:37 +00:00
Jack Yu
46bd9ba5a5 Do not let guest user disable secure nfc am: 4e543a38f6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16691813

Change-Id: Iffe578c58bf2dcebda45b0b71dd901bd3e08be41
 2022-02-08 02:15:55 +00:00
Yanli Wan
2dd111b3c3 Update financed device info screen 
Bug: 217375582
Test: manual
Test: m RunSettingsRoboTests ROBOTEST_FILTER=EnterprisePrivacySettingsTest
Test: m RunSettingsRoboTests ROBOTEST_FILTER=PrivacySettingsEnterprisePreferenceTest
Test: m RunSettingsRoboTests ROBOTEST_FILTER=PrivacySettingsFinancedPreferenceTest
Change-Id: Ie0045c7f97a331640209efd1118d841eb0ab1b6f
 2022-02-07 16:58:26 -08:00
Etienne Ruffieux
0c2585b171 Merge "Removed mocked BluetoothAdapter" am: a6d4788fa0 am: d020a96da1 am: 28b1a9e4b0 am: b97acda5cf 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1960844

Change-Id: Ib50f9c12070e411d1582615ebe59985046f05ecc
 2022-02-07 22:13:52 +00:00
Etienne Ruffieux
b97acda5cf Merge "Removed mocked BluetoothAdapter" am: a6d4788fa0 am: d020a96da1 am: 28b1a9e4b0 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1960844

Change-Id: Idc59b3f953adab7686e532d36c66b12d21df995c
 2022-02-07 22:00:46 +00:00
Etienne Ruffieux
28b1a9e4b0 Merge "Removed mocked BluetoothAdapter" am: a6d4788fa0 am: d020a96da1 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1960844

Change-Id: I22908770a17e3cd3b3fe46c3192511d2f70d4fbd
 2022-02-07 21:49:08 +00:00
Etienne Ruffieux
d020a96da1 Merge "Removed mocked BluetoothAdapter" am: a6d4788fa0 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1960844

Change-Id: I87f5bbb080291bbbf93bad56b77eefe2d67f37bd
 2022-02-07 21:34:12 +00:00
Etienne Ruffieux
a6d4788fa0 Merge "Removed mocked BluetoothAdapter" 2022-02-07 21:17:41 +00:00
Jonathan Scott
269f97d960 Allow overriding of strings referenced in XML files. 
Test: manual
Bug: 188414370
Change-Id: Ice45b1808530c14c4efff16795cac7b2cb81516e
 2022-02-07 21:00:05 +00:00
Dmitri Plotnikov
15a0b54d60 Merge "Remove uses of deprecated class, BatteryStatsHelper" 2022-02-07 17:33:57 +00:00
Remi NGUYEN VAN
f962acdb70 Merge "Remove dependencies on hidden network stats APIs" 2022-02-07 05:36:49 +00:00
Bill Yi
b2ac9d5c9f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e7f361b3cc -s ours am: e1b12ea032 -s ours am: 4883417997 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I345ed31f56d239ecbb7c578d15e5b2ac9e14f2fa
 2022-02-06 07:58:12 +00:00
Bill Yi
4883417997 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e7f361b3cc -s ours am: e1b12ea032 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7d7c1a488a13e6ad7df496f2a8316c2682d9a669
 2022-02-06 07:44:49 +00:00
Bill Yi
c2828ad558 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e7f361b3cc -s ours am: ea2313ee1c -s ours am: cd6a5bb9c6 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I90a9786dd6fd774715fab387ddb806e653234994
 2022-02-06 07:32:26 +00:00
TreeHugger Robot
8536254635 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 13b64572bc -s ours am: da113335f1 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4c2b58b8d2221e6f45ab33ea2e31f6e5350d8254
 2022-02-06 07:30:36 +00:00
Bill Yi
cd6a5bb9c6 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e7f361b3cc -s ours am: ea2313ee1c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ifd09ecf5d27a5d17d7288c730bc684488c0a6981
 2022-02-06 07:29:57 +00:00
Bill Yi
e1b12ea032 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e7f361b3cc -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I77c8fc97fc5c1f6fb03703273702ee297b407472
 2022-02-06 07:29:40 +00:00