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

90815 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Bill Yi
ffcdc25bb6 Merge changes from topic "presubmit-am-35921ce6adc648e489af26a77e4b0f36" into sc-qpr1-dev am: 7793bd6b17 am: dc4bd7f721 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16712348

Change-Id: I54f091eb6314a2f3efed35e88e7f398087dca3b2
 2022-01-28 03:33:19 +00:00
Bill Yi
47050372c7 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: e4ca28a0d0 am: 86cab2cd66 -s ours am: a85b3c079b -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: Ib19651ad473c7c1e3ed2bdb56eabf771a3617bd9
 2022-01-28 03:33:15 +00:00
Bill Yi
58acafcc42 Merge changes from topic "presubmit-am-35921ce6adc648e489af26a77e4b0f36" into sc-qpr1-dev am: 7793bd6b17 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16712348

Change-Id: Iec5a5e1458504100e8189ad99b6b459823b7e6e6
 2022-01-28 03:13:54 +00:00
Bill Yi
dc4bd7f721 Merge changes from topic "presubmit-am-35921ce6adc648e489af26a77e4b0f36" into sc-qpr1-dev am: 7793bd6b17 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16712348

Change-Id: Ie9fb258fd1c063363b545a0bb5db659f3f207bb4
 2022-01-28 03:13:54 +00:00
Bill Yi
e5a95e2c27 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: e4ca28a0d0 am: 86cab2cd66 -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: I8604a89393903f3f994f7be7cfae7b6e7f6d3900
 2022-01-28 03:13:53 +00:00
