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

100325 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
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
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
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
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
2ff02b865a [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: Ie8b88aaf608c2171d91da5da1bc56e662b8ed145
 2022-02-18 23:49:01 +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
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
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
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
Bill Yi
b45dc4ca74 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Idba594ec1c8ce5633f197c8a91c4db39cb4eb5ab
 2022-02-18 03:20:57 +00:00
Bill Yi
b3c81561c2 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I97f82f3f3ab3ac037a2b28c4e0c0db21398a605c
 2022-02-18 03:17:09 +00:00
Bill Yi
382229bcb6 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: bfb1c0090c 
Blank merge reason: commit message contains skip directive

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

Change-Id: I1b36efd22b8f9c8af9ceeca44656c53010349444
 2022-02-18 03:13:47 +00:00
Bill Yi
8e58f10261 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: bfb1c0090c 
Blank merge reason: commit message contains skip directive

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

Change-Id: I7662c7037845f69e2008060f7e654656c6675194
 2022-02-18 03:13:47 +00:00
Bill Yi
bfb1c0090c Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I3127e1d696f00a9d496edaa5ed672ac1820da936
 2022-02-18 03:13:28 +00:00
Bill Yi
41068978bb Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ief2faf3cb2373cc20904d546c356b46570551ddf
 2022-02-18 02:58:19 +00:00
Marie Matheson
3b3c6bc564 Merge "Send safety center status on boot" 2022-02-17 15:45:12 +00:00
Edgar Wang
74096fa66a Merge "Replace SettingsSpinner with Spinner" 2022-02-17 14:10:40 +00:00
menghanli
1a4ca56796 Fix two intro strings for Magnification page during Suw 
- Keep the SuW intro and hide the setting intro

Bug: 220025399
Test: Manual testing
Change-Id: Ie4e9eace8dbd638bd141c14a22603644d93d458a
 2022-02-17 14:39:32 +08:00
Rahul Sabnis
55b80392e6 Merge "Remove hidden Bluetooth dependencies" am: 2e6f2dcfff am: 19d5264723 am: 99e2c9f2f2 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1989146

Change-Id: I8f23fc7fce504cf863b35d86fa59a2f732ab7fcd
 2022-02-16 23:38:17 +00:00
Rahul Sabnis
99e2c9f2f2 Merge "Remove hidden Bluetooth dependencies" am: 2e6f2dcfff am: 19d5264723 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1989146

Change-Id: I59f5ddaa559331d6efd974e7abd719db3d05aafb
 2022-02-16 23:18:32 +00:00
TreeHugger Robot
59b27c9f8d Merge "Update the show wallet settings description label." 2022-02-16 23:00:06 +00:00