Bill Yi
9cc6bc637f
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6a44c6afa3
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19997562
Change-Id: If23cbcb75bb7c7101a7a40943082b78c90d0ad99
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-21 21:33:57 +00:00
TreeHugger Robot
a823e92625
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 85702ae62d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19998247
Change-Id: Ic0468d609842281b98f23cd8db0f1f0e9761b165
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-21 21:33:30 +00:00
Bill Yi
bf1d22276a
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 51fbf2cd00
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19998247
Change-Id: I0648190f397d4ba1e9a1f33d9fc8c6b1d5adeb74
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-21 21:33:23 +00:00
TreeHugger Robot
e3b73b4216
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: f33a95d6f8
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19997563
Change-Id: I53be2e833a209ba5eb2885b9380d418c09a32fee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-21 21:33:13 +00:00
TreeHugger Robot
ac92abd818
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 85702ae62d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19998247
Change-Id: I37b11ce456cd9165250295ac7052be3edc13b868
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-21 21:33:08 +00:00
Bill Yi
329b7e6713
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2ccd859add
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19997563
Change-Id: I194faae9929afb413f0791be155bf7b5d02dbc49
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-21 21:33:06 +00:00
Bill Yi
ac8e5a5efd
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 51fbf2cd00
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19998247
Change-Id: If53f0cbd33af90bac023c46636cc1e705e9a33bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-21 21:33:00 +00:00
TreeHugger Robot
e0e3ca6646
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: f33a95d6f8
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19997563
Change-Id: I200fba460875d49b6864e06de995d910e0315671
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-21 21:32:51 +00:00
Bill Yi
d86bb6ee9f
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2ccd859add
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19997563
Change-Id: Ie276d18775fac66211a1a7f2f7445324aa3fb923
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-21 21:32:41 +00:00
TreeHugger Robot
89fec1854b
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 7c21f2eaa6
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19998244
Change-Id: Ifade04be3c936132abd283a1d3e6401cd6acdefa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-21 21:32:14 +00:00
Bill Yi
514c6d557c
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5c3d8f340b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19998244
Change-Id: I65ea8bbad09d82b263374757fd1fdb994dd59619
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-21 21:31:57 +00:00
Bill Yi
9d95e8ecc0
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6a44c6afa3
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19997562
Change-Id: I99e72c81280070621509fc66ca1246aa0c345027
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-21 21:31:45 +00:00
TreeHugger Robot
323d7fa302
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 7c21f2eaa6
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19998244
Change-Id: Ia7c89c65eb9c4a92614e9c8d071c9ca0dbe5a988
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-21 21:31:00 +00:00
Bill Yi
5d5b545e3d
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5c3d8f340b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19998244
Change-Id: I930d2dca18728294d91ce946055de46c228c1412
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-21 21:30:46 +00:00
Bill Yi
f15ab25c5b
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6a44c6afa3
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19997562
Change-Id: Ieef58eb9ebb601a187194d713d60d4097e0a3948
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-21 21:30:22 +00:00
Grace Cheng
cd17b27cdf
Merge "Fix alignment of finger animation with progress bar"
2022-09-21 20:32:06 +00:00
Gil Cukierman
4429054bb1
Use AAPT2 For SettingsUnitTests
...
Forces tradefed to use aapt2 for SettingsUnitTests to get around
the issue of Settings.apk not being parseable by aapt.
Bug: 247779071
Test: atest SettingsUnitTests
Change-Id: I8af260f8d2c438512d3e61f0028accf7b40c8a00
2022-09-21 17:48:20 +00:00
Quang Luong
1b233b37c3
Merge "Do not request P2P if user declined interface conflict dialog"
2022-09-21 16:24:37 +00:00
jasonwshsu
35e20d5ace
Fix not on the top when entering device detail page
...
Root Cause: Added SpacePreference in xml let the page renders order
incorrectly.
Solution: That SpacePreference should only be visible when the device is
hearing aid.
Bug: 245681095
Test: make RunSettingsRoboTests ROBOTEST_FILTER=BluetoothDetailsPairOtherControllerTest
Merged-In: Ic0be940c8466b5e1e301255868c29d06bd4428bd
Merged-In: I442445a861898258a73f37ad8f85bcee387fbf58
Change-Id: Icca48d9c2643507638b2b581d052530521cce5df
2022-09-21 23:54:15 +08:00
Jason Hsu
a1cb4fd446
Merge "Fix not on the top when entering device detail page"
2022-09-21 14:50:32 +00:00
Bill Yi
9b31b981ef
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod
2022-09-21 14:22:42 +00:00
Daniel Sandler
e43bf3cd9d
Merge "Launch the platform easter egg in a new task." into tm-qpr-dev
2022-09-21 14:11:57 +00:00
Nikhil Kumar
0661a7640f
Enable Name and Avatar change without turning on multi-user
...
Primary user will be displayed in user list even when the
multi-user settings is disabled.
This will allow users to change the name and avatar of
primary user without enabling the multi-user feature.
Test: croot && make RunSettingsRoboTests -j40
ROBOTEST_FILTER="com.android.settings.users.UserSettingsTest"
Bug: 246732754
Change-Id: I4eb5aaf97630135960410bea7cdddc52b5848a1e
2022-09-21 14:07:42 +01:00
jasonwshsu
cfec092373
Fix not on the top when entering device detail page
...
Root Cause: Added SpacePreference in xml let the page renders order
incorrectly.
Solution: That SpacePreference should only be visible when the device is
hearing aid.
Bug: 245681095
Test: make RunSettingsRoboTests ROBOTEST_FILTER=BluetoothDetailsPairOtherControllerTest
Change-Id: Ic0be940c8466b5e1e301255868c29d06bd4428bd
2022-09-21 16:00:12 +08:00
TreeHugger Robot
581fd171b5
Merge "Avoid fade animation when users switch index in hour chart." into tm-qpr-dev
2022-09-21 05:50:50 +00:00
TreeHugger Robot
53f1e23d63
Merge "Show app list in Battery Usage page when there is no battery level data." into tm-qpr-dev
2022-09-21 05:50:45 +00:00
Binyi Wu
effd45b308
Merge "Prevent intent defined in AccountPreference from leaking access" into tm-qpr-dev
2022-09-21 04:14:11 +00:00
Bill Yi
1960044a5f
Merge changes from topic "tc_change_22092009_25"
...
* changes:
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 66d46968f6
Import translations. DO NOT MERGE ANYWHERE
2022-09-21 02:29:11 +00:00
Bill Yi
cab02b9442
Merge "Import translations. DO NOT MERGE ANYWHERE"
2022-09-21 02:26:30 +00:00
Bill Yi
39f39c9514
Merge "Import translations. DO NOT MERGE ANYWHERE"
2022-09-21 02:26:30 +00:00
joonhunshin
793f5d0a79
changed return value METRICS_CATEGORY_UNKNOWN to SETTINGS_CONTACT_DISCOVERY
...
return SETTINGS_CONTACT_DISCOVERY for getMetricsCategory() instead of METRICS_CATEGORY_UNKNOWN
Bug: 246514073
Test: atest ContactDiscoveryDialogFragmentTest
Change-Id: I2b1512543254641f598727ae9af2a5e989bb3df7
2022-09-21 00:46:34 +00:00
Dan Sandler
5eeb6c3792
Launch the platform easter egg in a new task.
...
This ensures that when PlatLogoActivity is launched on a
large-screen device, it properly takes over the full screen
(and doesn't hide the status bar for Settings!).
Bug: 243407943
Test: make RunSettingsRoboTests ROBOTEST_FILTER=FirmwareVersionDetailPreferenceControllerTest
Change-Id: Icf10aa43e5b4a27a2fa98ea41b5a9e9cf659e895
2022-09-20 20:10:17 -04:00
TreeHugger Robot
7c21f2eaa6
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev
2022-09-20 23:20:11 +00:00
Bill Yi
198cb56664
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev
2022-09-20 22:47:08 +00:00
TreeHugger Robot
85702ae62d
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev
2022-09-20 21:00:30 +00:00
TreeHugger Robot
f33a95d6f8
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev
2022-09-20 21:00:30 +00:00
Joshua Mccloskey
eaae33bd7b
Add phone, tablet, device fp deletion strings.
...
Change-Id: I5b6167f1c755d974db8f73debc6bab4709c136cf
Test: Manual.
Fixes: 245411037
2022-09-20 19:07:39 +00:00
Quang Luong
0fe65b582a
Do not request P2P if user declined interface conflict dialog
...
P2P iface requests may prompt the user to accept/decline. We should avoid prompting the user twice by not making any additional P2P iface requests after the user declines (i.e. device becomes unavailable).
Bug: 243436630
Test: enable iface creation dialog and turn on STA + AP, verify dialog
does not reappear after user reject in P2P Settings
Change-Id: I6fdda273d898c1d456a1f39d90b1257c8ff4de15
2022-09-20 17:44:57 +00:00
Bill Yi
557410d5c8
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 66d46968f6
...
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19997560
Change-Id: I2cc1d8aff8925ec56f542eced43799d35ba9f84f
2022-09-20 17:08:41 +00:00
Grace Cheng
76902f4b7c
Fix alignment of finger animation with progress bar
...
Makes progress bar opaque and fixes color codes accordingly, and adjusts
values to shift finger animation and progress bar for proper alignment
Test: Enroll finger in light and dark theme and observe alignment of
finger with progress bar
Fixes: 245819077
Change-Id: I26bea8e1870f08b413a4ec2a9e6e83015facd004
Merged-In: I26bea8e1870f08b413a4ec2a9e6e83015facd004
2022-09-20 16:53:09 +00:00
Grace Cheng
415314113b
Fix alignment of finger animation with progress bar
...
Makes progress bar opaque and fixes color codes accordingly, and adjusts
values to shift finger animation and progress bar for proper alignment
Test: Enroll finger in light and dark theme and observe alignment of
finger with progress bar
Fixes: 245819077
Change-Id: I26bea8e1870f08b413a4ec2a9e6e83015facd004
2022-09-20 16:13:14 +00:00
Bonian Chen
78d6c6596e
[Settings] Remove unreferenced method
...
Remove unreferenced method.
Bug: 247783516
Change-Id: I96c04d6cda3478e843134f43119f1ad7d62877a2
Test: build pass
2022-09-20 15:02:34 +00:00
Chaohui Wang
11a5c2adaf
Add debug flag for App Settings page
...
Default no-op, if SETTINGS_ENABLE_SPA is enabled, InstalledAppDetailsTop
will navigate to SPA AppSettings instead of AppInfoDashboardFragment.
Bug: 236346018
Test: Manual with Settings App
Change-Id: I0b8a668df1f8783b860baae1d912157f742baf3f
2022-09-20 20:19:22 +08:00
Sunny Shao
535667b5eb
Fix checkcolor_hook error
...
Bug: 247692342
Test: repo upload OK
Change-Id: Iaabad7081d216cb8074f3d26a1213b8230da3602
2022-09-20 19:36:11 +08:00
Amy Hsu
d71e9f4427
Merge "[RRS] Send event to AccessibilityManager when an unselect radio button is selected." into tm-d1-dev am: c799cb11f5
am: b13a190ef7
am: 352ee9eeef
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19893206
Change-Id: I4d0d2efc974286b398c0fbcfbb738c958222d898
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-20 09:57:52 +00:00
Amy Hsu
ab9a73ff07
Merge "[RRS] Send event to AccessibilityManager when an unselect radio button is selected." into tm-d1-dev am: c799cb11f5
am: d434100421
am: 4da27ff2bd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19893206
Change-Id: Id9493be0c48bcc3e31272fc0dd0f155a18161fa2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-20 09:57:20 +00:00
Amy Hsu
352ee9eeef
Merge "[RRS] Send event to AccessibilityManager when an unselect radio button is selected." into tm-d1-dev am: c799cb11f5
am: b13a190ef7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19893206
Change-Id: I46e83a4ff523a6762a6ee40c970d732a0920fc90
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-20 09:43:33 +00:00
Xuanang Zhao
db0a0792a1
Merge "Rename the shortcut title for dark theme from "Schedule" to "Dark theme""
2022-09-20 09:31:34 +00:00
Amy Hsu
4da27ff2bd
Merge "[RRS] Send event to AccessibilityManager when an unselect radio button is selected." into tm-d1-dev am: c799cb11f5
am: d434100421
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19893206
Change-Id: I589ef3fb4fc332af6e5f6b655b97a63ba18d8c67
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-20 09:27:38 +00:00
Amy Hsu
b13a190ef7
Merge "[RRS] Send event to AccessibilityManager when an unselect radio button is selected." into tm-d1-dev am: c799cb11f5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19893206
Change-Id: I206b788c8985b7ebc20093275ed4d1c272349e82
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-20 09:03:38 +00:00