Bill Yi
a85b3c079b [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: e4ca28a0d0 am: 86cab2cd66 -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: Ia0e06bf03996897f9619d2e62b899ffd5878b4b5
 2022-01-28 03:13:52 +00:00
Bill Yi
7793bd6b17 Merge changes from topic "presubmit-am-35921ce6adc648e489af26a77e4b0f36" into sc-qpr1-dev 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: e4ca28a0d0
  Import translations. DO NOT MERGE ANYWHERE
 2022-01-28 02:54:43 +00:00
Frank Li
3ae8de500e Merge "[MS48.2] Remove NetworkStatsHistory from CycleAdaptor" am: cd2bbccf3a am: 5799ee886b am: 752e7a3ba3 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1942878

Change-Id: I6c9bf15370443b49c654e341b905961d136f5c5a
 2022-01-27 09:45:15 +00:00
Frank Li
752e7a3ba3 Merge "[MS48.2] Remove NetworkStatsHistory from CycleAdaptor" am: cd2bbccf3a am: 5799ee886b 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1942878

Change-Id: I296210366abe8965fba7fe1be48ac3bed1195599
 2022-01-27 09:23:35 +00:00
Frank Li
5799ee886b Merge "[MS48.2] Remove NetworkStatsHistory from CycleAdaptor" am: cd2bbccf3a 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1942878

Change-Id: I3f21840dc00f63ad1e0945f44a9a9e560644fb71
 2022-01-27 09:01:12 +00:00
Frank Li
cd2bbccf3a Merge "[MS48.2] Remove NetworkStatsHistory from CycleAdaptor" 2022-01-27 08:47:55 +00:00
Weng Su
535d47b298 Owners updates 
- Open to everyone for tests/unit modification

Test: N/A, just owners update
Change-Id: I8f1a13af54c5f995e8171e2bdddb4d01e0eb5f53
 2022-01-27 08:46:18 +00:00
Junyu Lai
d7451d16ff [MS48.2] Remove NetworkStatsHistory from CycleAdaptor 
While the ChartData changes the types of stored data.
Modify CycleAdaptor accordlingly for the compatibility.

Test: atest clockwork-settings-robotests
      make RunSettingsRoboTests -j40
      make RunSettingsLibRoboTests
           ROBOTEST_FILTER=DataUsageControllerTest
      make RunSettingsLibRoboTests
           ROBOTEST_FILTER=NetworkCycleChartDataLoaderTest
      make RunSettingsLibRoboTests
           ROBOTEST_FILTER=NetworkCycleDataForUidLoaderTest
      make RunSettingsLibRoboTests
           ROBOTEST_FILTER=NetworkCycleDataLoaderTest
      make RunSettingsLibRoboTests
           ROBOTEST_FILTER=DataUsageUtilsTest
Bug: 204830222
Ignore-AOSP-First: Related API conflict, need master first.

  (cherry-picked from ag/16686514)

Change-Id: Ia778d680d5354fb67476db0763dfab017284dc4a
Merged-In: Ia778d680d5354fb67476db0763dfab017284dc4a
 2022-01-27 08:46:05 +00:00
Xiao Ma
04c20d1381 Merge "Fix EthernetManager.addListener dependency in Tethering settings." am: fa785d2c86 am: 2287aa1993 am: fc3365f6d5 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1952166

Change-Id: I1b6ea198e7c82ffed62abe87cf694a9f0bdf389b
 2022-01-27 07:46:22 +00:00
Xiao Ma
fc3365f6d5 Merge "Fix EthernetManager.addListener dependency in Tethering settings." am: fa785d2c86 am: 2287aa1993 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1952166

Change-Id: I93071ad4ef3ae2e2a333b3e510af82587a34b29c
 2022-01-27 07:31:02 +00:00
Xiao Ma
2287aa1993 Merge "Fix EthernetManager.addListener dependency in Tethering settings." am: fa785d2c86 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1952166

Change-Id: I324d48263c1d6ff5aa8eddb8917188087383e6f5
 2022-01-27 07:13:01 +00:00
Xiao Ma
fa785d2c86 Merge "Fix EthernetManager.addListener dependency in Tethering settings." 2022-01-27 06:59:12 +00:00
hoffc
b4831d9fde Settings: Fix FC when learn more textview help intent is NULL 
Click the learn more textview in footer preference and trigger its help intent action. FC occurs when its help intent is NULL.

Add NULL check and hide the learn more textview if its help intent is not set.

Buganizer: 216401549

Change-Id: I3bad6814ef399d1ecd3003649edf42102478242b
Merged-In: I4e7a7c926205be1179d55d33ada345024c8a44ab
 2022-01-27 06:08:19 +00:00
TreeHugger Robot
bcf447c371 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 4636172136 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I46d04c4185b62f87cdb3dd1ab315871f052655a3
 2022-01-26 17:07:10 +00:00
TreeHugger Robot
4636172136 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2022-01-26 16:53:16 +00:00
TreeHugger Robot
c54ae54340 Merge changes from topic "presubmit-am-c45b2d983b9d4ec78289228420413054" into sc-v2-dev-plus-aosp 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2953e0c45f
  Import translations. DO NOT MERGE ANYWHERE
 2022-01-26 16:53:16 +00:00
Bill Yi
acb6773c38 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4dab10d29f -s ours am: aa11fcd96f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Idabfcd4e31707f1c52036f1af2d477bf1a6c7d95
 2022-01-26 15:49:48 +00:00
Bill Yi
7c8beef704 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4dab10d29f -s ours am: 30ee2e7136 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If5dddd432bf6f9f56e8c3febcab1b204bcc8a80b
 2022-01-26 15:42:27 +00:00
Bill Yi
aa11fcd96f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4dab10d29f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If9823276258e918fa2721294a41fb31057a6b723
 2022-01-26 15:36:41 +00:00
Bill Yi
30ee2e7136 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4dab10d29f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I62e3fe5f3d402d641b715ebf75420984f987d223
 2022-01-26 15:36:35 +00:00
Bill Yi
ce7fdd781e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c556615f57 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I32b1cf2f17562e58b37a475de95e59aab1ba0d30
 2022-01-26 15:34:58 +00:00
Etienne Ruffieux
865cad2665 Removed mocked BluetoothAdapter 
Bluetooth adapter can not be mocked anymore, using config
resource instead.

Tag: #feature
Bug: 216422716
Test: robotest
Change-Id: I92e503cbceb8412031c7f3b08a3e1016d38da18c
 2022-01-26 13:26:00 +00:00
Julia Reynolds
87d1db904e Update notification settings OWNERS 
Change-Id: Ic69ea984ab439f1d2795daf82c516878aed420ce
 2022-01-25 21:38:29 +00:00
Etienne Ruffieux
32c19cf335 Merge "Replaced use of Bluetooth resource by SystemApi" am: 49a9361062 am: 6f6f5e6b42 am: fe5b587245 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1939113

Change-Id: I96bcc99cc3eb5d1dab33246f1046bd646c72e119
 2022-01-25 15:02:12 +00:00
Etienne Ruffieux
fe5b587245 Merge "Replaced use of Bluetooth resource by SystemApi" am: 49a9361062 am: 6f6f5e6b42 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1939113

Change-Id: Iacc8c75d24c864a55be7b32f4abe1cd09d76f045
 2022-01-25 14:44:54 +00:00
Etienne Ruffieux
6f6f5e6b42 Merge "Replaced use of Bluetooth resource by SystemApi" am: 49a9361062 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1939113

Change-Id: Ieb884abbad772e2295f00aba59962472dec3de8d
 2022-01-25 14:22:26 +00:00
Etienne Ruffieux
49a9361062 Merge "Replaced use of Bluetooth resource by SystemApi" 2022-01-25 14:00:08 +00:00
Bill Yi
c556615f57 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ic56844c2efc174d299775ff03b2abc3f10d49de9
 2022-01-25 06:32:40 +00:00
Bill Yi
4dab10d29f Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ic26c56697a7c78fde677f39f63562fa8327d4b2d
 2022-01-25 06:29:10 +00:00