YK Hung
8c8b569e4e
Merge "Use system package name for SYSTEM_UID in the BatteryEntry" into tm-dev am: 9d0da1b613
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18214694
Change-Id: If5f56ddec0325992bb5f1b4c66e1ff8d4b1da026
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-09 02:14:37 +00:00
YK Hung
9d0da1b613
Merge "Use system package name for SYSTEM_UID in the BatteryEntry" into tm-dev
2022-05-09 01:52:13 +00:00
Arc Wang
f6093ba54c
Merge "Verify ringtone from ringtone picker is audio" into tm-dev am: 94a2138316
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18197506
Change-Id: Ib2d93752f81a7ec1be68d173922771cb774425d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-09 01:21:27 +00:00
Arc Wang
94a2138316
Merge "Verify ringtone from ringtone picker is audio" into tm-dev
2022-05-09 01:06:46 +00:00
Bonian Chen
b04c73a448
Merge "[Settings] Remove the subscription name verification." into tm-dev am: 361fea8f6b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18214682
Change-Id: Ie071eea1abb1c3d0fdc8ebafbbfd187197933d39
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-08 23:18:59 +00:00
Bonian Chen
361fea8f6b
Merge "[Settings] Remove the subscription name verification." into tm-dev
2022-05-08 23:01:44 +00:00
ykhung
c880114dba
Use system package name for SYSTEM_UID in the BatteryEntry
...
Force use the system package for the SYSTEM_UID, since the SYSTEM_UID is
used for multiple packages. The getPackageWithHighestDrain() method may
get different packages to represent it, since it will use the highest
battery drain to represent the SYSTEM_UID if there are multiple packages
use the same UID value to make users confuse about the usage data.
_
$ adb shell pm list packages --uid 1000
package:android uid:1000
package:com.android.dynsystem uid:1000
package:com.android.frameworks.core.batterystatsviewer uid:1000
package:com.android.inputdevices uid:1000
package:com.android.keychain uid:1000
package:com.android.localtransport uid:1000
package:com.android.location.fused uid:1000
package:com.android.providers.settings uid:1000
package:com.android.server.telecom uid:1000
package:com.android.settings uid:1000
package:com.android.wallpaperbackup uid:1000
Bug: 202682426
Test: make RunSettingsRoboTests -j56 ROBOTEST_FILTER="com.android.settings.fuelgauge"
Change-Id: I447bfa1b32037763a2194c0639abcc334c7d8b78
2022-05-08 23:42:38 +08:00
Bonian Chen
649ad42457
[Settings] Remove the subscription name verification.
...
Subscription name may override by other design (for instance, unique
name display).
A verification of subscription name within this test case could be
inappropirate.
Bug: 231660194
Test: unit test
Change-Id: I4182d1de3c0d210bdc1ac699a4f8f862dcf55266
2022-05-08 19:52:14 +08:00
Milton Wu
3b284a0bbe
Merge "Update SUW biometric string product" into tm-dev am: 887d590e85
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18186094
Change-Id: Ib9eea2521aeb0ee3c83641b8294eba71dce0e2a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-07 01:57:22 +00:00
Milton Wu
887d590e85
Merge "Update SUW biometric string product" into tm-dev
2022-05-07 01:27:27 +00:00
SongFerng Wang
5d06bbc5b6
Merge "[BT Broadcast Sink] Add the function for leave and scan QRcode buttons" into tm-dev am: 286682ec8a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18181646
Change-Id: I9c2bd1431fddd914f2abf3f291d51d105e688f37
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-06 11:09:54 +00:00
Ayush Sharma
4b4f03efce
Merge "Move set work lock message from header to footer" into tm-dev am: 6e4579a816
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18140207
Change-Id: I9d8b5b93e39a55f95e45b4d0a6f03c4f1b7bd3bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-06 11:09:19 +00:00
SongFerng Wang
286682ec8a
Merge "[BT Broadcast Sink] Add the function for leave and scan QRcode buttons" into tm-dev
2022-05-06 11:08:21 +00:00
Ayush Sharma
6e4579a816
Merge "Move set work lock message from header to footer" into tm-dev
2022-05-06 10:42:10 +00:00
Arc Wang
c1eea03879
Merge "Revert "Prevent side channel package installation enumeration"" into tm-dev am: 64b42270ab
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18186098
Change-Id: I7d087c3c31218439d76a9bae1b54a0b63407f439
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-06 09:48:31 +00:00
Arc Wang
e4c22580c9
Verify ringtone from ringtone picker is audio
...
To improve privacy.
Bug: 221041256
Test: atest com.android.settings.DefaultRingtonePreferenceTest
Change-Id: I0a9ca163f5ae91b67c9f957fde4c6db326b8718d
2022-05-06 17:42:30 +08:00
Arc Wang
64b42270ab
Merge "Revert "Prevent side channel package installation enumeration"" into tm-dev
2022-05-06 09:24:42 +00:00
Arc Wang
358dd2b494
Revert "Prevent side channel package installation enumeration"
...
This reverts commit 263592e3dd .
Reason for revert: <To fix test breaks b/231461076 & 231164585>
Bug: b/231461076
Bug: b/231164585
Change-Id: I29211e5de9d7edef8c61125b8be047b6247c8773
2022-05-06 04:07:50 +00:00
Yi-Ling Chuang
9a55ef5d47
Merge "Show previous query upon configuration change" into tm-dev am: 9a14f087cd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18158875
Change-Id: I739722df090b9b5799944aac03ca31bb8d14a58b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-06 03:33:01 +00:00
Yi-Ling Chuang
9a14f087cd
Merge "Show previous query upon configuration change" into tm-dev
2022-05-06 03:17:22 +00:00
TreeHugger Robot
8397becc7a
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: Ic4db3f53a3b5ad9bca6ea933838974f3790e3e84
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-06 02:41:39 +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
7db0062f6b
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: Ib0e42665fe4daa02afcf249639f46ff2b8ec0879
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-05 21:10:53 +00:00
David Coffin
bf2bec34e0
Merge "Add PRIVACY_ADVANCED_SETTINGS intent" into tm-dev
2022-05-05 20:34:00 +00:00
TreeHugger Robot
3e01dd0296
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: Id1974b8956c55a506dd0e3d8da6b65fe861de96d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-05 13:43:45 +00:00
TreeHugger Robot
af5a015198
Merge "Add missing settings strings." into tm-dev
2022-05-05 13:19:07 +00:00
YK Hung
272c5b99cb
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: I130df3069562499d410f354ce643b6972b82de70
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-05 12:40:25 +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
8c7cda2140
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: I52b9d8caaa3791005a326f172cf420c152b7fced
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-05 09:09:21 +00:00
Tsung-Mao Fang
c1fe17de0d
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: I5aa6e5fd95e3b5084f36427ec05bf4224dc28c5c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-05 09:08:57 +00:00
Tom Hsu
370840ff0d
[Panlingual] Fix conflict am: 70fe2d1fdd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18181644
Change-Id: Ic12ae1bc5e26bb8ef10351eb190224eea7cde869
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-05 09:08:23 +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
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
90292ac568
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: Ic87b8e0584bae55115e5bc791ceccc3c2c81548e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-05 05:08:32 +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
Bill Yi
3081f3b059
[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: Idfc51072a9851a653a6a66c02c146e063949d9f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-04 17:56:02 +00:00
Bill Yi
c7ab71848a
[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: I5f0283c765d3d76c3e62d0e10d31aed51e99f467
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-04 17:54:17 +00:00
Bill Yi
25591b4896
[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: I8ffb07e2f1bb504339dfad7687a08f13c7ad1bb2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-04 17:54:01 +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
33df621453
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: I3089bdfd26dfaced84cdf0d9c33d4af5f9c5b36e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-04 17:40:37 +00:00