PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
103,878 Commits 1 Branch 0 Tags
d24f4a3f54573a2b2562c6f98a6fb0d73c40612c
Commit Graph

103878 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
83da16166c Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-08-08 13:45:51 +00:00
TreeHugger Robot
fd3d6db75b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 074ee502db -s ours am: 8c14b68114 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I21bc80302a0c3c1d7d0eb94c79d9ee07de718a39
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-08 06:39:56 +00:00
TreeHugger Robot
8c14b68114 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 074ee502db -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4cb5761fe5ccb02d3ff3a18a0506ec53a2f911c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-08 06:31:56 +00:00
TreeHugger Robot
e582a12055 Merge changes from topic "tc_change_22080720_11" into tm-dev am: 4b5e98636d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19551967

Change-Id: Icae2e778c95c44dbfdfb9447f4fbf0a5ffe51b5d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-08 06:30:48 +00:00
Bill Yi
2e2e5de0d0 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: f018579680 am: b53a13a2e0 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3e53e686020443f7c955fad0377f33c4f1866a77
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-08 06:30:45 +00:00
Bill Yi
cb32361f41 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 28e5ac6564 am: 09659e52e5 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I253e6e404e8fe1d96da1b0bad157d9df3e19dc3d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-08 06:30:36 +00:00
TreeHugger Robot
074ee502db Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod 2022-08-08 06:15:46 +00:00
TreeHugger Robot
4b5e98636d Merge changes from topic "tc_change_22080720_11" into tm-dev 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: f018579680
  Import translations. DO NOT MERGE ANYWHERE
 2022-08-08 06:15:46 +00:00
Bill Yi
b53a13a2e0 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: f018579680 
Blank merge reason: commit message contains skip directive

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

Change-Id: I81b0193030cd411cfb96bac41035f1108eb8d711
 2022-08-08 03:46:23 +00:00
Bill Yi
09659e52e5 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 28e5ac6564 
Blank merge reason: commit message contains skip directive

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

Change-Id: I60ece2eb12a9bffe10f577c34e98eb2e3dab95ce
 2022-08-08 03:46:19 +00:00
Bill Yi
f018579680 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ic331399e2cd77e79241be5f8c894564ce5013f34
 2022-08-07 16:19:51 -07:00
Bill Yi
28e5ac6564 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I547cb6a91451ece2aff22ceadc9c156cf043582c
 2022-08-07 16:16:19 -07:00
Bill Yi
f52497bd40 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I6f0b461048e49766d3810c8b40962610084d47ad
 2022-08-07 00:01:02 -07:00
Bill Yi
272619ebfc Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I92ca6c87d1e88a3c3306934df34891cc0af31813
 2022-08-06 23:53:07 -07:00
