William Escande
fe155f50fc
Use allowed system value am: 088a7b87f2
am: f859d0f15d
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1981854
Change-Id: If7fd42b0a7c006635073a3704ec0af1ac68ada55
2022-02-12 12:35:43 +00:00
William Escande
f859d0f15d
Use allowed system value am: 088a7b87f2
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1981854
Change-Id: I757da4bdfd98e460ae66ff1c31d74e2838480a8a
2022-02-12 12:21:08 +00:00
William Escande
088a7b87f2
Use allowed system value
...
Test: build
Change-Id: I84d87024423869515937ab87381be572fed0ba65
Merged-In: I84d87024423869515937ab87381be572fed0ba65
2022-02-11 13:05:33 +01:00
Julia Reynolds
445aa53ddc
Merge "Update notification settings OWNERS" am: 49b9583ea1
am: e2d790725c
am: 809c15fd53
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1960665
Change-Id: I4f8ce83fea5cde2ddf4517c78e5f66bae461a1ea
2022-02-10 14:38:05 +00:00
Julia Reynolds
809c15fd53
Merge "Update notification settings OWNERS" am: 49b9583ea1
am: e2d790725c
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1960665
Change-Id: Id88fd287953b4190d4830d0037d9f0817e6a715b
2022-02-10 14:22:43 +00:00
Julia Reynolds
e2d790725c
Merge "Update notification settings OWNERS" am: 49b9583ea1
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1960665
Change-Id: I3bdeaab21beed6c214d28516b9699a20c5b09dd5
2022-02-10 14:04:25 +00:00
Julia Reynolds
49b9583ea1
Merge "Update notification settings OWNERS"
2022-02-10 13:48:25 +00:00
Tom Hsu
d1040f8fe9
Merge "Add a OWNER file for per-app language" am: 38cb70ffd9
am: f9355dcc95
am: 3639f8c59a
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1977704
Change-Id: I4db5ebcc51cef0ad63ce03b0d3d137515c6fa8a5
2022-02-10 10:32:35 +00:00
Tom Hsu
3639f8c59a
Merge "Add a OWNER file for per-app language" am: 38cb70ffd9
am: f9355dcc95
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1977704
Change-Id: I137701d26151296a0ef8e7401a1cfc3334952230
2022-02-10 10:06:56 +00:00
Tom Hsu
f9355dcc95
Merge "Add a OWNER file for per-app language" am: 38cb70ffd9
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1977704
Change-Id: I35dceb538404edcbe552b87c6c615c0c8d16c69b
2022-02-10 09:52:36 +00:00
tom hsu
085e5fc946
Add a OWNER file for per-app language
...
Change-Id: I5b0d9491db1f1ba602306289d6df2e4282c2bece
2022-02-10 15:27:09 +08: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
c45b4ab9ae
Merge "Merge SQ1A.220205.002"
2022-02-08 18:52:08 +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
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
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
a6d4788fa0
Merge "Removed mocked BluetoothAdapter"
2022-02-07 21:17:41 +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
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
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
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
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
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
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
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
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
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
49a9361062
Merge "Replaced use of Bluetooth resource by SystemApi"
2022-01-25 14:00:08 +00:00
Xiao Ma
f621c4ba14
Fix EthernetManager.addListener dependency in Tethering settings.
...
Ethernet service related files are going to be moved into Connectivity
module. EthernetManager.addListener(listener, exectuor) will be exposed
out as module-lib API. Replace the current API usage with the one to be
exposed.
android.os.HandlerExecutor is a hidden API which isn't visible to modules,
try to replace HanlderExecutor class with Handler.post itself although
Setttings can still access this API.
Bug: 210586283
Test: m
Change-Id: I618b43769c68897f4724fae8213181be1cc770c6
2022-01-25 04:49:16 +00:00
Jack Yu
a579ca7554
Do not let guest user disable secure nfc
...
Bug: 209446496
Test: manual
Merged-In: I7253f7f08fde04e30400a30d9a0d24f1ceff04b0
Change-Id: I7253f7f08fde04e30400a30d9a0d24f1ceff04b0
(cherry picked from commit d9e3e6e4b1
)
2022-01-22 07:56:25 +00:00
Joshua Mccloskey
80670f39c9
Merge "Added lottie animations for udfps side/tip" into sc-v2-dev am: 6a6fb6b78b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16440683
Change-Id: I2e39ea48ae3511e9111dacd09b9381386763d33d
2022-01-20 00:55:15 +00:00
Joshua Mccloskey
6a6fb6b78b
Merge "Added lottie animations for udfps side/tip" into sc-v2-dev
2022-01-20 00:33:05 +00:00
Joshua Mccloskey
21a4342048
Added lottie animations for udfps side/tip
...
Bug: 209807883
Test: Verified animations show for multiple devices.
Change-Id: Ic63a0eca226309b92aa64cb4f80791ef179b8154
Merged-In: Ic63a0eca226309b92aa64cb4f80791ef179b8154
2022-01-19 20:47:42 +00:00
TreeHugger Robot
d8e43e80c0
Merge "Add caller check to com.android.credentials.RESET" into qt-dev am: 50b65a168a
am: 1ef5f42b54
am: f43f129dc0
am: d902f8c7d6
am: ea3d0361c8
am: 3a4ebbfcec
am: 45bfdf58b9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16577205
Change-Id: Iaced4c96addd8b30fc9eb63f65d496ec122530bd
2022-01-13 20:31:28 +00:00
TreeHugger Robot
ab8b39c5e0
Merge "Add caller check to com.android.credentials.RESET" into qt-dev am: 50b65a168a
am: 1ef5f42b54
am: f43f129dc0
am: d902f8c7d6
am: ea3d0361c8
am: 3a4ebbfcec
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16577205
Change-Id: I9def541c37fcc068c201abd75394cd3623b8db16
2022-01-13 20:20:36 +00:00