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

110571 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Himanshu Rawat
8fc819f87a Merge "Don't cancel passkey entry pairing autonomously" am: 059ab284e7 am: 7c6a004452 am: 99bbb571f3 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2159779

Change-Id: I7e51117d355b763c0f3d299864cb40dabed90c4c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-26 03:44:20 +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
c2b402bd50 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:38 +00:00
Himanshu Rawat
dc7aa0e87f 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:36 +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
Tsung-Mao Fang
0f7b80f47f Set an action name for wallpaer index 
Since Android T+, app has to assign an action name for opening a
external app page.

Test: Manual test wallpaper search result and can open.
Fix: 239867167
Change-Id: I4579aaf6e831ff82721c958e6b91ede4cabda2c8
 2022-07-26 02:36:13 +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
Bill Lin
008f70c249 Merge "Fix incorrect SetupChooseLockPattern layout" into tm-qpr-dev am: 483c9b7206 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19394732

Change-Id: Ib149edd918076d46f98d657169e13bc2d34cdef0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-26 01:17:02 +00:00
Android Build Coastguard Worker
9a085df372 Merge cherrypicks of [19419547] into tm-qpr1-release. 
Change-Id: Ib61bd9418d2bbc61f01fb5976affb074ae47ad95
 2022-07-26 00:50:35 +00:00
Neha Jain
be8e044706 Revert "Improve App notification loading" 
Revert "Fix binder error when an app has many channels"

Revert submission 19290255-jr-bind-flicker

Reason for revert: b/240100577
Reverted Changes:
I9a1c96f75:Improve App notification loading
I391ce0b10:Fix binder error when an app has many channels

Change-Id: Iaae40de74d135a79c18201ec17e00f3d9d5f0f3b
(cherry picked from commit c5f1cb11e0)
Merged-In: Iaae40de74d135a79c18201ec17e00f3d9d5f0f3b
 2022-07-26 00:50:30 +00:00
Bill Lin
483c9b7206 Merge "Fix incorrect SetupChooseLockPattern layout" into tm-qpr-dev 2022-07-26 00:45:37 +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
Android Build Coastguard Worker
c9df23155e Snap for 8867503 from 7ab7c1d6f8 to tm-qpr1-release 
Change-Id: I675b4a4fc5d9b4e6dd5ab76c8a5d55ad222271b3
 2022-07-25 23:25:56 +00:00
TreeHugger Robot
6a8f459e6c Merge "Send metric intent back to SUW" into tm-qpr-dev am: 587da7dfc3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19378812

Change-Id: If60a5eacd90ba186423183da0883d1252309d825
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-25 22:41:04 +00:00
Android Build Coastguard Worker
77708ac179 Merge cherrypicks of [19419547] into tm-qpr1-release. 
Change-Id: I3b90a8b4806bb07fe8baab7f5ebb303cc8d367b8
 2022-07-25 22:24:45 +00:00
Neha Jain
df538d204a Revert "Improve App notification loading" 
Revert "Fix binder error when an app has many channels"

Revert submission 19290255-jr-bind-flicker

Reason for revert: b/240100577
Reverted Changes:
I9a1c96f75:Improve App notification loading
I391ce0b10:Fix binder error when an app has many channels

Change-Id: Iaae40de74d135a79c18201ec17e00f3d9d5f0f3b
(cherry picked from commit c5f1cb11e0)
Merged-In: Iaae40de74d135a79c18201ec17e00f3d9d5f0f3b
 2022-07-25 22:24:37 +00:00
TreeHugger Robot
587da7dfc3 Merge "Send metric intent back to SUW" into tm-qpr-dev 2022-07-25 22:18:04 +00:00
Neha Jain
c5f1cb11e0 Revert "Improve App notification loading" 
Revert "Fix binder error when an app has many channels"

Revert submission 19290255-jr-bind-flicker

Reason for revert: b/240100577
Reverted Changes:
I9a1c96f75:Improve App notification loading
I391ce0b10:Fix binder error when an app has many channels

