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

103357 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
01afe2287f Merge "Fix Learn more link not work" into tm-dev am: b2dd7913c0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18181642

Change-Id: Ieb6aa225ddbae799d999bb018e659d7514bf014d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-06 02:41:16 +00:00
TreeHugger Robot
b2dd7913c0 Merge "Fix Learn more link not work" into tm-dev 2022-05-06 02:27:19 +00:00
Milton Wu
2cb52b2353 Update SUW biometric string product 
Fingerprint strings for SUW is not consider product. Update string to
use 3 different products. They are tablet, device, and default.

Bug: 228021544
Test: Check SUW fingerprint string in tabet and phone
Change-Id: I728f52360e0c7e4972190caf47bea75a64f873ec
 2022-05-06 09:59:26 +08:00
David Coffin
b457d2197d Merge "Add PRIVACY_ADVANCED_SETTINGS intent" into tm-dev am: bf2bec34e0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18181704

Change-Id: If61633a776e40d968516ccdf5c5d9273473958fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 21:09:34 +00:00
David Coffin
bf2bec34e0 Merge "Add PRIVACY_ADVANCED_SETTINGS intent" into tm-dev 2022-05-05 20:34:00 +00:00
Yuri Lin
7cbba753dc Change zen mode schedules page rule handling 
The approach of reloading all rules (and recreating all ZenRulePreferences) every time the rule set changed causes the switches on the page to stop working.

This change keeps the ZenRulePreference around as long as the rule itself is around and keeps it updated, while re-adding the preferences to the PreferenceCategory if needed due to rules changing.

Fixes: 229879326
Test: manual, ZenModeAutomaticRulesPreferenceControllerTest
Change-Id: I4eba41e8252cedd87ac866e4b97513970ca2d94a
 2022-05-05 14:24:42 -04:00
TreeHugger Robot
b3130cd857 Merge "Add missing settings strings." into tm-dev am: af5a015198 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17692465

Change-Id: Ib407602d7bdba7e7b60fada3ce53e3418b47efda
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 13:42:38 +00:00
TreeHugger Robot
af5a015198 Merge "Add missing settings strings." into tm-dev 2022-05-05 13:19:07 +00:00
YK Hung
75238622bf Merge "Support special tethering and removed apps UID in the usage list" into tm-dev am: 434009d709 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18158878

Change-Id: I70e5ed6a5d04f20d0d6364cd3522a35ae0407920
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 12:39:40 +00:00
YK Hung
434009d709 Merge "Support special tethering and removed apps UID in the usage list" into tm-dev 2022-05-05 12:18:10 +00:00
SongFerngWang
e8bb9c9be3 [BT Broadcast Sink] Add the function for leave and scan QRcode buttons 
Add function for 'leave broadcast' button
Add function for 'Scan QR code' button
Set 'level broadcast' button gray out when device does not have broadcast source

Bug: 228259065
Test: build pass and manually test
Change-Id: Iab4a45e73f49c3f755b95ea3fa38872daac7e745
 2022-05-05 18:16:44 +08:00
Jonathan Scott
b7f4f56cad Add missing settings strings. 
Also re-enable and fix tests.

Test: manual
Fixes: 226183482
Fixes: 218799125
Fixes: 219375624

Change-Id: I9605f1f4e2e834baf63e015e96639567c5481b5f
 2022-05-05 09:12:59 +00:00
SongFerng Wang
411d3acb66 Merge "[LE broadcast sink] Add the source list in boradcast sink UI." into tm-dev am: afe6d302e4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18131624

Change-Id: Ifeb0c8ee95410f9555650078a396ca0728fb9a4c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 09:09:22 +00:00
Tsung-Mao Fang
c4613ab0d2 Merge "Show slice without toggle when there's no wifi permission" into tm-dev am: c5153183d8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18030884

Change-Id: Ib1f9f1895b7555b0a1fdcb42679a12707bbc167b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 09:08:40 +00:00
Tom Hsu
fd09e5c0e8 [Panlingual] Fix conflict am: 70fe2d1fdd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18181644

Change-Id: I51b5f3f60061e41217b277e03686f43fbf85e885
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 09:08:02 +00:00
SongFerng Wang
afe6d302e4 Merge "[LE broadcast sink] Add the source list in boradcast sink UI." into tm-dev 2022-05-05 08:50:20 +00:00
Tsung-Mao Fang
c5153183d8 Merge "Show slice without toggle when there's no wifi permission" into tm-dev 2022-05-05 08:43:00 +00:00
Chaohui Wang
7e47784da1 Fix Voice Access scroll down in the Add network 
Use single NestedScrollView instead of ScrollView + NestedScrollView.

