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

84571 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
7514b30f06 [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: Idd84831c2a7385823179a9bf6c9ad66c744e9eff
 2021-08-29 20:29:02 +00:00
Bill Yi
3fb65a4774 [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: I2eeded04160aee20dfbdb492b9ce770a829dab25
 2021-08-29 20:27:44 +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
0d2b7238bc Merge changes from topic "presubmit-am-97a471bd986844e18bd548ced9fef8c8" into sc-qpr1-dev 
* 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
b7f7a895fd Merge changes from topic "presubmit-am-c20da0f0065e4b1f830af72ee7464b84" into sc-qpr1-dev 
* 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
a5d0f92e0c Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-08-29 20:09:03 +00:00
TreeHugger Robot
6d456b0b25 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 4c1ee5ab6a -s ours am: 4d7546b098 -s ours am: 82f0ae4930 -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: I43e095b6d9e481e0c702b696a1a4fd0c1cb5e4ab
 2021-08-28 08:53:38 +00:00
TreeHugger Robot
6080141498 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 41642f5ba8 -s ours am: c60b803327 -s ours am: cf5b05d878 -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: I51f0e6efaecb90ced00b9d0c2d4356d477f113f1
 2021-08-28 08:53:32 +00:00
Bill Yi
19cbb3c570 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: af04cc6ba7 -s ours am: 3ff9a07c89 -s ours am: eb2a13ee8a -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: I176101090958db799d7db5670ba01b922b3ab391
 2021-08-28 08:53:13 +00:00
Bill Yi
5a0fe94bbf [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: be9d9c91bd -s ours am: 118a531c2c -s ours am: 9b3d8a4629 -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: I746c3ebb1c78bbd6e8bfd3cc8a78dba461bbe7f9
 2021-08-28 08:52:45 +00:00
TreeHugger Robot
82f0ae4930 [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: I010271c153b50c9212a4e01afb37db572250f252
 2021-08-28 08:38:28 +00:00
TreeHugger Robot
cf5b05d878 [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: I94d31a6410c30f8a60630080903996c52e8fe51d
 2021-08-28 08:38:25 +00:00
Bill Yi
eb2a13ee8a [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: Ibc16e48f3fd33b2b0b0a6946cac9af62ca940512
 2021-08-28 08:38:08 +00:00
Bill Yi
9b3d8a4629 [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: I9d46d4c15e98ede68881bc469ff81d684f3f9205
 2021-08-28 08:37:45 +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
TreeHugger Robot
bb548328d6 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 3575b70b77 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6a8b95c79f3f1b790afc12967602426359de04f9
 2021-08-28 08:19:11 +00:00
TreeHugger Robot
b94dc03090 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 74b4a3c8fb -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I02965e6c3633315502c74fccc83153e69c1db742
 2021-08-28 08:19:06 +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
TreeHugger Robot
21bba0a43b Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2021-08-28 08:02:33 +00:00
TreeHugger Robot
3575b70b77 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev 2021-08-28 08:02:29 +00:00
TreeHugger Robot
2e009c1a9e Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2021-08-28 08:02:19 +00:00
TreeHugger Robot
74b4a3c8fb Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev 2021-08-28 08:01:49 +00:00
Bill Yi
213015767f Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Iad6d2f05b128a85f5b72a6948cbfdf11b80eb837
 2021-08-27 22:38:13 +00:00
Bill Yi
4f31189088 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I5227d933dcb559cb1be8bb5a0bbcce612b0da2a4
 2021-08-27 22:34:10 +00:00
Bill Yi
30f4367fed [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: I16a98faa8d54fe2cf6b7056f0bf4fdd0947560ba
 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
Joe Bolinger
dbac832ae9 Fix crash when error messages are triggered due to configuration changes. 
Bug: 197265282
Test: Manaul (start enrollment and switch active display)
Change-Id: Id83ea58dc6b06461f48cddf90e85cc682ac2451c
 2021-08-27 15:24:16 -07:00
Bill Yi
5e948972d5 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I5c1e4dfed1e6cfce314da6968ea38b7cc7a9dd9d
 2021-08-27 22:22:36 +00:00
Bill Yi
e3d99cf9c6 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I148b65f26df0f4c99f650bad6beef65918ae4870
 2021-08-27 22:20:59 +00:00
Bill Yi
1a1eba9262 [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: If8edcfcbb2ef4292543e75d6c55e209802e168d5
 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
Victor Liu
8fd386e5c4 Merge "Initialize UwbManager only if supported on device." into sc-qpr1-dev am: 029b6397a8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15676888

Change-Id: I705dbcfa7b4095bdf1d39830b2910ce53eaf4e44
 2021-08-27 02:14:01 +00:00
Victor Liu
4b3f7bac9b Merge "Revert "Revert "UWB: Re-enable UWB toggle""" into sc-qpr1-dev am: 989edd731d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15676887

Change-Id: Ie5eaa98792e804e4fded2673f3ab5e32717a8b08
 2021-08-27 02:14:00 +00:00
Victor Liu
029b6397a8 Merge "Initialize UwbManager only if supported on device." into sc-qpr1-dev 2021-08-27 01:57:14 +00:00
Victor Liu
989edd731d Merge "Revert "Revert "UWB: Re-enable UWB toggle""" into sc-qpr1-dev 2021-08-27 01:57:14 +00:00
Android Build Prod User
bfcdb0a8ad [automerger skipped] Merge "[QPR1] Add time unit into battery usage chart and refine some UI" into sc-qpr1-dev am: 33af17ff31 -s ours 
am skip reason: Merged-In I5b35b0fa808eb8a5f607962ee973c2896529b078 with SHA-1 fbbcc55fc0 is already in history

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

Change-Id: I4296f4accb9cf3c066c8b6c7e22f7bdf84b866af
 2021-08-26 21:59:49 +00:00
Android Build Prod User
10519b6e30 [automerger skipped] Merge "[QPR1][Security] Fix RequestIgnoreBatteryOptimizations info disclosure" into sc-qpr1-dev am: 71327943dc -s ours 
am skip reason: Merged-In Ia2e47c493c206e96b0bc1d9f08735c0f9474c233 with SHA-1 518d6df4f4 is already in history

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

Change-Id: I903d37c821a8226d0b83e91b3947eae02834d26b
 2021-08-26 21:59:29 +00:00
Android Build Prod User
33af17ff31 Merge "[QPR1] Add time unit into battery usage chart and refine some UI" into sc-qpr1-dev 2021-08-26 21:42:36 +00:00
Android Build Prod User
71327943dc Merge "[QPR1][Security] Fix RequestIgnoreBatteryOptimizations info disclosure" into sc-qpr1-dev 2021-08-26 21:42:27 +00:00
Joy Babafemi
63976c2051 Revert "Revert "UWB: Re-enable UWB toggle"" 
This reverts commit 2e593b3784.

Reason for revert: Root cause b/196317865 fixed

Bug: 197519749
Change-Id: Ib0fee46471c7f110b265faedc62a3f66610bf7c2
Merged-In: Ib0fee46471c7f110b265faedc62a3f66610bf7c2
 2021-08-26 20:27:23 +00:00
Joy Babafemi
14aee30625 Initialize UwbManager only if supported on device. 
Test: Manual
Bug: 197519749
Change-Id: I8346f4c2f3e3cc52e21a9214ab3fd428180c5d8d
Merged-In: I8346f4c2f3e3cc52e21a9214ab3fd428180c5d8d
 2021-08-26 20:26:11 +00:00
Betty Chang
2889a7d49f Merge "Change the Network preference summary for wifi option" into sc-qpr1-dev am: 6a3b697141 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15671537

Change-Id: I6ce573b12c83282587419e321f7c690c6830b4a6
 2021-08-26 11:16:54 +00:00