Commit Graph

90870 Commits

Author SHA1 Message Date
tom hsu
085e5fc946 Add a OWNER file for per-app language
Change-Id: I5b0d9491db1f1ba602306289d6df2e4282c2bece
2022-02-10 15:27:09 +08:00
Jack Yu
c7b568751e Use Intent.EXTRA_USER for ACTION_CHANGE_DEFAULT
Use Intent.EXTRA_USER to pass the UserHandle as the extra field of
ACTION_CHANGE_DEFAULT.

Bug: 215300017
Test: manual
Change-Id: I8862ae509638c7c264f49c4bc5753a65e8fdcfbc
2022-02-09 21:34:59 +08: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
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
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
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
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
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
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
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
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
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
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
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
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
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
TreeHugger Robot
da113335f1 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 13b64572bc -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: I92c13f749ba7d43837dfa06804d60c2fec4f063c
2022-02-06 07:29:26 +00:00
Bill Yi
ea2313ee1c [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: I9695f7995505937072075e5df2af755d80d3ce9e
2022-02-06 07:29:16 +00:00
TreeHugger Robot
13b64572bc Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2022-02-06 07:12:26 +00:00
Bill Yi
777dbb327e Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ie96162d55ef258d966719e932be7a947990a43a7
2022-02-05 08:47:03 +00:00
Bill Yi
e7f361b3cc Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I66e97246a1e7cccda15c563a0001127629a0b684
2022-02-05 08:43:36 +00:00
Bill Yi
b3e23787a4 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 6a7e5dcaa4
Blank merge reason: commit message contains skip directive

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

Change-Id: I4e390f12bd6e5fe5ecb62177a66fd252cdd9a9c5
2022-02-05 08:32:57 +00:00
Bill Yi
6a7e5dcaa4 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I19ff499a6e3038abc71a90a83c0f3585e66685e9
2022-02-05 08:32:48 +00:00
pingzhi wang
d565d8679f DO NOT MERGE Fix of crash when error messages are triggered
Issue is caused by call FragmentTransaction.commit after
activity saved it's state, then IllegalStateException will be thrown
and Settings will crash.

Bug: 216492911
Test: Manual. First boot up the device and follow the wizard till the
  point when register the fingerprint. While adding the fingerprint,
  short press the power button and turn off the screen.

Change-Id: I96244fc26d2aa8639538f967d645a6ca4fc7c0ba
Merged-In: I1de23885a9b80fabdc199ad09c35c3f98e86c831
2022-02-04 23:38:47 +00:00
Etienne Ruffieux
e89d54c739 Merge "Replacing getActiveDevice by btAdapter.getActiveDevices()" am: 7ff6347c57 am: 3ddfa01d4d am: 89b43fde97
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1966615

Change-Id: I666780f68471ba1235adc4a2f60e3a50ae5a868c
2022-02-03 00:36:45 +00:00