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

84832 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
f30d081a94 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: a26ca75570 -s ours am: cee3e9bfce -s ours am: c3d27dad60 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ifb21bb093047d9628bce7f6c911750b4d5fab8a5
 2021-08-17 23:56:06 +00:00
TreeHugger Robot
ebdc111881 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: a26ca75570 -s ours am: cee3e9bfce -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I46a0db7c5e375574da88ac20db52790c3ccf29ea
 2021-08-17 23:43:42 +00:00
TreeHugger Robot
c3d27dad60 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: a26ca75570 -s ours am: cee3e9bfce -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I01a092f96b4633ff98b538c88e77d00a26484b98
 2021-08-17 23:40:25 +00:00
TreeHugger Robot
cee3e9bfce [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: a26ca75570 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0c0963f016e83b020dcffc91517604cfd0197468
 2021-08-17 23:27:43 +00:00
TreeHugger Robot
a26ca75570 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2021-08-17 23:08:15 +00:00
Bill Yi
634884e7ba [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 28dea4a78c -s ours am: 2aa1ba2fba -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic7d5d96ea07750d6d6e54a5c6f946c755f3e7629
 2021-08-17 22:36:19 +00:00
Bill Yi
28c5c2fdb6 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 0fe195f2b0 -s ours am: 88e247bfe9 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1f12e045a36ec8de65c9682575ebc9817769b659
 2021-08-17 22:35:47 +00:00
Bill Yi
db14bcbe3b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 28dea4a78c -s ours am: f3da5afffa -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If65541ea0389dabf3ab0764ed4825b45f5ed16bd
 2021-08-17 22:30:18 +00:00
Bill Yi
1492ac1bfd [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 0fe195f2b0 -s ours am: 63f455688c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0f54867e8c75f7a4f98b1d802425ea1d051dd788
 2021-08-17 22:29:04 +00:00
Bill Yi
aeb3f24e59 Merge changes from topic "presubmit-am-cdddcf78595b4111a60c29aad3e575f9" into sc-dev-plus-aosp am: 6b6e3e88b9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15591587

Change-Id: I644ec2547cf5dec240e7219e45936c7eb3310a32
 2021-08-17 22:24:41 +00:00
Bill Yi
743457a225 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: d1e4f888fb am: 635d7a2949 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4acff956f43f72294cd6059fcaadeb7def76a4c5
 2021-08-17 22:24:40 +00:00
Bill Yi
2aa1ba2fba [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 28dea4a78c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie4c9152e7641c926d505feac8b455bf6e6035cfc
 2021-08-17 22:23:35 +00:00
Bill Yi
1abe5e1740 Merge changes from topic "presubmit-am-febb5148f3864699b2afc6cf79966010" into sc-dev-plus-aosp am: 4d1a339b98 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15591583

Change-Id: Id7b3c6cca84473fe053c7766171c223d5e7ba882
 2021-08-17 22:22:51 +00:00
Bill Yi
dabdae9adb [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 21392f9ffb am: cd0d73535b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia1d812892e37a4e5d992e22e7662a4171e2f1df3
 2021-08-17 22:22:50 +00:00
TreeHugger Robot
dc69206b6e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: dd0e1a338c -s ours am: 9aeb396178 -s ours am: 345eec506d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iaad69de065ade77be8285dcc6e5ef59f40d4fe48
 2021-08-17 22:21:45 +00:00
Bill Yi
88e247bfe9 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 0fe195f2b0 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8ef47f44dbf017b6284cf14e2b7d7a2519c49f81
 2021-08-17 22:21:42 +00:00
Bill Yi
f3da5afffa [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 28dea4a78c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0ffaf93e46cb1a8899e3652283e7951142edf812
 2021-08-17 22:20:52 +00:00
Bill Yi
63f455688c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 0fe195f2b0 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ifd215b3e05cdef6649aebde74f710bf559ca9c54
 2021-08-17 22:20:34 +00:00
Bill Yi
79e8d066ef [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6f047583bc -s ours am: 3e49192ffc -s ours am: f8f7afe889 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ief7c74ce297f8552def699acb67520adc278a13a
 2021-08-17 22:19:58 +00:00
Bill Yi
11895d923a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f82b80a567 -s ours am: fa3505fdd8 -s ours am: 1ca3b46718 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8457b3f3f9dd10594546a70baecceede1c4085ce
 2021-08-17 22:18:22 +00:00
Bill Yi
28dea4a78c Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-08-17 22:06:14 +00:00
Bill Yi
6b6e3e88b9 Merge changes from topic "presubmit-am-cdddcf78595b4111a60c29aad3e575f9" into sc-dev-plus-aosp 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: d1e4f888fb
  Import translations. DO NOT MERGE ANYWHERE
 2021-08-17 22:06:14 +00:00
Bill Yi
4d1a339b98 Merge changes from topic "presubmit-am-febb5148f3864699b2afc6cf79966010" into sc-dev-plus-aosp 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 21392f9ffb
  Import translations. DO NOT MERGE ANYWHERE
 2021-08-17 22:04:16 +00:00
Bill Yi
0fe195f2b0 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-08-17 22:04:16 +00:00
TreeHugger Robot
6ac0521fc9 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: dd0e1a338c -s ours am: 9aeb396178 -s ours am: 085d3c9360 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I88aba12bc51f3ee79ba47c76e85271afd8733453
 2021-08-17 21:03:57 +00:00
Bill Yi
0ffadc1caf [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6f047583bc -s ours am: 3e49192ffc -s ours am: d02406dbe7 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib3c5fb241235d33f07b0cd6adae4a3a850b69c9b
 2021-08-17 21:03:39 +00:00
TreeHugger Robot
085d3c9360 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: dd0e1a338c -s ours am: 9aeb396178 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8a40984c311e385afd08a66cd0f397391a8097fd
 2021-08-17 20:47:16 +00:00
Bill Yi
d02406dbe7 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6f047583bc -s ours am: 3e49192ffc -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7211a697224d6da927389795fee3ba9d109a32ca
 2021-08-17 20:47:02 +00:00
TreeHugger Robot
345eec506d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: dd0e1a338c -s ours am: 9aeb396178 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I01f4d67deebe14482f976ff3086484ed79ed75ce
 2021-08-17 20:43:37 +00:00
Bill Yi
f8f7afe889 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6f047583bc -s ours am: 3e49192ffc -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I430230645a0bd690921bb35d762c792ec73bbfbc
 2021-08-17 20:43:27 +00:00
Bill Yi
baf3a8b3bd [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f82b80a567 -s ours am: fa3505fdd8 -s ours am: 02b5415b3a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iad888f0320d8301f19628debbd9ad2cc37cf301b
 2021-08-17 20:40:45 +00:00
TreeHugger Robot
9aeb396178 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: dd0e1a338c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7b04dbbc9369c89ca837fe2dccb86a3c9445dbdb
 2021-08-17 20:28:48 +00:00
Bill Yi
3e49192ffc [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6f047583bc -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I983cb558895e64cd0455dbe51eb169e0fe7bd634
 2021-08-17 20:28:41 +00:00
Bill Yi
02b5415b3a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f82b80a567 -s ours am: fa3505fdd8 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I21a0af17579c11c689e78382f4fe1e16bc91b416
 2021-08-17 20:21:42 +00:00
Bill Yi
1ca3b46718 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f82b80a567 -s ours am: fa3505fdd8 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0fd26a73fa93e5e592efc6d2259bd9e83dac2b04
 2021-08-17 20:18:16 +00:00
TreeHugger Robot
dd0e1a338c Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod 2021-08-17 20:14:28 +00:00
Bill Yi
fa3505fdd8 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f82b80a567 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib5eb493e9092ee4f57bea4cc9238a995284b1cf8
 2021-08-17 20:06:51 +00:00
TreeHugger Robot
ed4f4693c2 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 1bdc58284d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia9a9c923f760ac6cd829b2606f84c57c2b5ae0cd
 2021-08-17 19:56:50 +00:00
TreeHugger Robot
d9754e6900 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 6a41d25bcc -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2a8a5b3f77780d0b5923784cf7360869a5929ea0
 2021-08-17 19:56:23 +00:00
Xin Li
0313c67921 [automerger skipped] Merge "Merge sc-dev-plus-aosp-without-vendor@7634622" into stage-aosp-master am: 7d646a5182 -s ours am: c1853be4d0 -s ours 
am skip reason: Merged-In Id2a8c43f9bca79200f837759ce9de0a6eba2a37a with SHA-1 26d1877a7b is already in history

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

Change-Id: I1456d89f8a7d4bbc347715fbf9ac8150db07e075
 2021-08-17 19:46:34 +00:00
TreeHugger Robot
1bdc58284d Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev 2021-08-17 19:46:30 +00:00
TreeHugger Robot
6a41d25bcc Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev 2021-08-17 19:44:13 +00:00
Hansong Zhang
13f41075d4 Log when DEBUG is on 
Bug: 181588752
Test: manual

Change-Id: I43331ad011c9667d05ca752f523bc65883977c3c
 2021-08-17 12:27:50 -07:00
Xin Li
c1853be4d0 [automerger skipped] Merge "Merge sc-dev-plus-aosp-without-vendor@7634622" into stage-aosp-master am: 7d646a5182 -s ours 
am skip reason: Merged-In Id2a8c43f9bca79200f837759ce9de0a6eba2a37a with SHA-1 26d1877a7b is already in history

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

Change-Id: Ib85f7f13d04e651389e95994dd4854b92292a34b
 2021-08-17 18:36:03 +00:00
Xin Li
7d646a5182 Merge "Merge sc-dev-plus-aosp-without-vendor@7634622" into stage-aosp-master 2021-08-17 18:14:14 +00:00
ykhung
5589007530 [QPR1][Security] Fix RequestIgnoreBatteryOptimizations info disclosure 
after discussed with kdeus@ we will remove the setResult() from the
dialog action to avoid the caller apps can distinguish the users
interaction behavior, and declared REQUEST_IGNORE_BATTERY_OPTIMIZATIONS
in other applications.

Bug: 195963373
Test: make SettingsRoboTests
Change-Id: Ia2e47c493c206e96b0bc1d9f08735c0f9474c233
Merged-In: Ia2e47c493c206e96b0bc1d9f08735c0f9474c233
(cherry picked from commit 518d6df4f4)
 2021-08-17 17:14:29 +00:00
Treehugger Robot
e016e0b03f Merge "Add biometric OWNERS to unit tests." am: 9689490c22 am: 2fbbcd3d9d am: 9ee42fc623 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1795029

Change-Id: I4e704c29fa65197dbe1ba6e6471d925c0ad19a60
 2021-08-17 09:37:38 +00:00
Treehugger Robot
9ee42fc623 Merge "Add biometric OWNERS to unit tests." am: 9689490c22 am: 2fbbcd3d9d 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1795029

Change-Id: I56890f77bf79e84953a0ce01f2cec4089682fbf4
 2021-08-17 09:22:56 +00:00
Treehugger Robot
2fbbcd3d9d Merge "Add biometric OWNERS to unit tests." am: 9689490c22 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1795029

Change-Id: I355edf3a1ff7efb93a3c8eff94bb77104e60a5cb
 2021-08-17 09:12:11 +00:00
Treehugger Robot
9689490c22 Merge "Add biometric OWNERS to unit tests." 2021-08-17 08:43:12 +00:00