PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
84,404 Commits 1 Branch 0 Tags
fab65bcfe55f796c0ab193669e6a97f0365a5b6c
Commit Graph

84404 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
YUKAI HUNG
fab65bcfe5 Merge "Hide Camera background running time in the battery usage screen" into sc-dev am: 3f1d329878 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15723822

Change-Id: I39400598833b3de8ae60b6c9901fdbcc6015a16f
 2021-09-03 02:48:48 +00:00
YUKAI HUNG
3f1d329878 Merge "Hide Camera background running time in the battery usage screen" into sc-dev 2021-09-03 02:33:22 +00:00
Treehugger Robot
fb1bf5f85e Merge "Support multi-users for NFC payments" am: 6eb702ed63 am: 6eb3f3bf90 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1778405

Change-Id: I897892c6f9bf29174775917568a9e83714b74af2
 2021-09-02 09:25:52 +00:00
Treehugger Robot
6eb3f3bf90 Merge "Support multi-users for NFC payments" am: 6eb702ed63 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1778405

Change-Id: I1f20e829bf513d8166458e1749bcc8c9fade07b2
 2021-09-02 09:17:20 +00:00
Treehugger Robot
6eb702ed63 Merge "Support multi-users for NFC payments" 2021-09-02 08:56:28 +00:00
Joe Bolinger
46470d911e Merge "Remove sliceable attribute from biometric preference controllers." into sc-dev am: c7a0b63dd9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15546133

Change-Id: I8423ebeee18eb6e9213a2e45bc5f2eed3a19aabd
 2021-09-01 01:25:27 +00:00
Joe Bolinger
c7a0b63dd9 Merge "Remove sliceable attribute from biometric preference controllers." into sc-dev 2021-09-01 01:15:40 +00:00
ykhung
4e3f692164 Hide Camera background running time in the battery usage screen 
hide camera background running time in the battery usage screen to avoid
users confuse about it, since it will standby in the backgound to sspeed
up launching time, not always running in the background

Bug: 196744910
Test: make SettingsRoboTests
Change-Id: Ia391d661bca44435fc5a68b1c86e5ca32dd0fcfe
Merged-In: Ia391d661bca44435fc5a68b1c86e5ca32dd0fcfe
 2021-08-31 13:58:13 +00:00
Bill Yi
4a7694c598 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 31208c4948 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1ea6e2e3d955b85585ec6a9151964ed228408f63
 2021-08-29 20:30:11 +00:00
Bill Yi
1f17c42c16 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: a5d0f92e0c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I676bc81dd2f0026702ac5cf128653338e9683502
 2021-08-29 20:27:25 +00:00
Bill Yi
31208c4948 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-08-29 20:09:43 +00:00
Bill Yi
3c86e4eb2d Merge changes from topic "presubmit-am-97a471bd986844e18bd548ced9fef8c8" into sc-dev-plus-aosp 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: dbd589e440
  Import translations. DO NOT MERGE ANYWHERE
 2021-08-29 20:09:43 +00:00
Bill Yi
a5d0f92e0c Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-08-29 20:09:03 +00:00
Bill Yi
110c972e70 Merge changes from topic "presubmit-am-c20da0f0065e4b1f830af72ee7464b84" into sc-dev-plus-aosp 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 483d6621f3
  Import translations. DO NOT MERGE ANYWHERE
 2021-08-29 20:09:03 +00:00
TreeHugger Robot
80725024e0 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 4c1ee5ab6a -s ours am: 4d7546b098 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic53cd7193ff5af103c1a35dd1ede8649dabb698f
 2021-08-28 08:38:00 +00:00
TreeHugger Robot
e8c88b9a3d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 41642f5ba8 -s ours am: c60b803327 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iadb11471eb919eceac5f3a0367b481db4c54c5a7
 2021-08-28 08:37:48 +00:00
Bill Yi
cec1d12392 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: af04cc6ba7 -s ours am: 3ff9a07c89 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ifea8261408bf561c44bb36363f8f353b14a870a1
 2021-08-28 08:37:44 +00:00
Bill Yi
2d8f65e4f8 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: be9d9c91bd -s ours am: 118a531c2c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I153e392027e665de2af74b3ed332c31e52150a6a
 2021-08-28 08:36:34 +00:00
TreeHugger Robot
4d7546b098 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 4c1ee5ab6a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I06fd20aafcd319c0e0e7b6a9d006197f984b74ce
 2021-08-28 08:34:17 +00:00
TreeHugger Robot
c60b803327 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 41642f5ba8 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I14af6577b6f8600267781913930812d6e8442476
 2021-08-28 08:23:06 +00:00
Bill Yi
3ff9a07c89 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: af04cc6ba7 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If94cc75281d2f0c4876fee80a9673a4da160bd34
 2021-08-28 08:22:40 +00:00
Bill Yi
118a531c2c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: be9d9c91bd -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I474ea1b8a7f6c15b4cd15b46c36202b45b3803ab
 2021-08-28 08:18:16 +00:00