Change-Id: Iaae40de74d135a79c18201ec17e00f3d9d5f0f3b
 2022-07-25 22:16:16 +00:00
Julia Reynolds
e4dc6c972f Only show the channel toast if users expressly ask for it 
Test: NotificationChannelWarningsPreferenceControllerTest.java
Bug: 231150048
Change-Id: I4797a2184561ae3dcd03e62bfb78a90686458c6b
 2022-07-25 19:39:49 +00:00
Weng Su
8b1e21f929 Restrict WifiScanModeActivity for guest user 
- Don't show WifiScanModeActivity if the user is a guest.

Bug: 235601169
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=WifiScanModeActivityTest

Change-Id: I8f1d162d9b15116c3deb3656b9af6851d4514947
 2022-07-26 01:48:16 +08:00
Julia Reynolds
cf3fc8d0b5 Merge "Move zen rule deletion" into tm-qpr-dev am: 7ab7c1d6f8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19377234

Change-Id: I25fdf9997ff4fe2dc97577e709f20df32317e10d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-25 17:33:36 +00:00
Peter Zhang
179c4dd48a Merge "Improve the UI of Press & hold power button settings" into tm-qpr-dev am: 1cc741a745 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19291450

Change-Id: I7f3ea617800c37f49d8534131728875c0cd1d243
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-25 17:33:08 +00:00
Julia Reynolds
7ab7c1d6f8 Merge "Move zen rule deletion" into tm-qpr-dev 2022-07-25 17:24:42 +00:00
Peter Zhang
1cc741a745 Merge "Improve the UI of Press & hold power button settings" into tm-qpr-dev 2022-07-25 17:18:25 +00:00
PETER LIANG
26c3c3a95c Merge "Fix the inconsistent alignment of the main switch preference." into tm-qpr-dev am: aea8f1aeb2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19358210

Change-Id: I38ed641d9b1df23306f2d1e78b705d02592f34b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-25 12:25:25 +00:00
PETER LIANG
aea8f1aeb2 Merge "Fix the inconsistent alignment of the main switch preference." into tm-qpr-dev 2022-07-25 12:05:17 +00:00
lbill
07b149ec51 Fix incorrect SetupChooseLockPattern layout 
Root cause:
- The new added description TextView is too large
- sud_layout_description was add in sud_layout_content
  instead of sud_layout_header.

Solution:
- Set string lockpassword_choose_your_pattern_description
  to GlifLayout as it's description.(Header description)

Bug: 233666752
Fixes 239892091
Test: manual in setup flow, check choose lock pattern layouts
showing expectedly on both phone & tablet
Test: make RunSettingsRoboTests

Change-Id: Iabe503066434f8983dffb88d1c93f2bbf773b860
 2022-07-25 12:01:46 +00:00
Android Build Coastguard Worker
ed6e1508a1 Snap for 8864221 from 037cf476e7 to tm-qpr1-release 
Change-Id: Ie15bd27784bfd27eaa6e3b24286a7e1ca311fa23
 2022-07-23 23:25:04 +00:00
