Yuri Ufimtsev
cb3ae2da69
Merge changes from topic "presubmit-am-4b2506520ad5436ca10c9e64940a6c76"
...
* changes:
[automerge] Provide data to LockScreenSafetySource 2p: fc9b13e865
Provide data to LockScreenSafetySource
2022-02-22 14:21:40 +00:00
Yuri Ufimtsev
c7532d90cc
Merge changes from topic "215517420-tm-dev"
...
* changes:
[automerge] Move all the shared data from biometric controllers to separate utility classes 2p: 268d1d6dc6
2p: b777246dca
[automerge] Move all the shared data from biometric controllers to separate utility classes 2p: 268d1d6dc6
2022-02-22 14:20:51 +00:00
Presubmit Automerger Backend
41eba560d1
[automerge] Move all the shared data from biometric controllers to separate utility classes 2p: 268d1d6dc6
2p: b777246dca
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16931922
Bug: 215517420
Change-Id: I83b554c3353b2ab8502501724d368c92a2fae8f2
2022-02-22 10:37:52 +00:00
Presubmit Automerger Backend
28d902c509
[automerge] Move all the shared data from biometric controllers to separate utility classes 2p: 268d1d6dc6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16931922
Bug: 215517420
Change-Id: I93674481947eca5ebabea41d183be9c24c2df029
2022-02-22 10:37:45 +00:00
Presubmit Automerger Backend
b777246dca
[automerge] Move all the shared data from biometric controllers to separate utility classes 2p: 268d1d6dc6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16931922
Bug: 215517420
Change-Id: If193c916550c2fe5adc3e251239da40519ab4638
2022-02-22 10:37:44 +00:00
Yuri Ufimtsev
268d1d6dc6
Move all the shared data from biometric controllers to separate utility classes
...
Test: atest SettingsUnitTests
Bug: 215517420
Change-Id: Ic5421cd910ae77d4e7c0a29ae0337edb98a1d3b9
2022-02-22 10:35:45 +00:00
TreeHugger Robot
ad3e2672af
Merge changes from topic "presubmit-am-dae18c09d7104904b218ce9f2cd87ee0"
...
* changes:
[automerge] Show prediction time when both value are ready 2p: 827910d3c3
2p: 25356e7a9e
[automerge] Show prediction time when both value are ready 2p: 827910d3c3
2022-02-22 08:17:41 +00:00
Hugh Chen
da38751678
[automerge] Show prediction time when both value are ready 2p: 827910d3c3
2p: 25356e7a9e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16972164
Bug: 215767460
Change-Id: I4e233fb2c668dc4a3bed59e6d62d94839ac63865
2022-02-22 05:38:58 +00:00
Hugh Chen
25356e7a9e
[automerge] Show prediction time when both value are ready 2p: 827910d3c3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16972164
Bug: 215767460
Change-Id: I2ddb768ff2abdaeeed20afe29375f92ec6ce8777
2022-02-22 05:38:42 +00:00
Hugh Chen
fc328bc08e
[automerge] Show prediction time when both value are ready 2p: 827910d3c3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16972164
Bug: 215767460
Change-Id: Ic1931ca8176c5c06a234d2c734c016d05b9be55c
2022-02-22 05:38:42 +00:00
Hugh Chen
827910d3c3
Show prediction time when both value are ready
...
Bug: 215767460
Test: make -j64 RunSettingsRoboTests
Change-Id: I07947b3eca1f656e0dc603f9b9839825dd3149fd
2022-02-22 05:38:33 +00:00
Kweku Adams
7b756e12b0
Merge "Update constant names." into tm-dev am: 01ad893e8c
am: edbd62b8b3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16941456
Change-Id: I4f1210d5aac903e2a2927b70d7d467ee2010f7b1
2022-02-22 02:38:49 +00:00
Kweku Adams
fd5997cc19
Merge "Update constant names." into tm-dev am: 01ad893e8c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16941456
Change-Id: I4752c8ef63aaa64aebb4c44471de4b4f95c629a4
2022-02-22 02:06:42 +00:00
Kweku Adams
edbd62b8b3
Merge "Update constant names." into tm-dev am: 01ad893e8c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16941456
Change-Id: I7e59aefcde83e5cf119c895b48c3f64c2df7e30e
2022-02-22 01:45:17 +00:00
Kweku Adams
01ad893e8c
Merge "Update constant names." into tm-dev
2022-02-22 01:20:10 +00:00
Menghan Li
db2c17f862
Merge "Show different tooltips for QS features auto-added and non-auto-added" into tm-dev am: 24abb535ed
am: f3b9f17cfa
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16932282
Change-Id: If8eda233edc2c3554faa8a50b49d92f6559844a6
2022-02-21 22:18:37 +00:00
Menghan Li
f3b9f17cfa
Merge "Show different tooltips for QS features auto-added and non-auto-added" into tm-dev am: 24abb535ed
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16932282
Change-Id: I5c69534e1d9bfaadee0f3f2c8ae890360fe9dc9e
2022-02-21 21:33:50 +00:00
Menghan Li
24abb535ed
Merge "Show different tooltips for QS features auto-added and non-auto-added" into tm-dev
2022-02-21 21:15:01 +00:00
Wesley Wang
b5e941420e
Merge "Refactor compact battery status method (1/2)" into tm-dev am: a01477087c
am: d43d91eb9a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16932281
Change-Id: Iece5767237ca477e1dba0d1cda2bc6e42d2c457c
2022-02-21 09:52:03 +00:00
Wesley Wang
a6bf7f6d55
Merge changes from topic "cherrypick-refactor_compact_status-3o1lsmqltp" into tm-mainline-prod am: 937e8a5cf2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16932281
Change-Id: If4709521a70fa011153dda408b18c38120f70fc5
2022-02-21 09:50:45 +00:00
Wesley Wang
d43d91eb9a
Merge "Refactor compact battery status method (1/2)" into tm-dev am: a01477087c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16932281
Change-Id: Iaef1acdf77cbe69ac90206fdc2941aa34e8cdec9
2022-02-21 09:50:39 +00:00
SongFerng Wang
9622b5ef9f
Merge "[MEP] The subscriptionInfo's getSimSlotIndex is logical slotId"
2022-02-21 09:34:20 +00:00
Wesley Wang
a01477087c
Merge "Refactor compact battery status method (1/2)" into tm-dev
2022-02-21 09:25:33 +00:00
Wesley Wang
937e8a5cf2
Merge changes from topic "cherrypick-refactor_compact_status-3o1lsmqltp" into tm-mainline-prod
...
* changes:
[automerge] Refactor compact battery status method (1/2) 2p: 6cd9fc0a7e
Refactor compact battery status method (1/2)
2022-02-21 09:25:33 +00:00
Wesley Wang
c3aa4e4d4f
Merge changes from topic "cherrypick-refactor_compact_status-3o1lsmqltp"
...
* changes:
[automerge] Refactor compact battery status method (1/2) 2p: 6cd9fc0a7e
2p: 29ffb0fbc5
[automerge] Refactor compact battery status method (1/2) 2p: 6cd9fc0a7e
2022-02-21 09:25:33 +00:00
Wesley Wang
a96e946de3
Merge changes from topic "cherrypick-refactor_compact_status-3o1lsmqltp"
...
* changes:
[automerge] Refactor compact battery status method (1/2) 2p: 6cd9fc0a7e
Refactor compact battery status method (1/2)
2022-02-21 09:25:33 +00:00
menghanli
cad616bd9a
Show different tooltips for QS features auto-added and non-auto-added
...
There are 2 different kinds of auto-added / non-auto-added illustrations in QS tooltips for framework features. Show animation in the settings page for full flow for non-framework services.
Bug: 218968108
Test: manual testing
Change-Id: I9c95c9f3e60ce94ce4059e27ef93c1dacce7a5c7
2022-02-21 15:49:18 +08:00
Menghan Li
0437827c4a
Merge "Fix two intro strings for Magnification page during Suw" into tm-dev am: 100a1f9990
am: 29b078da9c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16932277
Change-Id: I4b243d00400e6ede3f23b2ea1a9bc074902924a0
2022-02-21 07:45:12 +00:00
SongFerngWang
181f8179f1
[MEP] The subscriptionInfo's getSimSlotIndex is logical slotId
...
1. The subscriptionInfo's getSimSlotIndex is logical slotId. The code
should compare it with uiccSlotMapping.getLogicalSlotIndex()
2. Rename the parameters for the readability.
3. The mobile network selection dialog did not be closed after user clicked.
Bug: 219951253
Test: manual test.
Change-Id: I7fef78547f4e6283791cd15a03275eaefeb50e3c
2022-02-21 15:39:16 +08:00
Menghan Li
29b078da9c
Merge "Fix two intro strings for Magnification page during Suw" into tm-dev am: 100a1f9990
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16932277
Change-Id: Ia46166b3f481ad997e934bea83ab18520ff6aefa
2022-02-21 07:23:26 +00:00
Menghan Li
100a1f9990
Merge "Fix two intro strings for Magnification page during Suw" into tm-dev
2022-02-21 07:04:38 +00:00
Wesley Wang
7e628d9363
[automerge] Refactor compact battery status method (1/2) 2p: 6cd9fc0a7e
2p: 29ffb0fbc5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16932281
Bug: 219650786
Change-Id: I48dc0b0b3cda9cb3b6000eed97399c1d4e4df4ad
2022-02-21 06:35:08 +00:00
Wesley Wang
29ffb0fbc5
[automerge] Refactor compact battery status method (1/2) 2p: 6cd9fc0a7e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16932281
Bug: 219650786
Change-Id: I1658817a0da0d6da0b66c31fcfd61d73fc192e8e
2022-02-21 06:34:55 +00:00
Wesley Wang
736036a17c
[automerge] Refactor compact battery status method (1/2) 2p: 6cd9fc0a7e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16932281
Bug: 219650786
Change-Id: Idba3b08231ffae9843293502a8361f094ff825c8
2022-02-21 06:34:55 +00:00
Wesley Wang
6cd9fc0a7e
Refactor compact battery status method (1/2)
...
- Move compact battery status logic into libs
Bug: 219650786
Test: make SettingsRoboTests
Change-Id: Icc53c8d88235bffedfb51a3526668277fcbf4f40
2022-02-21 06:34:46 +00:00
Yuri Ufimtsev
a7cdcb15b9
[automerge] Provide data to LockScreenSafetySource 2p: fc9b13e865
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16931921
Bug: 215515298
Change-Id: I7f743e6f9931f26e6b8b653895bbe387a3add100
2022-02-18 23:49:02 +00:00
Yuri Ufimtsev
fc9b13e865
Provide data to LockScreenSafetySource
...
Test: atest SettingsUnitTests
Bug: 215515298
Change-Id: I59640e9f691754a2225870d40f5db3e6fd8557f8
2022-02-18 23:47:42 +00:00
Kweku Adams
2a51b8bfe0
Update constant names.
...
Updating references based on changes for TIP1. This change is just to
keep things building properly. Updates to the UI and functionality will
be done separately.
Bug: 158300259
Test: Android builds
Change-Id: I3a50c028fe69a6180ae842d3117b5cdfd712e0fd
(cherry picked from commit b05665fa83
)
2022-02-18 21:55:13 +00:00
Kweku Adams
5efc9469c9
Merge "Update constant names."
2022-02-18 21:54:16 +00:00
TreeHugger Robot
baec7aca18
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 1c5ae8a124
-s ours am: 1a2962d15b
-s ours am: e647298264
-s ours am: dff5a34eed
-s ours am: af36a28042
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16934956
Change-Id: I856301c2fb5f644762da1e6aa7d43f6c1c425d88
2022-02-18 20:33:59 +00:00
Bill Yi
462cb55b1f
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: bfb1c0090c
am: 382229bcb6
-s ours am: be2ae00267
-s ours am: e29c0bb725
-s ours am: 503240098d
-s ours am: 4856f3b978
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16934955
Change-Id: I0216c80494e861368cb05da31903a795e7ce1135
2022-02-18 20:30:40 +00:00
Bill Yi
7862fa5c7b
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b45dc4ca74
-s ours am: e2d91a630e
-s ours am: 45e3ec1efa
-s ours am: 5982034105
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16934957
Change-Id: I2b3c4ce29a9ecf0edb6a8d1abd02bcef9e69d87c
2022-02-18 19:54:53 +00:00
TreeHugger Robot
48e156dedb
Merge "Import translations. DO NOT MERGE ANYWHERE"
2022-02-18 19:24:36 +00:00
TreeHugger Robot
f0332ff1dd
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 1c5ae8a124
-s ours am: 1a2962d15b
-s ours am: e647298264
-s ours am: dff5a34eed
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16934956
Change-Id: I234a9617a35b7a51cadb80ceaa5fca5155cf3b66
2022-02-18 18:39:33 +00:00
Bill Yi
03ccd38051
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: bfb1c0090c
am: 382229bcb6
-s ours am: be2ae00267
-s ours am: e29c0bb725
-s ours am: 503240098d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16934955
Change-Id: Iaeb4d8cc7046804d1ef380d328d5d02e65b08be0
2022-02-18 18:38:17 +00:00
Bill Yi
ed439ba800
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b45dc4ca74
-s ours am: e2d91a630e
-s ours am: 45e3ec1efa
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16934957
Change-Id: Ifc94f89498b68dc3e4f976e81fe6700dd6edf698
2022-02-18 18:36:21 +00:00
TreeHugger Robot
af36a28042
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 1c5ae8a124
-s ours am: 1a2962d15b
-s ours am: e647298264
-s ours am: dff5a34eed
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16934956
Change-Id: I2fdfb61b4cc056af53909044ba8a67ae64fee847
2022-02-18 18:24:17 +00:00
Bill Yi
4856f3b978
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: bfb1c0090c
am: 382229bcb6
-s ours am: be2ae00267
-s ours am: e29c0bb725
-s ours am: 503240098d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16934955
Change-Id: Iae17fa2613cce732731facd22468159e8c8144be
2022-02-18 18:23:33 +00:00
Bill Yi
5982034105
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b45dc4ca74
-s ours am: e2d91a630e
-s ours am: 45e3ec1efa
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16934957
Change-Id: Ia883fdbe99e87f29a84fcddb5376ef009b9378b7
2022-02-18 18:22:57 +00:00
TreeHugger Robot
dff5a34eed
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 1c5ae8a124
-s ours am: 1a2962d15b
-s ours am: e647298264
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16934956
Change-Id: I919509a9dd95115228db54984529c6bbe89324d2
2022-02-18 18:02:31 +00:00