Randy Pfohl
acf11a9025
Merge "Updating system navigation title"
2023-02-06 20:17:51 +00:00
Daniel Norman
e3b329c1ca
Merge "Updates Accessibilty Settings resources for sw600dp."
2023-02-06 20:05:48 +00:00
Diya Bera
62a25bfb58
Merge "Remove background tint during SUW" into tm-qpr-dev am: 135041eab5
am: 8f2a74479a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21265617
Change-Id: I59aef62d50993776a25a9dcfab15d63f880b3298
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-06 18:58:18 +00:00
Diya Bera
8f2a74479a
Merge "Remove background tint during SUW" into tm-qpr-dev am: 135041eab5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21265617
Change-Id: I673e399d2e40d9dec1b216901902645be022dd45
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-06 18:28:50 +00:00
Diya Bera
135041eab5
Merge "Remove background tint during SUW" into tm-qpr-dev
2023-02-06 17:57:55 +00:00
Lucas Silva
285ab6b11f
Add content description to screensaver customization button am: ca65b6e5ba
am: 2c7a55ed05
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21268649
Change-Id: I12f0b44070c9b28bf99d1fd442bb6f831c414db1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-06 16:15:03 +00:00
Lucas Silva
2c7a55ed05
Add content description to screensaver customization button am: ca65b6e5ba
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21268649
Change-Id: Ia8a22edd2cdea63042d535d6ad7ebe3ae27d125d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-06 15:49:38 +00:00
TreeHugger Robot
6f76d5dc91
Merge "Fix b/265746746: Announce "Battery usage for [slot_timestamp]" instead of changing focus when Talk Back on."
2023-02-06 10:49:46 +00:00
Vincent Wang
8a913f7980
Merge "Refactor FingerprintEnrollFinish to fragment"
2023-02-06 10:20:45 +00:00
Zaiyue Xue
e04ffdea58
Fix b/265746746: Announce "Battery usage for [slot_timestamp]" instead of changing focus when Talk Back on.
...
https://drive.google.com/file/d/173RPKsnIE7ZhBAJLrivqkbiWg9Ay41bC/view?usp=sharing&resourcekey=0-jHJ7vZ9BEhzxdWncqCQVQg
Bug: 265746746
Fix: 265746746
Test: manual
Change-Id: Iad92eff50d73853793daa9d6d3551768678c2eb2
2023-02-06 17:38:29 +08:00
ykhung
a43f9ead39
Add incompatible charging battery tip detector
...
Fix: 263193978
Bug: 246960554
Test: make -j64 RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.fuelgauge.batterytip"
Change-Id: Ifbfd28e81b03aa8e1bb4cc70199b3262e21931cc
2023-02-06 08:48:49 +00:00
firewall
fa9ddb5f63
Refactor FingerprintEnrollFinish to fragment
...
Bug: b/260959142
Test: Build pass & Biometric enroll progress works well
Change-Id: Iff99d01e799344682a3f2da2d3c8fd3dfaf4b6e9
2023-02-06 08:11:55 +00:00
Vincent Wang
6686dcc1fc
Merge "Refactor FingerprintEnrollEnrolling to fragment"
2023-02-06 08:07:57 +00:00
YK Hung
20326d6907
Merge "Add incompatible charging battery tip UI and card skeleton"
2023-02-06 05:57:43 +00:00
ykhung
c6d34d6c58
Add incompatible charging battery tip UI and card skeleton
...
Bug: 263193978
Bug: 246960554
Test: make -j64 RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.fuelgauge.batterytip"
Change-Id: I8180022bd39f66c88463a2552c6050669bb0357c
2023-02-06 03:25:23 +00:00
TreeHugger Robot
ff76e0488f
Merge "Clean up useless battery tips and detectors"
2023-02-05 11:38:02 +00:00
ykhung
2593fcd1bf
Clean up useless battery tips and detectors
...
Bug: 263193978
Test: make -j64 RunSettingsRoboTests
ROBOTEST_FILTER="com.android.settings.fuelgauge.batterytip"
Change-Id: Idfe03eee5acee33126f1805ef45ccc4a9fc7e7a8
2023-02-05 18:34:00 +08:00
Quang Luong
fd85412b1e
Merge "Fix connected wifi entry not clearing when Wifi is disabled"
2023-02-04 22:03:18 +00:00
Amy Hsu
2209c02dfe
Merge "[RRS] show resolution option on Settings page."
2023-02-04 15:10:13 +00:00
Amy Hsu
be19785b51
[RRS] show resolution option on Settings page.
...
Due to the special width/ height of the device, we have to modify the
available condition otherwise the resolution option cannot be shown on Settings.
Bug: 258346214
Test: Lunch Settings and check the Display page
atest SettingsUnitTests:ScreenResolutionControllerTest
atest SettingsUnitTests:ScreenResolutionFragmentTest
Change-Id: Ie22df7dff6e31a7697c128eabe69dfe4bba29746
2023-02-04 06:48:03 +00:00
Jason Chang
b0fe94818e
Merge "Fix Face and Fingerprint setting page's title "Use face or fingerprint to" is missing"
2023-02-04 05:29:33 +00:00
Quang Luong
f4b54b3d49
Fix connected wifi entry not clearing when Wifi is disabled
...
Connected wifi entry is represented by either
mConnectedWifiEntryPreferenceCategory or
mFirstWifiEntryPreferenceCategory, but we only clear
mConnectedWifiEntryPreferenceCategory when Wifi is disabled. Make sure
to also clear mFirstWifiEntryPreferenceCategory.
Bug: 267815756
Test: manually verify connected wifi is hidden when wifi is disabled
Change-Id: I4c30a658200f1ab90af5ce41a6531f5784a8de5d
2023-02-03 23:54:25 +00:00
Diya Bera
87567ceb5e
Remove background tint during SUW
...
Test: Manual - navigate to the activity mentioned in the bug and observe
the background
Bug: 264993674
Change-Id: I21c8143099e4c76ed5744cff12f31f578320a871
2023-02-03 23:29:06 +00:00
Randy Pfohl
bcb25c0ada
Updating system navigation title
...
Test: built locally and verified this showed up correctly.
Bug: 248342586
Change-Id: Ief48a422b7200d51e2a392a46519e4f2dc30037e
2023-02-03 22:55:21 +00:00
Florian Mayer
d540e02be8
Merge "Use bootloader_override from boot namespace"
2023-02-03 22:26:50 +00:00
Lucas Silva
ca65b6e5ba
Add content description to screensaver customization button
...
This will let users know which screensaver they are customizing.
Fixes: 267582102
Test: flashed device and enabled talkback, opened screensaver settings,
and verified talkback correctly says the name of the screensaver
Change-Id: I9d0d9422f06b7a78efca0e6953b73fe612f79e2a
2023-02-03 15:27:26 -05:00
Patrick Rohr
73d7224561
Merge "Enable ethernet data usage when FEATURE_USB_HOST is present" am: b0ddc1833d
am: ac83ccd34f
am: 05e4a2f56b
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2420579
Change-Id: I7d36d2dcd3a6d0a38c58c8e25cb34c89c45ab1dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-03 20:07:29 +00:00
Patrick Rohr
05e4a2f56b
Merge "Enable ethernet data usage when FEATURE_USB_HOST is present" am: b0ddc1833d
am: ac83ccd34f
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2420579
Change-Id: I1e9b971db3c369e21af8b5659deb170a5fbc84da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-03 19:09:07 +00:00
Patrick Rohr
ac83ccd34f
Merge "Enable ethernet data usage when FEATURE_USB_HOST is present" am: b0ddc1833d
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2420579
Change-Id: If7bf40d49a67c14a62e4db7994995dac9b86fb3b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-03 18:15:21 +00:00
Anvesh Renikindi
54797cb649
Merge changes from topic "update-androidx-ae"
...
* changes:
Fix build for jetpack update
Update ActivityEmbedding usage.
2023-02-03 17:56:19 +00:00
Patrick Rohr
b0ddc1833d
Merge "Enable ethernet data usage when FEATURE_USB_HOST is present"
2023-02-03 17:28:34 +00:00
Jack Yu
b613fad0dc
[automerger skipped] Only primary user is allowed to control secure nfc am: 0e57ff90cd
am: c098bdcad0
am: 3ccadd2c97
am: 9d643d3042
am: 4745a591c5
am: 34ce0e2c3a
am: 1befdab699
am: c4a0475681
am: db0ac5c517
-s ours
...
am skip reason: Merged-In I945490ef1e62af479a732c9a260ed94bdd8bc313 with SHA-1 0e57ff90cd
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21154458
Change-Id: Ia8dc8499badfebc2076f5668853d515b91be1cd7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-03 16:29:28 +00:00
Jack Yu
db0ac5c517
Only primary user is allowed to control secure nfc am: 0e57ff90cd
am: c098bdcad0
am: 3ccadd2c97
am: 9d643d3042
am: 4745a591c5
am: 34ce0e2c3a
am: 1befdab699
am: c4a0475681
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21154458
Change-Id: Icf914be764cd5400d004004fa9413ec4d0bb4597
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-03 15:34:49 +00:00
Jack Yu
c4a0475681
Only primary user is allowed to control secure nfc am: 0e57ff90cd
am: c098bdcad0
am: 3ccadd2c97
am: 9d643d3042
am: 4745a591c5
am: 34ce0e2c3a
am: 1befdab699
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21154458
Change-Id: Iafe87e53b9337f84dcd44494e509aa8398b0298c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-03 14:42:19 +00:00
Jack Yu
2479c8815d
[automerger skipped] Only primary user is allowed to control secure nfc am: 0e57ff90cd
am: c098bdcad0
am: 3ccadd2c97
am: 9d643d3042
am: 4745a591c5
am: 34ce0e2c3a
am: 8716ebc4d4
-s ours
...
am skip reason: Merged-In I945490ef1e62af479a732c9a260ed94bdd8bc313 with SHA-1 f8b664e31f
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21154458
Change-Id: Ibb779034ce7f49a26a84989e6e59600bf35ac905
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-03 14:16:34 +00:00
Jack Yu
1befdab699
Only primary user is allowed to control secure nfc am: 0e57ff90cd
am: c098bdcad0
am: 3ccadd2c97
am: 9d643d3042
am: 4745a591c5
am: 34ce0e2c3a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21154458
Change-Id: I0df6b9e868058e014644742f2cfa4841d83ad838
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-03 13:49:58 +00:00
Jack Yu
8716ebc4d4
Only primary user is allowed to control secure nfc am: 0e57ff90cd
am: c098bdcad0
am: 3ccadd2c97
am: 9d643d3042
am: 4745a591c5
am: 34ce0e2c3a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21154458
Change-Id: I68d9f6e174a3d9100b2ea3094d527da4c92cc760
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-03 13:48:53 +00:00
Jack Yu
34ce0e2c3a
Only primary user is allowed to control secure nfc am: 0e57ff90cd
am: c098bdcad0
am: 3ccadd2c97
am: 9d643d3042
am: 4745a591c5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21154458
Change-Id: Ia0803da9acf81da41d5ffd289b705eb3e7128547
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-03 13:16:57 +00:00
Oli Thompson
08c0e13ece
Merge "Add emergency call buttons to the work challenge screens in the case of managed subscription for work telephony"
2023-02-03 13:00:58 +00:00
Jack Yu
4745a591c5
Only primary user is allowed to control secure nfc am: 0e57ff90cd
am: c098bdcad0
am: 3ccadd2c97
am: 9d643d3042
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21154458
Change-Id: I3099c3e158aaf0a99a8fa3d894b0c5dc1713e2b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-03 12:22:41 +00:00
Vania Januar
ecd670bac4
Update ic_edit icon with correct path.
...
Test: just icon change
Bug: 262375818
Change-Id: Ifcde294d63e740d64ab3a31c18eea09bea9e46de
2023-02-03 11:28:16 +00:00
Jack Yu
9d643d3042
Only primary user is allowed to control secure nfc am: 0e57ff90cd
am: c098bdcad0
am: 3ccadd2c97
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21154458
Change-Id: I763baefc5b94776c0583273fe9ab47ae99e6a57c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-03 11:27:23 +00:00
firewall
a4498e36ee
Refactor FingerprintEnrollEnrolling to fragment
...
Bug: b/260957933
Test: NA
Change-Id: I8f704297a2a53ddf39734e0fefe258a123255341
2023-02-03 11:27:16 +00:00
Vania Januar
5df2107fde
Merge "Replace circle icon on stylus settings to ic_edit."
2023-02-03 10:19:28 +00:00
Neil Fuller
4550e939bb
Merge "(Re)Introduce "enabled by admin" UI state"
2023-02-03 10:14:03 +00:00
Jack Yu
3ccadd2c97
Only primary user is allowed to control secure nfc am: 0e57ff90cd
am: c098bdcad0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21154458
Change-Id: I5690485d1cacd39b5b74316f561691bc68d48787
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-03 10:10:20 +00:00
Jack Yu
c098bdcad0
Only primary user is allowed to control secure nfc am: 0e57ff90cd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21154458
Change-Id: I35c94f779d47e27c170ec3b4becafc563f077a68
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-03 09:21:04 +00:00
Zaiyue Xue
2b66ff613d
Remove the comma between hour and minutes in app list.
...
Bug: 267184192
Fix: 267184192
Test: presubmit
Change-Id: Ic37046218ffe501600d5d247a10d3f091acf131b
2023-02-03 16:06:14 +08:00
Patrick Rohr
d2d340146e
Enable ethernet data usage when FEATURE_USB_HOST is present
...
Ethernet is enabled when either FEATURE_ETHERNET *or* FEATURE_USB_HOST
is present. See ConnectivityService#deviceSupportsEthernet.
ConnectivityService#deviceSupportsEthernet should really be moved to
some commonly accessible location.
Test: TH
Change-Id: I497d99169248db7e5948b3a19134ab42e66d5b9b
2023-02-03 03:32:02 +00:00
Jiaming Liu
e65283de6a
Fix build for jetpack update
...
Fix build for jetpack update
Bug: 265818545
Test: build
Change-Id: If48e7338ee560d995cb8bff7b5348ab36c457836
2023-02-03 02:37:42 +00:00