TreeHugger Robot
4c1ee5ab6a Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod 2021-08-28 08:07:08 +00:00
TreeHugger Robot
41642f5ba8 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2021-08-28 08:05:30 +00:00
Bill Yi
a60710d90a [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 483d6621f3 
Blank merge reason: commit message contains skip directive

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

Change-Id: I67cb3ffc9dea46b3d78c3aad461c660c98543851
 2021-08-27 22:30:39 +00:00
Bill Yi
483d6621f3 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ibe92bbdc1c48b03b289f618ec57204de1e5742ac
 2021-08-27 22:30:19 +00:00
Bill Yi
df34345697 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: dbd589e440 
Blank merge reason: commit message contains skip directive

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

Change-Id: Id6040dd2c8250cfdb0b01b90ea996aced7114132
 2021-08-27 22:19:38 +00:00
Bill Yi
dbd589e440 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I96dd7efe4261508234fbb971a0d7e406d548a503
 2021-08-27 22:19:26 +00:00
Bill Yi
af04cc6ba7 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I5a77348c77e612c03205df8f99434e19242984a1
 2021-08-27 22:14:52 +00:00
Bill Yi
5785856ca7 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I568912c51296854b465c0aa429f06d26e1d017a0
 2021-08-27 22:11:23 +00:00
Bill Yi
be9d9c91bd Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I8f04d37f7882ae5e9f83a319f940d846c552f820
 2021-08-27 22:00:01 +00:00
Bill Yi
d42af21890 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I8ea9f0996c12b58f25d2e9884387c8e15347824e
 2021-08-27 21:54:57 +00:00
Jack Yu
d2ca4038ce Support multi-users for NFC payments 
Configure nfc payment settings based on different users.

Bug: 191851086
Bug: 191845397
Bug: 192994529
Test: nfc payment with 2nd user
      make RunSettingsRoboTests
      ROBOTEST_FILTER=DefaultPaymentSettingsPreferenceControllerTest
Change-Id: I52440e77b6b5837b978b381e1c1694d2b29f048e
 2021-08-23 16:18:08 +00:00
Bill Yi
e8eeb4a1ec [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 46902bd366 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie84b2cd119dc71eea967c30a3c522aaf86f3ddb2
 2021-08-23 04:37:03 +00:00
Bill Yi
46902bd366 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-08-23 04:21:54 +00:00
Bill Yi
a536531bd9 Merge changes from topic "presubmit-am-ebe8a352b317462aa31e9ffb6caeb6a5" into sc-dev-plus-aosp 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 93eb76377b
  Import translations. DO NOT MERGE ANYWHERE
 2021-08-23 04:21:54 +00:00
Bill Yi
75efc0cd4b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b762f335e3 -s ours am: 3ed7097ead -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib34afcfdd9953968c0e2b13cf454e3e9173c2b18
 2021-08-22 18:17:18 +00:00
Bill Yi
d66da997ef [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 70b0c311a5 -s ours am: 7643d374b5 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I60c3c3b85e60b3afeb4a8767852c5f3fc745880e
 2021-08-22 18:16:59 +00:00
Bill Yi
3ed7097ead [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b762f335e3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iccc05891ae6764d10ebfef8e47ac43ffa07956ac
 2021-08-22 18:07:39 +00:00
Bill Yi
7643d374b5 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 70b0c311a5 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic0611b0fd5f645d0c69ee539ebc746fddd4d59be
 2021-08-22 18:02:27 +00:00
Bill Yi
0af7a53e0a [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 93eb76377b 
Blank merge reason: commit message contains skip directive

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

Change-Id: Idd26c421684f3173fd30b8b0cef50812cf918165
 2021-08-21 10:46:13 +00:00
Bill Yi
93eb76377b Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I4c088fc157f34994615725c8c2e9815e174a6508
 2021-08-21 10:45:59 +00:00
Bill Yi
70b0c311a5 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I53bc4eea899bfa40183a478e99878438c78f2d7b
 2021-08-21 10:31:37 +00:00
Bill Yi
b762f335e3 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ieab1a39a1764ced3fe6dce11e5e8f9aa2b12498b
 2021-08-21 10:17:34 +00:00
Joe Bolinger
f78cec292c Remove sliceable attribute from biometric preference controllers. 
This removes the top-level UI switch on some of the boolean preference settings.

Bug: 193438173
Test: atest com.android.settings.biometrics
Change-Id: If1cd2cb9ae456021fcdf0efc5002db4a083b9689
 2021-08-20 18:42:50 +00:00
Bill Yi
73c14fcce0 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 88a0994ed8 -s ours am: 6718e1ee7b -s ours am: 2906d7dceb -s ours am: 5333f656cb -s ours am: cae8b13289 -s ours am: a131a4e35d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3a373fa08415810e3c1640ed69e4ae72ddc98ce6
 2021-08-19 19:23:34 +00:00
Bill Yi
f39571d27c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f391df2089 -s ours am: 6a0b815394 -s ours am: d26b631da5 -s ours am: dbb7139670 -s ours am: f56033304c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic37c89aadbf703435eda624274554e15c81b0bd6
 2021-08-19 19:23:29 +00:00
Bill Yi
4e14188b40 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 88a0994ed8 -s ours am: 6718e1ee7b -s ours am: 2906d7dceb -s ours am: 5333f656cb -s ours am: c748a50c90 -s ours am: de6423d2ee -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I42676c3bede7dda1f277f1388e862f9ebb5b6202
 2021-08-19 19:23:24 +00:00
Bill Yi
2e0e5306cb [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f391df2089 -s ours am: 6a0b815394 -s ours am: d26b631da5 -s ours am: 214068856c -s ours am: d46732c0d0 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I52c38ea935765bffaa1842a628d6e74b6ca6eead
 2021-08-19 19:22:57 +00:00
Bill Yi
a131a4e35d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 88a0994ed8 -s ours am: 6718e1ee7b -s ours am: 2906d7dceb -s ours am: 5333f656cb -s ours am: cae8b13289 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1b4c1cf3fe9a91519f752241d93ddf50b7f1db4b
 2021-08-19 19:11:00 +00:00