Bill Yi
58ee9e7782 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 81b949bbd0 -s ours am: 19ea488dcc -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I05c596130b9218456cd091575a324330337fa8f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-07 05:41:02 +00:00
Bill Yi
19ea488dcc [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 81b949bbd0 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ice25aff9ab1beaab4a272623928f706427c58186
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-07 05:18:21 +00:00
TreeHugger Robot
c8aed9b0ec [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 48224eca28 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6d2ed696cb4955907e8bb0afc5e3773e3435f702
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-07 05:14:36 +00:00
Bill Yi
bc5efdee59 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 444ead6a2e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib0f9ef2df09c0c7c2a6244ee5a2933ef97215779
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-07 05:14:31 +00:00
Bill Yi
fdf95d710f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 72fe892fc6 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iea80c3cb8196cd59fce903048f7551186da69b46
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-07 05:14:27 +00:00
TreeHugger Robot
48224eca28 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-08-07 04:54:21 +00:00
Bill Yi
81b949bbd0 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I2dcbbf96274099824349e6469e0d9ff80e2a6a69
 2022-08-04 02:12:16 -07:00
Bill Yi
444ead6a2e Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I6da0818ca33daaf08bf8f6d3f508d594d32a519a
 2022-08-04 01:32:29 -07:00
Bill Yi
72fe892fc6 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I6cd9698629063b3c10f043f57a0e5b3df6780a8c
 2022-08-04 01:19:33 -07:00
Jeff Sharkey
5991f46a52 Migrate stringslint.py to AyeAye. 
This script has been deprecated and replaced by AyeAye checks
directly in Gerrit.

Bug: 164530987
Test: none
Change-Id: Ia1baf761e5ca6a1cef7de231d0f320cfaa7e071a
 2022-08-03 13:52:10 -06:00
Arc Wang
c80890c7dd Merge "Crash happens if back button is pressed during "Format as Portable"" am: 671fa153e8 am: 6945e70c02 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2147940

Change-Id: Ib4fcff818a81a38c08f31d552706fc567ec00daa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-02 03:45:28 +00:00
Arc Wang
6945e70c02 Merge "Crash happens if back button is pressed during "Format as Portable"" am: 671fa153e8 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2147940

Change-Id: I70b0ae924d8a4410cc29e7f494e85a9b8a7d3abc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-02 03:26:39 +00:00
Arc Wang
671fa153e8 Merge "Crash happens if back button is pressed during "Format as Portable"" 2022-08-02 03:11:13 +00:00
Bonian Chen
244f21d9d7 resolve merge conflicts of 81d1cd0871 to stage-aosp-master am: 4ec8323bad 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19465627

Change-Id: I1c79864417df3c542538634621cb0458a892d926
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-29 10:11:11 +00:00
Bonian Chen
4ec8323bad resolve merge conflicts of 81d1cd0871 to stage-aosp-master 
Test: Build pass this conflict resolution.
Bug: None
Change-Id: Iaacaeaa579025deee52b29b4b1245fc7c0fa0346
 2022-07-29 07:34:35 +00:00
Treehugger Robot
81d1cd0871 Merge "Settings: Make NetworkScanHelper max search time customizable" 2022-07-29 05:37:46 +00:00
Oli Lan
c0742e745d Revert "Prevent exfiltration of system files via user image settings." 
This reverts commit 8950a90024.

Reason for revert: regression if multiple crop system crop handlers are present

Change-Id: Ib83dbb2f1109d26b7e85192379291bffef187e77
Merged-In: I15e15ad88b768a5b679de32c5429d921d850a3cb
 2022-07-28 12:14:14 +00:00
Himanshu Rawat
99bbb571f3 Merge "Don't cancel passkey entry pairing autonomously" am: 059ab284e7 am: 7c6a004452 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2159779

Change-Id: I1fa257f586e109a15aa1a26f9153ddcc6ba5b866
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-26 03:18:47 +00:00
Himanshu Rawat
d668a888f0 Don't cancel passkey entry pairing autonomously 
Bluetooth pairing is cancelled if the pairing popup is closed without
explicitly accepting the pairing. However there is no way to
explicitly accept the pairing when the local device displays for the
passkey entry or pin key entry pairing method.
As a result all passkey entry and pin key entry pairings, where the
local device is displaying the value, are cancelled after the pairing
is successful. If the BT stack has not completed the SDP search when
the pairing is cancelled after successful pairing, it may result in
removal of the bond information.

Bug: 237757124
Test: Pair with BT HID keyboard; adb logcat | grep "BTPairingController:
Pairing dialog canceled"

Change-Id: Ifdb98c16084dd811eed68469e7df5d1913c6ace8
(cherry picked from commit aa1950fd80)
Merged-In: Ifdb98c16084dd811eed68469e7df5d1913c6ace8
 2022-07-26 03:15:18 +00:00
Himanshu Rawat
7c6a004452 Merge "Don't cancel passkey entry pairing autonomously" am: 059ab284e7 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2159779

Change-Id: I7680942ca7ac5da3799b10306b1a3849800a1f4f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-26 02:17:18 +00:00
Himanshu Rawat
059ab284e7 Merge "Don't cancel passkey entry pairing autonomously" 2022-07-26 02:00:52 +00:00
LuK1337
988a76f5bb Settings: Make NetworkScanHelper max search time customizable 
Default max search time (300) fails on some devices.

Test: Network scan works on OnePlus 9 after overlaying
      max network scan search time to 254.
Change-Id: Ia0038fac6d2000748e0aa08fd6a53f11876728d7
 2022-07-25 17:44:40 -07:00
TreeHugger Robot
7da6e7a960 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 96bc6ca196 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7b9c981495db2c4233f959e7b217c51327d0e779
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-23 02:28:38 +00:00
Bill Yi
e6613a454e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: babd7f1cc6 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7e86c90d74cd7882321631a9db4a0b8a2732e33b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-23 02:28:11 +00:00
TreeHugger Robot
96bc6ca196 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-07-23 01:56:10 +00:00
Bill Yi
7a0b1e186d [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2d0fd7f558 am: 011d462ac4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I10404af323f5abe0aaae3479eace278d23963828
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-23 01:33:46 +00:00
Bill Yi
011d462ac4 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2d0fd7f558 
Blank merge reason: commit message contains skip directive

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

Change-Id: I0f062cb7d34bab7dafe000abdd96d50e7acd1db4
 2022-07-22 16:58:27 +00:00
Bill Yi
babd7f1cc6 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I8836b6918c0c9a9527bb6a95a1abb9ab53a54e9c
 2022-07-21 23:10:10 -07:00
Bill Yi
2d0fd7f558 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I893779ffabea7e7f41c1ecdf3e0f21c5f3183f2b
 2022-07-21 20:01:30 -07:00
Sorin Basca
0085dcc80c [automerger skipped] Merge "Use Mockito 4.6.1 API" am: 6a043ec5dc -s ours am: 5781b7ab3a -s ours 
am skip reason: Merged-In I2cfda684059520f6ddd1e72c55f1ab1ec9c99e8b with SHA-1 e2b0873f9c is already in history

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

Change-Id: I01c4d0a739da9f35f0c45561a04cc8273969bb78
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-20 06:26:16 +00:00
Sorin Basca
b3fb29a4e3 [automerger skipped] Use Mockito 4.6.1 API am: b9503775c0 -s ours am: ea4c4757bb -s ours 
am skip reason: Merged-In I2cfda684059520f6ddd1e72c55f1ab1ec9c99e8b with SHA-1 e2b0873f9c is already in history

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

Change-Id: I8cdf0303f4a286ebc74bcb2af74aac2598075805
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-20 06:26:05 +00:00
Sorin Basca
5781b7ab3a [automerger skipped] Merge "Use Mockito 4.6.1 API" am: 6a043ec5dc -s ours 
am skip reason: Merged-In I2cfda684059520f6ddd1e72c55f1ab1ec9c99e8b with SHA-1 e2b0873f9c is already in history

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

Change-Id: I9f616094bf9b1e54edd58918e6504885207f04e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-20 05:55:36 +00:00
Sorin Basca
ea4c4757bb [automerger skipped] Use Mockito 4.6.1 API am: b9503775c0 -s ours 
am skip reason: Merged-In I2cfda684059520f6ddd1e72c55f1ab1ec9c99e8b with SHA-1 e2b0873f9c is already in history

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

Change-Id: Id9c27926a1f4cf518aa4c9b0ba69ed51f7dda310
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-20 05:55:23 +00:00
Sorin Basca
6a043ec5dc Merge "Use Mockito 4.6.1 API" 2022-07-20 05:32:35 +00:00
Himanshu Rawat
aa1950fd80 Don't cancel passkey entry pairing autonomously 
Bluetooth pairing is cancelled if the pairing popup is closed without
explicitly accepting the pairing. However there is no way to
explicitly accept the pairing when the local device displays for the
passkey entry or pin key entry pairing method.
As a result all passkey entry and pin key entry pairings, where the
local device is displaying the value, are cancelled after the pairing
is successful. If the BT stack has not completed the SDP search when
the pairing is cancelled after successful pairing, it may result in
removal of the bond information.

Bug: 237757124
Test: Pair with BT HID keyboard; adb logcat | grep "BTPairingController:
Pairing dialog canceled"

Change-Id: Ifdb98c16084dd811eed68469e7df5d1913c6ace8
 2022-07-20 03:33:55 +00:00
Sorin Basca
dd00927d16 [automerger skipped] Use Mockito 4.6.1 API am: e2b0873f9c -s ours 
am skip reason: Merged-In I2cfda684059520f6ddd1e72c55f1ab1ec9c99e8b with SHA-1 61e0bcd194 is already in history

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

Change-Id: I4a89e9c7a5009f1bf6041589bd43b09d0f6f81b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-19 12:08:10 +00:00