This also improve the scroll experience when the accessibility service
is off.

Bug: 216573764
Test: manual test when Voice Access on
Change-Id: I9395c1749c9f49086a979057f7ea2f0cda857993
 2022-05-05 16:31:08 +08:00
ykhung
be10538a09 Support special tethering and removed apps UID in the usage list 
There is a special UID for network data tethering usage, we will handle
it in a special case to avoid the current rule considering it as an
invalid UID case without showing in the usage list. We will disable the
click behavior to protect the optimization mode page first.

Bug: 227395125
Test: make RunSettingsRoboTests -j56 ROBOTEST_FILTER="com.android.settings.fuelgauge"
Change-Id: I8d96473d382ebc3253748cce8345d6f2261a233d
 2022-05-05 16:17:41 +08:00
Milton Wu
130a64779e Fix Learn more link not work 
Old span text shall not be used in preference footer. Change
implementation to use footer learnMore APIs

Bug: 228101275
Test: Make sure "Learn more" can be clicked on Fingerprint setting page
Change-Id: Ied2326b1a75fc02e7a3fe2321735f2f9f5ac066f
 2022-05-05 15:15:48 +08:00
Tom Hsu
70fe2d1fdd [Panlingual] Fix conflict 
- sync code from master to tm-dev

Change-Id: I75b66cd2fa161a6e7c8a9d272b67516ac55e7025
 2022-05-05 06:18:22 +00:00
SongFerngWang
1709c80eff [LE broadcast sink] Add the source list in boradcast sink UI. 
Add the source list in boradcast sink UI.
Add the password dialog.

hsv link1: https://hsv.googleplex.com/6256032201310208
hsv link2: https://hsv.googleplex.com/5934966820044800
hsv link3: https://hsv.googleplex.com/6238095344140288
Bug: 228258236
Test: manual test

Change-Id: I698c2f7aba9baa9f143a98629b8796eda57fb379
 2022-05-05 06:00:45 +00:00
Daniel Huang
1737ce56fc Merge "[Panlingual] Unit test for onLocaleSelected" into tm-dev am: 74b1027fe2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18158867

Change-Id: Ifb20f828c374e2a003d9d0b0f6af98ab50810afb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 05:08:22 +00:00
Tsung-Mao Fang
cb641fa6eb Show slice without toggle when there's no wifi permission 
When the presenter app doesn't have certain permissions,
it's safer to go with a generic fallback slice
which just redirects user to the actual settings page.

Test: test on the presenter app. robo test
Fix: 178014725
Change-Id: I6f5358af2e00cb2fedba0b3f1474a026135986c6
 2022-05-05 12:05:38 +08:00
Daniel Huang
74b1027fe2 Merge "[Panlingual] Unit test for onLocaleSelected" into tm-dev 2022-05-05 03:46:47 +00:00
Jay Thomas Sullivan
5efeddcdbe Add PRIVACY_ADVANCED_SETTINGS intent 
Redirect intent actions for PRIVACY_ADVANCED_SETTINGS to the privacy
screen.

Rationale:

1. The existing PRIVACY_SETTINGS intent will later be redirected to
   safety center, but

2. We will still need a way to intent to this screen, because this
   screen will be re-used and renamed to "More privacy settings", also
   known as "Advanced privacy settings"

Test: manual
Change-Id: I83cb3935e16887683f3907d9d71ccd7c53e24202
 2022-05-04 22:14:12 +00:00
Xin Li
9895e8e63b [automerger skipped] Merge "Merge SP2A.220505.002" am: 8adb561455 -s ours am: 2a6d8885bc -s ours 
am skip reason: Merged-In I1def7b37184d6d81f29a5e6e4793b92012dacd9b with SHA-1 bc4fd99ddb is already in history

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

Change-Id: I9ee9deabfbe58ece7df81f88733417d5b733898b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 21:20:20 +00:00
Xin Li
6c49c6dbcd [automerger skipped] Merge SP2A.220505.002 am: c3a9ea7443 -s ours am: 90645fb925 -s ours 
am skip reason: Merged-In I1def7b37184d6d81f29a5e6e4793b92012dacd9b with SHA-1 bc4fd99ddb is already in history

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

Change-Id: Iec2ab168e50ca7aecbe67626131c46b7d576a439
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 21:20:09 +00:00
Xin Li
2a6d8885bc [automerger skipped] Merge "Merge SP2A.220505.002" am: 8adb561455 -s ours 
am skip reason: Merged-In I1def7b37184d6d81f29a5e6e4793b92012dacd9b with SHA-1 bc4fd99ddb is already in history

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

