PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
90,899 Commits 1 Branch 0 Tags
51c66e24f3ea810b50ba3a8833f3cd6b2d969efc
Commit Graph

90899 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Etienne Ruffieux
89b43fde97 Merge "Replacing getActiveDevice by btAdapter.getActiveDevices()" am: 7ff6347c57 am: 3ddfa01d4d 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1966615

Change-Id: I76c8884f7a3dc56403e1b3616eff79baee67cc7f
 2022-02-03 00:18:40 +00:00
Etienne Ruffieux
3ddfa01d4d Merge "Replacing getActiveDevice by btAdapter.getActiveDevices()" am: 7ff6347c57 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1966615

Change-Id: Ie61c0613fd3124401ab0478685bfc189ca107a87
 2022-02-03 00:00:40 +00:00
Etienne Ruffieux
7ff6347c57 Merge "Replacing getActiveDevice by btAdapter.getActiveDevices()" 2022-02-02 23:41:26 +00:00
Jack Yu
4e543a38f6 Do not let guest user disable secure nfc 
Bug: 209446496
Test: manual
Merged-In: I7253f7f08fde04e30400a30d9a0d24f1ceff04b0
Change-Id: I7253f7f08fde04e30400a30d9a0d24f1ceff04b0
(cherry picked from commit d9e3e6e4b1)
 2022-02-02 17:44:55 +00:00
Etienne Ruffieux
9692c59d3a Replacing getActiveDevice by btAdapter.getActiveDevices() 
BluetoothProfile.getActiveDevice() is hidden, packages
should call BluetoothAdapter.getActiveDevices(profile)
instead.

Tag: #feature
Bug: 200202780
Test: build
Change-Id: Id18658de82a7e8292942951a3832a36465a69da3
 2022-02-02 15:29:34 +00:00
Jack Yu
401178c70f [automerger skipped] Do not let guest user disable secure nfc am: a579ca7554 am: 1009054124 am: b85416796d am: 05dfb08c80 am: 35b818e4f8 -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/+/16691815

Change-Id: I4174c09fc219ee813fc74264c0e7dbc696eceda1
 2022-01-28 23:31:15 +00:00
Jack Yu
29e46bd01e Do not let guest user disable secure nfc am: a579ca7554 am: 1009054124 am: b85416796d am: 05dfb08c80 am: 147f4bc01d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16691815

Change-Id: Ibb578e5efdfffa772c785cb482de853a19faf0b7
 2022-01-28 23:29:42 +00:00
Jack Yu
147f4bc01d Do not let guest user disable secure nfc am: a579ca7554 am: 1009054124 am: b85416796d am: 05dfb08c80 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16691815

Change-Id: Ib69851dd1d88fcba84af0cf940b6f949aab15355
 2022-01-28 23:14:00 +00:00
Jack Yu
35b818e4f8 Do not let guest user disable secure nfc am: a579ca7554 am: 1009054124 am: b85416796d am: 05dfb08c80 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16691815

Change-Id: I552305e84fd81e640b5dc3245826925b0318410d
 2022-01-28 23:13:59 +00:00
Jack Yu
05dfb08c80 Do not let guest user disable secure nfc am: a579ca7554 am: 1009054124 am: b85416796d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16691815

Change-Id: I72ccad504b36bd1112660cc180be93c210ae66c4
 2022-01-28 22:53:00 +00:00
Jack Yu
b85416796d Do not let guest user disable secure nfc am: a579ca7554 am: 1009054124 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16691815

Change-Id: I9879ba034ae2b8d7a964a4d6c9d700bad55b636e
 2022-01-28 22:31:38 +00:00
Jack Yu
1009054124 Do not let guest user disable secure nfc am: a579ca7554 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16691815

Change-Id: Ic68c6849bb65875aea6286d415c66ae8a9f57dfa
 2022-01-28 22:19:10 +00:00
TreeHugger Robot
71bf163671 Merge "[Settings] SIM colors are referenced by getIntArray() within source code" into sc-v2-dev am: a4a8d64edc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16634156

Change-Id: I41bc13353be755ab1459511d6da515587df2eb24
 2022-01-28 21:19:24 +00:00
TreeHugger Robot
a4a8d64edc Merge "[Settings] SIM colors are referenced by getIntArray() within source code" into sc-v2-dev 2022-01-28 21:03:47 +00:00
Junyu Lai
4ff6cf0995 Merge "[MS49] Remove NetworkStats hidden Api usages" am: dac3f891ae am: 21d08383c0 am: eb68eb5ec3 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1943133

Change-Id: Ib436a34bf1f094013b8ceb5f8acc67091117e668
 2022-01-28 17:27:56 +00:00
Junyu Lai
eb68eb5ec3 Merge "[MS49] Remove NetworkStats hidden Api usages" am: dac3f891ae am: 21d08383c0 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1943133

Change-Id: I68723f1f431a8c20c7502b71f2f4945c619ccf7d
 2022-01-28 17:07:08 +00:00
Junyu Lai
21d08383c0 Merge "[MS49] Remove NetworkStats hidden Api usages" am: dac3f891ae 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1943133

Change-Id: If8ffbe07e9bdd17a6fbcdb4dd143f613ada5d499
 2022-01-28 16:48:54 +00:00
Junyu Lai
dac3f891ae Merge "[MS49] Remove NetworkStats hidden Api usages" 2022-01-28 16:32:59 +00:00
Junyu Lai
e539db77c4 [MS49] Remove NetworkStats hidden Api usages 
This includes:
1. Remove unused INetworkStatsService and NetworkStatsHistory.
2. Replace NetworkTemplate usages with builder.
3. Replace TrafficStats references to DataUnit.
4. Reimplement NetworkTemplate#normalize.

Test: make RunSettingsRoboTests
Bug: 204830222

  (cherry-picked from ag/16724040)

Change-Id: I8efecda5df403e9ed588daecd169cb3498d213a2
Merged-In: I8efecda5df403e9ed588daecd169cb3498d213a2
 2022-01-28 13:08:52 +00:00
Bill Yi
bcace9ec94 Merge changes from topic "presubmit-am-35921ce6adc648e489af26a77e4b0f36" into sc-qpr1-dev am: 7793bd6b17 am: 58acafcc42 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16712348

Change-Id: I0b430e946575ae6665ccb14a308ce230137e24f1
 2022-01-28 03:33:58 +00:00
Bill Yi
78137dae12 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: e4ca28a0d0 am: 86cab2cd66 -s ours am: e5a95e2c27 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If5e4a68852084842fe5ca7539e4aacbfffc38945
 2022-01-28 03:33:55 +00:00