PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
100,354 Commits 1 Branch 0 Tags
db2c17f8629957b9d6a36d24d2d00744e926269b
Commit Graph

100354 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Bill Yi
503240098d [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 skip reason: subject contains skip directive

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

Change-Id: If3a3114cc6b164e8dbc073f6adb77ee9272f2718
 2022-02-18 18:01:52 +00:00
Bill Yi
45e3ec1efa [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b45dc4ca74 -s ours am: e2d91a630e -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: I2465ea56326a9646fdc01fbc08f1e59833c0bed0
 2022-02-18 18:00:44 +00:00
TreeHugger Robot
88d94929f3 Merge changes from topic "presubmit-am-517a2e2cb73c439791517b439db33212" into sc-mainline-prod am: 2555e0d2e3 am: a30af1a69a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16934955

Change-Id: I99e9d5327cc8bc35149a0b7998f324fd4443adb0
 2022-02-18 17:52:43 +00:00
Bill Yi
51e980f7b7 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: bfb1c0090c am: 8e58f10261 -s ours am: 0dfdb89966 -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: I0d01e5f209c5b1d92b36bb0f1f5bb35e3c767d32
 2022-02-18 17:52:42 +00:00
Bill Yi
37fcd9c90f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 41068978bb -s ours am: 6cd5072f74 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Idede70442c7a8a8a378ee05b216c319bee013d80
 2022-02-18 17:50:24 +00:00
TreeHugger Robot
e647298264 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 1c5ae8a124 -s ours am: 1a2962d15b -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: Ib0efa9857c3e46969c664f6460b793aa2518844a
 2022-02-18 17:50:08 +00:00
Bill Yi
e29c0bb725 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: bfb1c0090c am: 382229bcb6 -s ours am: be2ae00267 -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: I0b51595a36d4dcee8c6f6833d05e96a3f697c063
 2022-02-18 17:49:34 +00:00
TreeHugger Robot
1a2962d15b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 1c5ae8a124 -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: Iea951572b963b5d7c01f2c98fb298b4c579bc3e8
 2022-02-18 17:40:19 +00:00
Bill Yi
be2ae00267 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: bfb1c0090c am: 382229bcb6 -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: Ibf22d45eb3d5056bc345ec241c29663a5922b51a
 2022-02-18 17:39:27 +00:00
Bill Yi
e2d91a630e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b45dc4ca74 -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: Ibd6af66701dbe80bcbe1d070ab8ba50e4410387c
 2022-02-18 17:37:09 +00:00
TreeHugger Robot
981e53ee76 Merge "Import translations. DO NOT MERGE ANYWHERE" 2022-02-18 17:35:35 +00:00
TreeHugger Robot
a30af1a69a Merge changes from topic "presubmit-am-517a2e2cb73c439791517b439db33212" into sc-mainline-prod am: 2555e0d2e3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16934955

Change-Id: I80575bc86df4537daa1d53580fe192c53f82ec67
 2022-02-18 17:25:17 +00:00
Bill Yi
0dfdb89966 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: bfb1c0090c am: 8e58f10261 -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: I35089010328192661011e422e6371e35ccf89760
 2022-02-18 17:25:15 +00:00
Bill Yi
6cd5072f74 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 41068978bb -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0758085033cc22441bf22a4340352cc87aba6174
 2022-02-18 17:25:00 +00:00
TreeHugger Robot
1c5ae8a124 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev 2022-02-18 17:09:16 +00:00
TreeHugger Robot
2555e0d2e3 Merge changes from topic "presubmit-am-517a2e2cb73c439791517b439db33212" into sc-mainline-prod 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: bfb1c0090c
  Import translations. DO NOT MERGE ANYWHERE
 2022-02-18 17:09:14 +00:00
TreeHugger Robot
5b0e80eaef Merge "Cache mechanism for Storage page with work profile" 2022-02-18 11:07:27 +00:00
TreeHugger Robot
836aec28cd Merge "Cache mechanism for Storage page" 2022-02-18 10:55:29 +00:00