Commit Graph

100093 Commits

Author SHA1 Message Date
SongFerngWang
28e8f4d65a [MEP] the port id is wrong
The function uses wrong information to get the portId.

Bug: 218907001
Test: manual test.
Change-Id: I70a02299c40ada4c2a700fc035034e8db24b6f03
2022-02-11 15:57:52 +08:00
Roman Kalukiewicz
669ebc9b89 Merge "Allow users to add profile owner after setup if the supervision role is set." 2022-02-10 02:24:17 +00:00
Zach Johnson
6b8ddccb7a Merge "Resolve bluetooth hidden API usages" 2022-02-09 21:49:04 +00:00
Roman Kalukiewicz
f6a7b65a98 Allow users to add profile owner after setup if the supervision role is
set.

Bug: 185905077
Test: manual
Change-Id: Ia267c9d4fa6d438fa9449c6f44031a3831e86fa1
2022-02-09 21:13:10 +00:00
Jonathan Scott
a2781721e2 Merge "Allow overriding of strings referenced in XML files." 2022-02-09 10:48:09 +00:00
Junyu Lai
a190aef9ef [automerger skipped] Merge "Remove dependencies on hidden network stats APIs" am: e299e37585 am: 35dea12973 am: 8576384cfb am: 1dd7274517 -s ours
am skip reason: Merged-In I4151b831fc83dee9b36292cd7991f9b294ed4ff2 with SHA-1 0dd1b46fcf is already in history

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

Change-Id: I28acb1aa21ea36fac656331e34d8287cca057b6e
2022-02-09 10:40:33 +00:00
Steven Ng
89ad2871c8 Merge "Show "Turns on at bedtime" in Dark theme setting based on feature flag" 2022-02-09 10:25:29 +00:00
Junyu Lai
1dd7274517 Merge "Remove dependencies on hidden network stats APIs" am: e299e37585 am: 35dea12973 am: 8576384cfb
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1976626

Change-Id: If5ca64b8748d28e118c100928bc23502ff86bbaa
2022-02-09 10:24:11 +00:00
Junyu Lai
8576384cfb Merge "Remove dependencies on hidden network stats APIs" am: e299e37585 am: 35dea12973
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1976626

Change-Id: Ide3b3b54b00ece1d374d83327b14ad7609c8e133
2022-02-09 10:12:25 +00:00
Junyu Lai
35dea12973 Merge "Remove dependencies on hidden network stats APIs" am: e299e37585
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1976626

Change-Id: Iad8e74e3158f1775372cdc3ba6bd1414952c79be
2022-02-09 09:55:37 +00:00
Junyu Lai
e299e37585 Merge "Remove dependencies on hidden network stats APIs" 2022-02-09 09:30:37 +00:00
Tsung-Mao Fang
78ce1be473 Merge "Owners updates" am: af7fc198fb am: 1e680abc54 am: 2295828423 am: 1f813519e6
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1962927

Change-Id: Ib8fc8b74fab38ac1b97fb5c333ef85b671c55e69
2022-02-09 07:26:06 +00:00
Tsung-Mao Fang
1f813519e6 Merge "Owners updates" am: af7fc198fb am: 1e680abc54 am: 2295828423
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1962927

Change-Id: Idbc20317b6e4323e2cd76f07e5bf8877c5c7af1f
2022-02-09 07:08:29 +00:00
Menghan Li
f6cca799e3 Merge changes from topics "a11y_qs_attr_integration", "a11y_qs_tooltip_1p"
* changes:
  Integrate new accessibility tileService attr into settings
  Support accessibility settings load title from quick settings panel
  Show quick setting tooltips after shortcut edit dialog dismiss
  Show quick setting tooltips after shortcut tutorial dialog dismiss
2022-02-09 07:07:08 +00:00
Tsung-Mao Fang
2295828423 Merge "Owners updates" am: af7fc198fb am: 1e680abc54
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1962927

Change-Id: Id8a05278d9d6b0ca318f8a4d53c55a38d56c5f38
2022-02-09 06:57:42 +00:00
Tsung-Mao Fang
1e680abc54 Merge "Owners updates" am: af7fc198fb
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1962927

Change-Id: I55a50aa88fe57fe70c81e625668cfdb47d6cb476
2022-02-09 06:38:50 +00:00
Tsung-Mao Fang
af7fc198fb Merge "Owners updates" 2022-02-09 06:22:48 +00:00
Rajeev Kumar
cba9a259d5 Merge "Update financed device info screen" 2022-02-09 06:15:22 +00:00
menghanli
61479cde86 Integrate new accessibility tileService attr into settings
- Accessibilty service: AccessibilityService_tileService
- Accesibility shortcut: AccessibilityShortcutTarget_tileService

