Quang Luong
e93e8fe2d5
Merge "isCarrierNetworkActive() should check if the carrier network is default" into sc-dev am: afc0bd763c
am: 5f5068f6df
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15081404
Change-Id: I6f654bda50a93deed9dcb4fa6b61f87dd8e296f3
2021-06-24 15:37:17 +00:00
Jeff Sharkey
7ba49c3b02
Merge "Update to modern Bluetooth permissions." into sc-dev am: 5b7518fdf7
am: cf5988db8a
am: dc8d4365bd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15073071
Change-Id: Icebcf5c0d9155ce76bef0201496ad60abc09c612
2021-06-24 15:27:07 +00:00
Quang Luong
5f5068f6df
Merge "isCarrierNetworkActive() should check if the carrier network is default" into sc-dev am: afc0bd763c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15081404
Change-Id: Ia04e46f443afce296bd76ffa85da4bd0647390d2
2021-06-24 15:27:02 +00:00
Jeff Sharkey
eeadb807e5
Merge "Update to modern Bluetooth permissions." into sc-dev am: 5b7518fdf7
am: 60256a980e
am: 9bec21269c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15073071
Change-Id: I233cd9e37ae278aee50d70a9175d2ac5409b4fa3
2021-06-24 15:26:55 +00:00
Jeff Sharkey
6a9a1b9e91
Merge "Update to modern Bluetooth permissions." into sc-dev am: 5b7518fdf7
am: 74446ce412
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15073071
Change-Id: I12ebf9bd8a635fb36207979dfc39c05aa34f2e4b
2021-06-24 15:17:59 +00:00
Jeff Sharkey
dc8d4365bd
Merge "Update to modern Bluetooth permissions." into sc-dev am: 5b7518fdf7
am: cf5988db8a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15073071
Change-Id: Id2ee091941fa6d8b35f6cb3352c216b420f24780
2021-06-24 15:17:32 +00:00
Jeff Sharkey
9bec21269c
Merge "Update to modern Bluetooth permissions." into sc-dev am: 5b7518fdf7
am: 60256a980e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15073071
Change-Id: I6ba4da0dde8ada95b42fdbfb7f5c465eff85e533
2021-06-24 15:13:28 +00:00
Quang Luong
afc0bd763c
Merge "isCarrierNetworkActive() should check if the carrier network is default" into sc-dev
2021-06-24 15:12:38 +00:00
Jeff Sharkey
cf5988db8a
Merge "Update to modern Bluetooth permissions." into sc-dev am: 5b7518fdf7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15073071
Change-Id: Ia670fbf2a906638019087cddda098d8c5a40e33b
2021-06-24 15:02:11 +00:00
Jeff Sharkey
74446ce412
Merge "Update to modern Bluetooth permissions." into sc-dev am: 5b7518fdf7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15073071
Change-Id: Ib9248964e06dc6754a1ad347f04757a04d4bbe19
2021-06-24 15:01:59 +00:00
Jeff Sharkey
60256a980e
Merge "Update to modern Bluetooth permissions." into sc-dev am: 5b7518fdf7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15073071
Change-Id: I450a317c3a77c920f2a633f2f6f9cbd1e226f044
2021-06-24 15:01:10 +00:00
Jeff Sharkey
5b7518fdf7
Merge "Update to modern Bluetooth permissions." into sc-dev
2021-06-24 14:44:28 +00:00
Wesley Wang
c9faabdb33
Merge "Remove unnecessary converting us to ms" into sc-dev am: 31428e9dc5
am: 01be9a9316
am: df795b881e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15093550
Change-Id: I30e15464036a4bd9183efd8709954d6434ceaf24
2021-06-24 14:17:45 +00:00
Wesley Wang
1ba5265f4c
Merge "Remove unnecessary converting us to ms" into sc-dev am: 31428e9dc5
am: faa0004d16
am: cb04d2e23a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15093550
Change-Id: I156fd49f5175c8c0949e24e7ab113591f8f1ae06
2021-06-24 14:17:07 +00:00
Wesley Wang
df795b881e
Merge "Remove unnecessary converting us to ms" into sc-dev am: 31428e9dc5
am: 01be9a9316
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15093550
Change-Id: Ie03cedf951693e5ce90517904ec47e365f26ebea
2021-06-24 14:07:45 +00:00
Wesley Wang
cb04d2e23a
Merge "Remove unnecessary converting us to ms" into sc-dev am: 31428e9dc5
am: faa0004d16
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15093550
Change-Id: I7ce0388167a6331c78ad49145fbbdb926ea8828e
2021-06-24 14:07:16 +00:00
Wesley Wang
e148da5df7
Merge "Remove unnecessary converting us to ms" into sc-dev am: 31428e9dc5
am: 8750191782
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15093550
Change-Id: I724d6157113468efaa1e08590a6de5a779a16563
2021-06-24 14:06:50 +00:00
Wesley Wang
faa0004d16
Merge "Remove unnecessary converting us to ms" into sc-dev am: 31428e9dc5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15093550
Change-Id: Ifb2252f56faaa9f04a6fef2095fed8021272e115
2021-06-24 13:57:54 +00:00
Wesley Wang
8750191782
Merge "Remove unnecessary converting us to ms" into sc-dev am: 31428e9dc5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15093550
Change-Id: Ia1cc369b22cdc90d55a00e405d923e45b94d95d3
2021-06-24 13:56:49 +00:00
Wesley Wang
01be9a9316
Merge "Remove unnecessary converting us to ms" into sc-dev am: 31428e9dc5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15093550
Change-Id: I18095a162e3422305b3cca2c0a5cd15e7ff4b6f1
2021-06-24 13:56:45 +00:00
TreeHugger Robot
1629e684aa
Merge "Fix a flicker problem on top app bar" into sc-dev am: e7b17ece47
am: 3f2fd2e060
am: cbc2f0cb06
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15067023
Change-Id: Ia35782ab41d09b267c193e6b56a803409e62a28d
2021-06-24 13:51:14 +00:00
TreeHugger Robot
4e86100eb7
Merge "Fix a flicker problem on top app bar" into sc-dev am: e7b17ece47
am: 025be92f86
am: e5418e79b3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15067023
Change-Id: I254455ab457cff09ef714c6e2438a3d157d0ad1b
2021-06-24 13:50:08 +00:00
Wesley Wang
31428e9dc5
Merge "Remove unnecessary converting us to ms" into sc-dev
2021-06-24 13:45:16 +00:00
TreeHugger Robot
cbc2f0cb06
Merge "Fix a flicker problem on top app bar" into sc-dev am: e7b17ece47
am: 3f2fd2e060
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15067023
Change-Id: I6253f6ef96f486fa11dc42d017b115403b80c880
2021-06-24 13:39:37 +00:00
TreeHugger Robot
3f2fd2e060
Merge "Fix a flicker problem on top app bar" into sc-dev am: e7b17ece47
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15067023
Change-Id: I82708d22cde27cca3d54dfc2a9abf598c5e8ba08
2021-06-24 13:38:43 +00:00
TreeHugger Robot
e5418e79b3
Merge "Fix a flicker problem on top app bar" into sc-dev am: e7b17ece47
am: 025be92f86
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15067023
Change-Id: I460757a94f4fbeaeb9768051459a295f124c3faa
2021-06-24 13:38:17 +00:00
TreeHugger Robot
a7ef698351
Merge "Fix a flicker problem on top app bar" into sc-dev am: e7b17ece47
am: 3f18f97154
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15067023
Change-Id: I28a9f68c938373fce62687526559a4a7951328a5
2021-06-24 13:38:16 +00:00
TreeHugger Robot
025be92f86
Merge "Fix a flicker problem on top app bar" into sc-dev am: e7b17ece47
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15067023
Change-Id: I28cd085bdee109258f09cb0caf7f43a0d7d6fd2b
2021-06-24 13:37:48 +00:00
Alex Johnston
f446797b35
Merge "Update CA certificate warning to material next spec" into sc-dev am: 901617e37d
am: 6cbce0e954
am: 1335e884b3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15074789
Change-Id: I4aa67a0e0fc680bebd2ac586d20b95319cc67c06
2021-06-24 13:37:22 +00:00
TreeHugger Robot
3f18f97154
Merge "Fix a flicker problem on top app bar" into sc-dev am: e7b17ece47
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15067023
Change-Id: I2b4b28849a27f4805bd204b0a5bc2eea11528744
2021-06-24 13:37:10 +00:00
Alex Johnston
7b014b930d
Merge "Update CA certificate warning to material next spec" into sc-dev am: 901617e37d
am: f4bfda65a5
am: 2a5ea33e72
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15074789
Change-Id: I8e7c0c176289dc9b569b63f67bc3396627fcf89f
2021-06-24 13:37:04 +00:00
TreeHugger Robot
e7b17ece47
Merge "Fix a flicker problem on top app bar" into sc-dev
2021-06-24 13:32:55 +00:00
Alex Johnston
1335e884b3
Merge "Update CA certificate warning to material next spec" into sc-dev am: 901617e37d
am: 6cbce0e954
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15074789
Change-Id: Id272a6790802a74f2eb7a541e8537abcd8491fb0
2021-06-24 13:25:12 +00:00
Alex Johnston
2a5ea33e72
Merge "Update CA certificate warning to material next spec" into sc-dev am: 901617e37d
am: f4bfda65a5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15074789
Change-Id: I1d973e8ac46797b47797aaeb6aa76fd2c447b012
2021-06-24 13:24:54 +00:00
Alex Johnston
8b903ff285
Merge "Update CA certificate warning to material next spec" into sc-dev am: 901617e37d
am: 9beb22936e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15074789
Change-Id: I27b30deb374abee99555de965df59aa390a201f7
2021-06-24 13:24:42 +00:00
Alex Johnston
f4bfda65a5
Merge "Update CA certificate warning to material next spec" into sc-dev am: 901617e37d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15074789
Change-Id: Ib94bf919bc168523688bad893b8dbc63826f0fe1
2021-06-24 13:12:33 +00:00
Alex Johnston
9beb22936e
Merge "Update CA certificate warning to material next spec" into sc-dev am: 901617e37d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15074789
Change-Id: I9aa3dc5a899d3862f7ca7df86bbfc0a3b9f1ecef
2021-06-24 13:11:56 +00:00
Alex Johnston
6cbce0e954
Merge "Update CA certificate warning to material next spec" into sc-dev am: 901617e37d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15074789
Change-Id: I9711a05481efbc6b4d03d0247e2e753b9efedecc
2021-06-24 13:11:43 +00:00
Alex Johnston
901617e37d
Merge "Update CA certificate warning to material next spec" into sc-dev
2021-06-24 12:59:14 +00:00
Wesley.CW Wang
273a7d96a3
Remove unnecessary converting us to ms
...
- Pick from pagit/1951738
- The class "Estimate" has the menber estimateMillis and the unit of batteryUsageStats.getBatteryTimeRemainingMs() is millisecond, so converting from us to ms is unnecessary.
Bug: 187379252
Bug: 184916537
Test: make RunSettingsRoboTests
Change-Id: I2e8e03451352d7ad4cd44f72d5261dad35a81eb9
2021-06-24 11:41:53 +00:00
Prochin Wang
7b4441407b
Merge "To hide the soft input window when press skip button on Skip setup for PIN and face dialog of Set a PIN screen to avoid flash during transition." into sc-dev am: 1ff0fe1d5a
am: ab3018bd2c
am: 7fb2a3e852
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15079270
Change-Id: I5601db641ab428421779dfa42a71fa4626206ba8
2021-06-24 10:03:53 +00:00
Prochin Wang
80b96ad40e
Merge "To hide the soft input window when press skip button on Skip setup for PIN and face dialog of Set a PIN screen to avoid flash during transition." into sc-dev am: 1ff0fe1d5a
am: 595709c5a7
am: 4022d5e021
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15079270
Change-Id: Id572136d69dc4308e159f7b5bc03f0a7ba9231c4
2021-06-24 10:03:25 +00:00
Prochin Wang
7fb2a3e852
Merge "To hide the soft input window when press skip button on Skip setup for PIN and face dialog of Set a PIN screen to avoid flash during transition." into sc-dev am: 1ff0fe1d5a
am: ab3018bd2c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15079270
Change-Id: I576e4f4b07af208ebb32b612483bb6a6d7cd4c58
2021-06-24 09:51:32 +00:00
Prochin Wang
4022d5e021
Merge "To hide the soft input window when press skip button on Skip setup for PIN and face dialog of Set a PIN screen to avoid flash during transition." into sc-dev am: 1ff0fe1d5a
am: 595709c5a7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15079270
Change-Id: I104ca3b29cfbfd64f0b66e77366b5686b518e407
2021-06-24 09:51:12 +00:00
Prochin Wang
9b19e16e3f
Merge "To hide the soft input window when press skip button on Skip setup for PIN and face dialog of Set a PIN screen to avoid flash during transition." into sc-dev am: 1ff0fe1d5a
am: 9f5abd16de
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15079270
Change-Id: Idf0089efe5dcb17b7ff3cef8f3adf2d2dceb1062
2021-06-24 09:50:41 +00:00
TreeHugger Robot
ddc2ffbe9c
Merge "Revert "Fix 'No Apps' UI issues of ManageApplications"" into sc-dev am: 37b1831d0d
am: bdef27388c
am: b5128f819e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15083925
Change-Id: I65824110145ab2dc975ed1afb4521c61d2705ef4
2021-06-24 09:39:42 +00:00
TreeHugger Robot
85645cd4d8
Merge "Revert "Fix 'No Apps' UI issues of ManageApplications"" into sc-dev am: 37b1831d0d
am: 1751e1ea22
am: bd80f7eac8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15083925
Change-Id: Iab0d0529514681667349a7dd9cff0c218c29fa49
2021-06-24 09:39:34 +00:00
Prochin Wang
595709c5a7
Merge "To hide the soft input window when press skip button on Skip setup for PIN and face dialog of Set a PIN screen to avoid flash during transition." into sc-dev am: 1ff0fe1d5a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15079270
Change-Id: Ic47d91f747888dfb5a54f8ce773fd5fc5c8f93b2
2021-06-24 09:35:51 +00:00
Prochin Wang
9f5abd16de
Merge "To hide the soft input window when press skip button on Skip setup for PIN and face dialog of Set a PIN screen to avoid flash during transition." into sc-dev am: 1ff0fe1d5a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15079270
Change-Id: I033dc319ec7f1142fd9608cceb86cd2589960532
2021-06-24 09:35:02 +00:00
Prochin Wang
ab3018bd2c
Merge "To hide the soft input window when press skip button on Skip setup for PIN and face dialog of Set a PIN screen to avoid flash during transition." into sc-dev am: 1ff0fe1d5a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15079270
Change-Id: I2a290afc3256e5ed9ec440f021110aaacaa03031
2021-06-24 09:34:58 +00:00