Change-Id: I1328a5b1eec08a2d30940f610911af8978153c5f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 20:57:11 +00:00
Xin Li
90645fb925 [automerger skipped] Merge SP2A.220505.002 am: c3a9ea7443 -s ours 
am skip reason: Merged-In I1def7b37184d6d81f29a5e6e4793b92012dacd9b with SHA-1 bc4fd99ddb is already in history

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

Change-Id: Ib4481f34e89f88b1a74baebdc5499460fe10b2e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 20:56:53 +00:00
Xin Li
8adb561455 Merge "Merge SP2A.220505.002" 2022-05-04 20:30:21 +00:00
Julia Reynolds
4138b6f68a Remove notification permission feature flag 
Tes: Settings notification robotests
Bug: 231344755
Change-Id: I3e35eede94ea88bee4c2e7fc03ce998ed68b4f81
 2022-05-04 16:24:23 -04:00
Raphael Kim
ff34195604 Extract app label from component name in notification access confirmation UI 
Bug: 228178437
Test: Manually tested on POC
Change-Id: I8613d9b87a53d4641c0689bca9c961c66a2e9415
 2022-05-04 19:41:13 +00:00
Bill Yi
8b81a28364 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 8c0d18ada4 -s ours am: 7034e737b6 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic830e17841ab22cc7fa0e049c7eb84d5cf2a4b94
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 17:55:10 +00:00
Bill Yi
467d913a6a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 9349330a1f -s ours am: 6b59002229 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2565abcebc483a44237c833f9a36be3d3005b4d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 17:53:48 +00:00
Bill Yi
71fc7ec758 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d0a12e0106 -s ours am: da1aaa3069 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I902543a8555957418b8fd227d1f95693c0fc643a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 17:53:33 +00:00
Bill Yi
7034e737b6 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 8c0d18ada4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iad59e7632d6735b20e2400ae8fc33aee9dff6fc0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 17:43:53 +00:00
Bill Yi
6b59002229 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 9349330a1f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2e1f7b6a32e9e4261c6c512caa74d7a4f3aa69f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 17:40:48 +00:00
Bill Yi
b8f6039a2a Merge changes from topic "tc_change_21" into tm-dev am: 261936eccf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18108381

Change-Id: I01f7dce50e08466c636f0589250cedc812be15d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 17:40:29 +00:00
Bill Yi
d7503db15f [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 192bd4e1f0 am: c50bf31396 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie6b8bf897e3f5ad1371ce8fd0881adb6fc193276
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 17:40:22 +00:00
Bill Yi
da1aaa3069 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d0a12e0106 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic359719019638ea11ed7571906b3e04af3f5890f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 17:40:21 +00:00
Bill Yi
8c0d18ada4 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod 2022-05-04 17:07:37 +00:00
Bill Yi
261936eccf Merge changes from topic "tc_change_21" into tm-dev 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 192bd4e1f0
  Import translations. DO NOT MERGE ANYWHERE
 2022-05-04 17:07:37 +00:00
Bill Yi
9349330a1f Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod 2022-05-04 17:04:03 +00:00
TreeHugger Robot
4a79ecce7f Merge "Hide Wi-Fi toggle in the Wi-Fi slice" into tm-dev am: 3fb9c1a24b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18157802

Change-Id: Ic6dcbe5d513d4fa3a9ca3fb7e03add4eb978d145
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 16:29:50 +00:00
TreeHugger Robot
d61d5316a3 Merge "Remove Wi-Fi toggle in settings search" into tm-dev am: 2e6d03d0f4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18149762

Change-Id: I39353aff59e39b3fc6219f52a836e03920cb99cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 16:28:55 +00:00
TreeHugger Robot
3fb9c1a24b Merge "Hide Wi-Fi toggle in the Wi-Fi slice" into tm-dev 2022-05-04 16:01:35 +00:00
TreeHugger Robot
2e6d03d0f4 Merge "Remove Wi-Fi toggle in settings search" into tm-dev 2022-05-04 15:51:34 +00:00
Ayush Sharma
322d401aa8 Move set work lock message from header to footer 
Also update the string.

Bug: 206083998
Bug: 230625178
Test: NA
Change-Id: I3e442f6a43e01f3633255551aa42902bf24e4aa8
 2022-05-04 14:29:43 +00:00
Yi-Ling Chuang
d9453bf8c6 Show previous query upon configuration change 
Save the query string before configuration changed and set the previous
query string upon the re-create.

Fixes: 204158119
Test: robotest
Change-Id: I48b2a4b272873665a653d2ebc4c02bb99d4b0d0d
 2022-05-04 22:22:26 +08:00