Commit Graph

85478 Commits

Author SHA1 Message Date
TreeHugger Robot
20a3a9ac3d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: a08ae6df50 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I21533a0770fa30d42849b0ed39e6d21c3651a4a0
2021-09-03 20:22:37 +00:00
Bill Yi
729b22ab1a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fd1a0ef0ac -s ours am: fcec6efb01 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iee05cb245cac65f158837831a38a7ee8f8b4bf53
2021-09-03 20:05:26 +00:00
TreeHugger Robot
a08ae6df50 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2021-09-03 20:03:25 +00:00
Bill Yi
fcec6efb01 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fd1a0ef0ac -s ours
am skip reason: subject contains skip directive

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

Change-Id: I829fa5fbd3cc0525bcf3819e6c499d57c278110d
2021-09-03 19:55:43 +00:00
TreeHugger Robot
54dd7bc722 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: f1780afb1e -s ours am: 3a95d44f50 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I39bd3ab2e0d04e53768b8f8b5ed3b7b4a7a743d1
2021-09-03 17:34:03 +00:00
Bill Yi
94cfa8d5bc [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c71f1a2fce -s ours am: de3754f4bf -s ours
am skip reason: subject contains skip directive

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

Change-Id: If4cb70a6d62bef38bfd4a1bec498073e7a049b0b
2021-09-03 17:33:32 +00:00
TreeHugger Robot
3a95d44f50 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: f1780afb1e -s ours
am skip reason: subject contains skip directive

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

Change-Id: I4501ee71cd0c08085d6b3738707f1cfc7f351cf8
2021-09-03 17:17:35 +00:00
Bill Yi
de3754f4bf [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c71f1a2fce -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie2d61e3f19685d48ff4679f4b030bd94bb4b86b7
2021-09-03 17:15:14 +00:00
TreeHugger Robot
f1780afb1e Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod 2021-09-03 16:50:43 +00:00
YUKAI HUNG
81decdadae 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: Id51f71a57433dd11eae2b3e50290c5d010afda4c
2021-09-03 02:49:14 +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
Bill Yi
3c592eda3e [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 1336ffec20
Blank merge reason: commit message contains skip directive

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

Change-Id: I01e8cfa05eb0ce3992fca191fe54e5fc1a6bbb7d
2021-09-02 13:42:07 +00:00
Bill Yi
1336ffec20 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I1f957d47f370a5379c50a87a032f614ffb58ae76
2021-09-02 13:41:52 +00:00
Bill Yi
0345842b51 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: fb4f0b0820
Blank merge reason: commit message contains skip directive

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

Change-Id: I69e3af665e3c9efef3bd20d97b51088c4cfe47de
2021-09-02 13:31:27 +00:00
Bill Yi
fb4f0b0820 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I00320830b2c3434b32e8db54606c9ec4291c6cf7
2021-09-02 13:31:17 +00:00
Bill Yi
8382ada407 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ie45277d6008c75304a24f48190cf27e6ed197a88
2021-09-02 13:26:44 +00:00
Bill Yi
fd1a0ef0ac Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I12d781cb74cf9be4f67fd75b397d5d05ea244818
2021-09-02 13:23:16 +00:00
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