Commit Graph

85211 Commits

Author SHA1 Message Date
Bill Yi
c6f7519a06 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Idb4b4bca0e34eab569c4dffe0b76ecf6e2dd23d5
2021-09-02 13:15:34 +00:00
Bill Yi
c71f1a2fce Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ib76b04af514d6c2179f8f56a4e1ef47885e595cc
2021-09-02 13:11:52 +00:00
Bill Yi
a40d069943 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Idf88966cf8bb8b3e291684292774d782320208dc
2021-09-02 13:08:25 +00:00
Bill Yi
4f514d351e Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I964e86741a41b4135f26b107e2ce0cbe713a463d
2021-09-02 13:06:49 +00:00
Joe Bolinger
225b53ef68 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: I96fb7c18fb9c1cd21f4a8682c4f07b838bfcb91d
2021-09-01 01:25:57 +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
b53d0089cb [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: I9da0107bd11e76ba1e158b1fa48b5b04a007a042
2021-08-29 20:28:13 +00:00
Bill Yi
cc19de6420 [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: Ie7b0ce43ba4601703df172dcb9113e364678484b
2021-08-29 20:27:03 +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
fa54b86b5a Merge changes from topic "presubmit-am-97a471bd986844e18bd548ced9fef8c8" into sc-mainline-prod
* 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
301c3365ac Merge changes from topic "presubmit-am-c20da0f0065e4b1f830af72ee7464b84" into sc-mainline-prod
* 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
Bill Yi
85a9e657e4 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod 2021-08-29 20:08:34 +00:00
Bill Yi
2d6a17b989 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod 2021-08-29 20:04:40 +00:00
TreeHugger Robot
6dd698f411 [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: I73f44877505a9a62cb81545c19703b8d9386aded
2021-08-28 08:37:19 +00:00
TreeHugger Robot
26f90b9e7f [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: I81cb7de7c8b441df59a637e7ae8285b49fb1d6c0
2021-08-28 08:37:07 +00:00
Bill Yi
061173a490 [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: I07945078d217ea677984d2b3a421c57903ab05aa
2021-08-28 08:36:51 +00:00
Bill Yi
fbb0429a34 [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: Iee32d4aee970d101eeb152b77fca318834da6113
2021-08-28 08:36:32 +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
6eddd0869b [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: I73bfd2d6c6099eb4da2ea2c4bb1f8b2bb3132854
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
c93e98fb75 [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: I05d24a785e4746bdb8c074dde0f3fcfae1189754
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
ef02a83e5b Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ib7b2eef3aba7245076cc735b4001b5f80481e853
2021-08-27 22:03:48 +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
f73ff37faa Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Iae6f88d73eb8b04bfcaee96a54413de03b398d8f
2021-08-27 21:56:32 +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
Bill Yi
cb4d8096f9 [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: I58f268fd7d26810a26cca56473268696e8a0dc1a
2021-08-23 04:37:10 +00:00
Bill Yi
7faa876046 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod 2021-08-23 04:22:11 +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
f75d95cc99 Merge changes from topic "presubmit-am-ebe8a352b317462aa31e9ffb6caeb6a5" into sc-mainline-prod
* 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
33f540213a [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: I36ff2be3ac56b532491235567b28486736b411f5
2021-08-22 18:17:27 +00:00
Bill Yi
cc357115f8 [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: I794248c5648d7a82dd30ae511329380af527984d
2021-08-22 18:17:11 +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
ce5eb2ba02 [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: Ib3eaf863bc9e6417be9f83dcd118384e5c7df616
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
a79808bce4 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I8ab907c4c7fd33571a971f14c46abe98e00af4db
2021-08-21 10:21:11 +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
744d926374 [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: I5b0b0484733da619661dc0a0c7cc0de6c9294f73
2021-08-19 19:24:01 +00:00