TreeHugger Robot
a851cb82af [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 037cf476e7 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1515f96c6ed25f7b4df24e971225a2f136c3e6e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-23 05:53:21 +00:00
Bill Yi
4b7bac7464 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b99222d2b8 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I331b56a6a9a36555bb6688c04413729bb77a33e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-23 05:52:51 +00:00
TreeHugger Robot
037cf476e7 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2022-07-23 05:32:42 +00:00
Android Build Coastguard Worker
554e579323 Snap for 8862780 from d478bb07d2 to tm-qpr1-release 
Change-Id: Ifcc9a7fa9c923db6254105ba604f2748a120dd72
 2022-07-23 03:25:34 +00:00
TreeHugger Robot
8ea9ed66dd [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 96bc6ca196 -s ours am: c79be68440 -s ours am: 0ce31c8b67 -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: I99d30767e72c2f43e723fd300c5af5c864bce308
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-23 03:20:02 +00:00
Bill Yi
f0ec69b322 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: babd7f1cc6 -s ours am: 9dd5145c74 -s ours am: ff79fd3b9f -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: Ifed35abcd5daad6c8db622908f1bb5fdfdba80c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-23 03:19:42 +00:00
Automerger Merge Worker
f42353579d Merge changes from topic "am-fccad1fd78d74820ac27310bf754500a" into tm-d1-dev-plus-aosp am: 474e99c32a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19392235

Change-Id: I2b35fe496782f272f71207b5bbe64cec3e4ba69a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-23 03:17:35 +00:00
TreeHugger Robot
745bc58b23 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 1ea00326ca -s ours am: 54b94fa642 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I488047868f3ceba59f9e8cdf098856eb0702d02d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-23 03:17:13 +00:00
TreeHugger Robot
e1b6c95a72 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 96bc6ca196 -s ours am: 7da6e7a960 -s ours am: 4915a9b3aa -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: I54115b6db99539cbdeef2bfb7bb6e8def0048538
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-23 03:13:34 +00:00
Bill Yi
f3ee83c034 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: babd7f1cc6 -s ours am: e6613a454e -s ours am: ed43940526 -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: Ic13dab8232d14b73841b181bc752be6766f3f70a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-23 03:13:09 +00:00
TreeHugger Robot
c819cc5401 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 96bc6ca196 -s ours am: c79be68440 -s ours am: 0e6b0ba8cb -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: Ib457298cf25a7886c125118fb87d9425c1f5f9c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-23 03:06:22 +00:00
Bill Yi
4948557b54 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: babd7f1cc6 -s ours am: 9dd5145c74 -s ours am: 6654c69877 -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: I02eb36503083b73c3bc46e0b4957310efeff5607
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-23 03:06:00 +00:00
TreeHugger Robot
1a59c69653 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 1ea00326ca -s ours am: 4fe83b61ff -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id9dc808dbcfdf9d75acf75ed7fd1257174bb437f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-23 03:03:11 +00:00
Bill Yi
a0ad43068a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1e9765bba2 -s ours am: 9d76bd7a1f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1ffc3ac599dc156766f0a0844c8cda078acdb9b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-23 03:02:48 +00:00
Automerger Merge Worker
003f3914c4 Merge "[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2d0fd7f558 am: 011d462ac4 -s ours am: 7a0b1e186d -s ours" into tm-d1-dev-plus-aosp am: b13d27ffe5 -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: I9334c75634f8d0968ec4a43e80586352904ab4c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-23 02:56:41 +00:00
Bill Yi
4b38cfde8c [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2d0fd7f558 am: 011d462ac4 -s ours am: 7a0b1e186d -s ours am: 7c0e477837 -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: I1414d188012d50886c5df43afe3c04712748f7a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-23 02:56:34 +00:00
Automerger Merge Worker
91b0cd2e93 Merge "[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2d0fd7f558 am: 011d462ac4 -s ours am: 002496b1e1 -s ours am: 71eaa44916 -s ours" into tm-qpr-dev-plus-aosp 2022-07-23 02:55:23 +00:00
Bill Yi
d10cea9f3e [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2d0fd7f558 am: 011d462ac4 -s ours am: 002496b1e1 -s ours am: 71eaa44916 -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: Ied27e0dbe0bf24413e2ff4b98fdfc189282b13af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-23 02:55:06 +00:00
Bill Yi
1b4979f090 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2d0fd7f558 am: 011d462ac4 -s ours am: 002496b1e1 -s ours am: f97e8519cf -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: Iaf0b902fdeefdce4a05d536107746ef5e4789afc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-23 02:54:37 +00:00
TreeHugger Robot
0ce31c8b67 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 96bc6ca196 -s ours am: c79be68440 -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: I90f41daf52ab4a7642a52a6e3842899c1992d2cc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-23 02:38:08 +00:00
Bill Yi
ff79fd3b9f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: babd7f1cc6 -s ours am: 9dd5145c74 -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: I3164cb0d0dfed7b688a728b6f349b005e53a832d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-23 02:37:48 +00:00