Bug: 216614718
Test: manual test
Change-Id: I24baff13300dfc9a242fcfffe0a4888575ca0c9f
2022-02-09 11:46:40 +08:00
menghanli
0d6909dc0f Support accessibility settings load title from quick settings panel
- ToggleAccessibilityServicePreferenceFragment for unbundle accessibility service
- LaunchAccessibilityActivityPreferenceFragment for unbundle accessibility shortcut-activity

Bug: 210356011
Test: make RunSettingsRoboTests ROBOTEST_FILTER=LaunchAccessibilityActivityPreferenceFragmentTest ToggleAccessibilityServicePreferenceFragmentTest
Change-Id: I78dcb8dcb2778819ec4bb130a041211598f6d9c
2022-02-09 08:15:22 +08:00
menghanli
0577a068b8 Show quick setting tooltips after shortcut edit dialog dismiss
- ToggleAccessibilityServicePreferenceFragment for unbundle accessibility service
- LaunchAccessibilityActivityPreferenceFragment for unbundle accessibility shortcut-activity

Bug: 210356011
Test: Manual testing
Change-Id: I3bbaa6c0e5a4359e696c776a300520c4572b31f7
2022-02-09 08:15:22 +08:00
menghanli
9855997b3c Show quick setting tooltips after shortcut tutorial dialog dismiss
- ToggleAccessibilityServicePreferenceFragment for unbundle
accessibility service
- LaunchAccessibilityActivityPreferenceFragment for unbundle
accessibility shortcut-activity

Bug: 210356011
Test: make RunSettingsRoboTests ROBOTEST_FILTER=AccessibilityGestureNavigationTutorialTest
Change-Id: I6f9e7e206ae7642d91e658ceb18b9e7ce4244a22
2022-02-09 08:15:22 +08:00
Treehugger Robot
0ee078d37a [automerger skipped] Merge "DO NOT MERGE Fix of crash when error messages are triggered" am: 46fc8079dd -s ours am: ae65af5986 -s ours am: 8cce36a71c -s ours am: 9464f1e4ac -s ours
am skip reason: subject contains skip directive

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

Change-Id: I33c0554966e061ba02299d976c49518c618a0876
2022-02-08 21:41:09 +00:00
Treehugger Robot
9464f1e4ac [automerger skipped] Merge "DO NOT MERGE Fix of crash when error messages are triggered" am: 46fc8079dd -s ours am: ae65af5986 -s ours am: 8cce36a71c -s ours
am skip reason: subject contains skip directive

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

Change-Id: I978c29531cb76675bb02723a24c19cc787c94c07
2022-02-08 21:28:44 +00:00
Treehugger Robot
8cce36a71c [automerger skipped] Merge "DO NOT MERGE Fix of crash when error messages are triggered" am: 46fc8079dd -s ours am: ae65af5986 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ifb8bb0a0777af47ebdaec20884a3022e23921166
2022-02-08 21:12:18 +00:00
Treehugger Robot
ae65af5986 [automerger skipped] Merge "DO NOT MERGE Fix of crash when error messages are triggered" am: 46fc8079dd -s ours
am skip reason: subject contains skip directive

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

Change-Id: I6b38a7fa23d1cdd1af6646b09c990c53fce397b5
2022-02-08 21:01:36 +00:00
Treehugger Robot
553f84decb [automerger skipped] Merge "Merge SQ1A.220205.002" am: c45b4ab9ae am: 428e9e636e -s ours am: b37895268a -s ours am: 5e1dfee6ff -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: I721ccb9236595746d623da2fb88c6ad74d9f46ec
2022-02-08 20:42:04 +00:00
Treehugger Robot
46fc8079dd Merge "DO NOT MERGE Fix of crash when error messages are triggered" 2022-02-08 20:39:45 +00:00
Treehugger Robot
5e1dfee6ff [automerger skipped] Merge "Merge SQ1A.220205.002" am: c45b4ab9ae am: 428e9e636e -s ours am: b37895268a -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: I13fa5da1028bb250308137d020406178092c0182
2022-02-08 20:15:28 +00:00
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
Kate Montgomery
e7788a7148 Merge "Clear recent access list when fragment is paused." 2022-02-08 16:22:52 +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
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