PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
86,810 Commits 1 Branch 0 Tags
cd7094b9a92b80e6d9d116b0862aed7ab660c20c
Commit Graph

86810 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
bedcd7dcf9 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 6a41d25bcc -s ours am: 3c63e65b2c -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: I9ff0cd7576de8189386738962d9178696784125f
 2021-08-17 20:15:06 +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
TreeHugger Robot
8013ac32c6 [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: Iacbf620cd9e7bfffe08a9027ccdcee0e9e2f47d9
 2021-08-17 19:56:21 +00:00
TreeHugger Robot
3c63e65b2c [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: I45e2a124c17b21a9202e6101dbb645c62a62522e
 2021-08-17 19:56:03 +00:00
TreeHugger Robot
2ace4acb04 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 478207eda5 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I365e1ea376400e8027b52a72f095dae5797347f7
 2021-08-17 19:50:01 +00:00
TreeHugger Robot
70a5bd4c62 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: a1c58e43cb -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I762388b6d96ba80d2f5c632dc16ce812c607aad1
 2021-08-17 19:49:47 +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
TreeHugger Robot
478207eda5 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2021-08-17 19:39:11 +00:00
TreeHugger Robot
a1c58e43cb Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2021-08-17 19:31:32 +00: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
YUKAI HUNG
c4234a86a8 Merge "[Security] resolve RequestIgnoreBatteryOptimizations info disclosure" into sc-v2-dev am: 0a308d056b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15583411

Change-Id: I547b749bf8186e08ef33f7eb7635842b4895d1c8
 2021-08-17 17:27:51 +00:00
YUKAI HUNG
0a308d056b Merge "[Security] resolve RequestIgnoreBatteryOptimizations info disclosure" into sc-v2-dev 2021-08-17 17:10:26 +00:00
Treehugger Robot
e53111b6a0 Merge "Add biometric OWNERS to unit tests." am: 9689490c22 am: 2fbbcd3d9d am: 9ee42fc623 am: e016e0b03f 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1795029

Change-Id: I49dcaf8ffe6c206087ac920b18fa73f36a2c2a39
 2021-08-17 09:48:26 +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
Bill Yi
7ff4b20c22 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I1a80b91df8a3a635763fc178757662a07df3874a
 2021-08-16 22:59:49 -07:00
Bill Yi
73f4597617 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ib8067f7f7b9ce0b3c3c9b164c16c2124754259f4
 2021-08-16 22:54:27 -07:00
Bill Yi
635d7a2949 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: d1e4f888fb 
Blank merge reason: commit message contains skip directive

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

Change-Id: I4c5f57616aa0bda605f4fcd4f7de90a6c8b64853
 2021-08-17 05:49:49 +00:00
Bill Yi
d1e4f888fb Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Icabf059c62f547d2bf1bef0bc04e8e22d1613bc9
 2021-08-16 22:49:25 -07:00
Bill Yi
33816cbd55 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Icc69636a8f76732319cc24c5bf7e842150ab5692
 2021-08-16 22:39:23 -07:00
Bill Yi
d49b8b74d0 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ibe35735e2e3ab8087dfc0f2303e4b32318ac95a3
 2021-08-16 22:37:14 -07:00
Bill Yi
cd0d73535b [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 21392f9ffb 
Blank merge reason: commit message contains skip directive

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

Change-Id: Iab4d8828f2a190ed85f24dc2ec2f58f7082744f3
 2021-08-17 05:35:19 +00:00
Bill Yi
21392f9ffb Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I0e71e551f5efede9979e39aa215cfb597bb3135d
 2021-08-16 22:35:06 -07:00
Bill Yi
f82b80a567 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ie28ab84cb3ef23d6602af63e2e531d7057000d2f
 2021-08-16 22:24:38 -07:00
Bill Yi
6f047583bc Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I6680983f470525631710e359072fe27a81a322be
 2021-08-16 22:09:54 -07:00
Bill Yi
a687e17227 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Iaed09e1a4628fec8391ad74d6eb451c8dbb997a0
 2021-08-16 22:02:55 -07:00
Treehugger Robot
bba477b3ed Merge "Update OWNERS." am: 0544dc7b92 am: b294717b4c am: 78ed3bb6ee am: 5f69669adb 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1797467

Change-Id: Ifc7949ccb9eb3e9b15eaa3fea78d2a90c0024a6e
 2021-08-17 04:53:01 +00:00
Treehugger Robot
5f69669adb Merge "Update OWNERS." am: 0544dc7b92 am: b294717b4c am: 78ed3bb6ee 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1797467

Change-Id: Ibf4c5605ece3d2f49602b60602c523d1e7c4877b
 2021-08-17 04:41:07 +00:00
Treehugger Robot
78ed3bb6ee Merge "Update OWNERS." am: 0544dc7b92 am: b294717b4c 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1797467

Change-Id: I3d44a009fc1fb653a074c0b5075b673dcbee82d8
 2021-08-17 04:28:48 +00:00
Treehugger Robot
b294717b4c Merge "Update OWNERS." am: 0544dc7b92 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1797467

Change-Id: I8cef16ea650efa1d2f2479055779a84d266b7085
 2021-08-17 04:09:55 +00:00
ykhung
518d6df4f4 [Security] resolve 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
 2021-08-17 12:06:59 +08:00
Treehugger Robot
0544dc7b92 Merge "Update OWNERS." 2021-08-17 03:57:07 +00:00
Jason Hsu
3f5218a971 Merge "Update the button navigation preview image in 'Accessibility button & gesture' page." into sc-v2-dev am: e4824d8ee0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15552652

Change-Id: I2d0eaadd04c8a323c9a85ecfeb27c6f18151fb87
 2021-08-17 03:16:40 +00:00
Jason Hsu
e4824d8ee0 Merge "Update the button navigation preview image in 'Accessibility button & gesture' page." into sc-v2-dev 2021-08-17 03:14:48 +00:00
PETER LIANG
976b30afe3 Merge changes I57306532,I1fba7ee1 into sc-v2-dev am: 4cddfd2b00 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15478953

Change-Id: I6eee350feacecdb9d4bc83f6e297ac4c374c89e5
 2021-08-17 03:12:08 +00:00
PETER LIANG
4cddfd2b00 Merge changes I57306532,I1fba7ee1 into sc-v2-dev 
* changes:
  Update the instruction images in Accessibility tutorial dialog.
  Update the instruction images in Accessibility edit shortcut dialog.
 2021-08-17 03:00:28 +00:00
YUKAI HUNG
1b92bfe010 Merge "Add a skeleton to support battery configucation backup/restore" into sc-v2-dev am: 7053c5e265 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15552649

Change-Id: I97ee066342d3c66bfa279eab6e238942f64eee3f
 2021-08-17 02:54:11 +00:00
YUKAI HUNG
7053c5e265 Merge "Add a skeleton to support battery configucation backup/restore" into sc-v2-dev 2021-08-17 02:37:37 +00:00
Curtis Belmonte
1ca0b522d1 Merge "Remove/replace old fingerprint icon in SUW/Settings" into sc-dev am: 7fb2316a21 am: 36a42b630b am: 4f1672ce7b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15585467

Change-Id: I59cfe8ed9fcbcaf34c885edbe8dfe480df503dbf
 2021-08-17 01:31:46 +00:00
Curtis Belmonte
26b90c2cee Merge "Remove/replace old fingerprint icon in SUW/Settings" into sc-dev am: 7fb2316a21 am: 36a42b630b am: 115bbd0556 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15585467

Change-Id: I3246c51ffeab997b5dbdb5a82f1ce8457ef57428
 2021-08-17 01:19:04 +00:00
Curtis Belmonte
115bbd0556 Merge "Remove/replace old fingerprint icon in SUW/Settings" into sc-dev am: 7fb2316a21 am: 36a42b630b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15585467

Change-Id: I990c32d04641473d686914558eb801a1d0e865d7
 2021-08-17 01:15:51 +00:00
Curtis Belmonte
4f1672ce7b Merge "Remove/replace old fingerprint icon in SUW/Settings" into sc-dev am: 7fb2316a21 am: 36a42b630b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15585467

Change-Id: I8f77b33b4bcba08b8a25965cf165db290aaeca11
 2021-08-17 01:15:50 +00:00