Commit Graph

100387 Commits

Author SHA1 Message Date
Kweku Adams
3ad1c4a9c8 Simplifying settings string generation. am: 82b0e1ccdb am: e6f24f02fd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16980814

Change-Id: I80e5e86952ce74d234cd3f366fbfc4bd7498b1d3
2022-02-22 21:57:26 +00:00
Kweku Adams
e6f24f02fd Simplifying settings string generation. am: 82b0e1ccdb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16980814

Change-Id: Ic1b46b0e0cc05f6cfbed6e2d672ea4daafa89ad8
2022-02-22 21:14:27 +00:00
Kweku Adams
82b0e1ccdb Simplifying settings string generation.
Remove duplicate code for generating the settings constant strings, and
make sure not to write redundant data (setting a value to its default).

Bug: 158300259
Test: Android builds
Change-Id: Id79bae3685bfecb4858574ee38b67b2a554823fe
2022-02-22 18:52:35 +00:00
Yuri Ufimtsev
2aeaefbaba Merge "Provide data to LockScreenSafetySource" into tm-dev am: 6368af8bdf am: 6a31bfe04b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16931921

Change-Id: Ibedc09cf02b0d24deae4efebaf0b951e1679d04b
2022-02-22 15:27:56 +00:00
Yuri Ufimtsev
175e48cb19 Merge "Move all the shared data from biometric controllers to separate utility classes" into tm-dev am: 9bc5f2ee0d am: 3104be2f95
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16931922

Change-Id: I0adf8b48c962eb316548a2c76c943163fe37029b
2022-02-22 15:17:15 +00:00
Yuri Ufimtsev
877964852a Merge changes from topic "presubmit-am-4b2506520ad5436ca10c9e64940a6c76" into tm-mainline-prod am: 11a32117f2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16931921

Change-Id: I68180cf76225ee872872f1dac5817e87d961ab4b
2022-02-22 15:03:28 +00:00
Yuri Ufimtsev
4a314e82b1 Merge "Move all the shared data from biometric controllers to separate utility classes" into tm-dev am: 9bc5f2ee0d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16931922

Change-Id: I13d8d14302ee401ded26a89a87ef074b06d59bb8
2022-02-22 14:53:00 +00:00
Yuri Ufimtsev
6a31bfe04b Merge "Provide data to LockScreenSafetySource" into tm-dev am: 6368af8bdf
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16931921

Change-Id: I979e08ada4c8ddd6ddc3bd929d37fa95e7a27ab8
2022-02-22 14:41:25 +00:00
Yuri Ufimtsev
3104be2f95 Merge "Move all the shared data from biometric controllers to separate utility classes" into tm-dev am: 9bc5f2ee0d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16931922

Change-Id: Ifaeb66fa2089e6c84d2a32381301a11d71956988
2022-02-22 14:41:00 +00:00
Yuri Ufimtsev
6368af8bdf Merge "Provide data to LockScreenSafetySource" into tm-dev 2022-02-22 14:21:40 +00:00
Yuri Ufimtsev
11a32117f2 Merge changes from topic "presubmit-am-4b2506520ad5436ca10c9e64940a6c76" into tm-mainline-prod
* changes:
  [automerge] Provide data to LockScreenSafetySource 2p: fc9b13e865
  Provide data to LockScreenSafetySource
2022-02-22 14:21:40 +00:00
Yuri Ufimtsev
8e1113b735 Merge changes from topic "presubmit-am-4b2506520ad5436ca10c9e64940a6c76"
* changes:
  [automerge] Provide data to LockScreenSafetySource 2p: fc9b13e865 2p: 2ff02b865a
  [automerge] Provide data to LockScreenSafetySource 2p: fc9b13e865
2022-02-22 14:21:40 +00:00
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
9bc5f2ee0d Merge "Move all the shared data from biometric controllers to separate utility classes" into tm-dev 2022-02-22 14:20:51 +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
32b8b2b365 [automerge] Provide data to LockScreenSafetySource 2p: fc9b13e865 2p: 2ff02b865a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16931921

Bug: 215515298
Change-Id: Icc755e497230070a217032201bbf1985510a877e
2022-02-18 23:49:13 +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