Yanting Yang
a09fd45249
Merge "Support the about device warning message for tablets"
2023-06-28 03:57:08 +00:00
Yanting Yang
0818b82ecf
Support the about device warning message for tablets
...
Move the related strings to res-product folder and add the string for
tablet.
Bug: 282233849
Test: visual
Change-Id: Ib93fd1a3e15600bd2278297645dadd176d99a083
2023-06-28 02:28:34 +00:00
Vania Januar
7936f53f8e
Merge "Clarify that enabling Notes role requires reboot in preference summary" into udc-qpr-dev am: 0e8bdf2fc0 am: 4c281ab191
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23766165
Change-Id: If809d40cb2f0d5b42892011667f979477167bc52
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-27 15:45:29 +00:00
Vania Januar
4c281ab191
Merge "Clarify that enabling Notes role requires reboot in preference summary" into udc-qpr-dev am: 0e8bdf2fc0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23766165
Change-Id: I5937c756289f04916f366ec0acba6866b422ac50
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-27 15:00:48 +00:00
Vania Januar
0e8bdf2fc0
Merge "Clarify that enabling Notes role requires reboot in preference summary" into udc-qpr-dev
2023-06-27 14:14:58 +00:00
Chaohui Wang
2e4141e4ab
Clean up AwareFeatureProvider from Settings
...
Bug: 287566056
Test: m Settings
Change-Id: I7f7f57809c55bf8824b427f0d4a232cacdbe88a7
2023-06-25 16:52:34 +08:00
Bill Yi
6a2d395a4c
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I33f9c6778e44fe0b391dac3a134aab87aec5815c
2023-06-23 06:35:05 -07:00
Bill Yi
4d5e205eb4
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: If1c6cb268c4a63baf1be0db6bb833b72c66f140f
2023-06-23 06:32:34 -07:00
Vania Januar
a425247076
Clarify that enabling Notes role requires reboot in preference summary
...
Bug: 288387225
Change-Id: Id07e3b188442c6f4695b43d62b02ea8465d76a7e
Test: only a string change
2023-06-22 10:12:30 +00:00
Chaohui Wang
fd4bfd4c0e
[lint] Fix Wrong Resource Type am: 7aaceaa782 am: 68159be3ee
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23734154
Change-Id: I3ce015dfd694e6c7cbdb247a2026e845ea3eb717
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-21 07:39:11 +00:00
Julia Tuttle
20ac28dfa2
Merge "Fix colors in importance and conversation priority preferences" into udc-dev am: bd74e47e5e am: 4d3b967fb8 am: 205135ffa4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23690613
Change-Id: I5550ca3651118e96d986cc714102596966a380b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-20 18:36:04 +00:00
Julia Tuttle
87d6681e8b
Merge "Fix colors in importance and conversation priority preferences" into udc-dev am: bd74e47e5e am: 4d3b967fb8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23690613
Change-Id: I351f38d15518deac4a5fd109b79b9ba6368d001e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-20 17:50:52 +00:00
Julia Tuttle
205135ffa4
Merge "Fix colors in importance and conversation priority preferences" into udc-dev am: bd74e47e5e am: 4d3b967fb8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23690613
Change-Id: I4fb9af8f7ea4bf07b81b9a12034700cee6ca5905
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-20 17:48:41 +00:00
Julia Tuttle
1ddbbd4542
Merge "Fix colors in importance and conversation priority preferences" into udc-dev am: bd74e47e5e am: 2390428dd8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23690613
Change-Id: I62ce7d8d02d54605e3115ed3abd7583ad05010be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-20 17:48:39 +00:00
Julia Tuttle
4d3b967fb8
Merge "Fix colors in importance and conversation priority preferences" into udc-dev am: bd74e47e5e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23690613
Change-Id: Id026252a0ef651a3ef12d1e1fdbf261368f0d18e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-20 17:06:35 +00:00
Julia Tuttle
2390428dd8
Merge "Fix colors in importance and conversation priority preferences" into udc-dev am: bd74e47e5e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23690613
Change-Id: Iaf0c32fc2ff4450dadc2256601d6966e5bd73d76
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-20 17:06:19 +00:00
Julia Tuttle
bd74e47e5e
Merge "Fix colors in importance and conversation priority preferences" into udc-dev
2023-06-20 16:21:01 +00:00
YK Hung
7f9afcf553
Merge "Update tablet help article link (1/2)" into udc-dev am: a4f67e02c8 am: 5007841ebd am: c2e7b61ee9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23695285
Change-Id: Iaf945a698cf20ed42a5c357381783ef7c238b825
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-20 08:07:05 +00:00
YK Hung
ca2d241193
Merge "Update tablet help article link (1/2)" into udc-dev am: a4f67e02c8 am: a2c73328eb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23695285
Change-Id: I796b185b0dfbb3322289913c87a220a4501fdd1d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-20 07:51:01 +00:00
YK Hung
3a04e20f39
Merge "Update tablet help article link (1/2)" into udc-dev am: a4f67e02c8 am: 94f5c7a913
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23695285
Change-Id: I825b76d4c744ed5edc2ce4732d120f44b40fb0d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-20 07:46:39 +00:00
YK Hung
c2e7b61ee9
Merge "Update tablet help article link (1/2)" into udc-dev am: a4f67e02c8 am: 5007841ebd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23695285
Change-Id: If3a00b355020c1307999684330297e4a388ba8dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-20 07:28:29 +00:00
YK Hung
a2c73328eb
Merge "Update tablet help article link (1/2)" into udc-dev am: a4f67e02c8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23695285
Change-Id: I67be253b5b2560bdbe9869376bfa394772fadf3f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-20 07:05:48 +00:00
YK Hung
0d8db71d44
Merge "Update tablet help article link (1/2)" into udc-dev am: a4f67e02c8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23695285
Change-Id: I3158ea89ef2804c5a9878ff27db5b9b4466e0644
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-20 07:05:48 +00:00
YK Hung
94f5c7a913
Merge "Update tablet help article link (1/2)" into udc-dev am: a4f67e02c8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23695285
Change-Id: I3b226770289800cec4196a6b34ceb05f090a6d69
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-20 07:05:34 +00:00
YK Hung
5007841ebd
Merge "Update tablet help article link (1/2)" into udc-dev am: a4f67e02c8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23695285
Change-Id: Id6b352d47918565fac42659529c97d1b4c89606f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-20 07:01:29 +00:00
YK Hung
a4f67e02c8
Merge "Update tablet help article link (1/2)" into udc-dev
2023-06-20 06:34:46 +00:00
Chaohui Wang
68159be3ee
[lint] Fix Wrong Resource Type am: 7aaceaa782
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23734154
Change-Id: If50e377055875ff4814e6b479ba9e474cf62b91c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-19 05:55:25 +00:00
Chaohui Wang
7aaceaa782
[lint] Fix Wrong Resource Type
...
Bug: 285231003
Test: m Settings
Change-Id: I8dfbaf1342f014af35cd08906ac3f498b6c8c11a
2023-06-19 10:17:35 +08:00
Milton Wu
8e42d7c85a
[BiometricsV2] Refactor Fingerprint intro fragment
...
Refactor FingerprintEnrollIntroFragment to kotlin and add bindView()
method for it.
Bug: 286197823
Test: atest FingerprintEnrollmentActivityTest
Change-Id: I44157bf2c2bea6f49382335438b16aae3e3e5b4c
2023-06-17 18:16:17 +08:00
Julia Tuttle
b23136041d
Fix colors in importance and conversation priority preferences
...
This would have been simpler and faster, but the ChannelPanelActivity
was giving me a context where Material colors always inflated in light
theme even if the device was in dark theme, so I had to work around it.
On the plus side, whoever next needs to change these colors will find
them neatly organized in themes.xml!
Bug: 284380876
Test: manual
Change-Id: I2eee877fe44d307a96d60168d0317444ff002669
2023-06-16 19:17:09 +00:00
Chaohui Wang
f355bc2e01
Merge "Migrate PlatformCompat App List to SPA" into udc-qpr-dev am: 879ff5f271 am: 78981afdc2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23410196
Change-Id: I09189fc2dfe6789db9c7745dd43cf5168c2e9dfc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-16 09:24:26 +00:00
Chaohui Wang
78981afdc2
Merge "Migrate PlatformCompat App List to SPA" into udc-qpr-dev am: 879ff5f271
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23410196
Change-Id: I8746fd67255bd0799307f403f132e5a1692e41b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-16 08:40:02 +00:00
Lifu Tang
5ef1e90b53
Update location settings status text to use slash
...
This change is to comply with the new UX guideline that requires the
punctuation used after "On" or "Off" state to be a slash instead of a
dash.
Bug: 259364228
Test: manual.
Change-Id: I0e63fd66aa6f4479a6f0c6e5a58d3e0f9b5b10e9
2023-06-15 13:58:51 -07:00
Chaohui Wang
ed6d6c9e0f
Migrate PlatformCompat App List to SPA
...
So hidden modules are not shown in the list.
This will also improve the developer experience.
Bug: 273913035
Test: Manually with App Compatibility Changes
Test: Unit test
Change-Id: Ic78a51819159a0f848db6173f751b1be8c6b1e70
2023-06-15 09:37:11 +00:00
Rhed Jao
07f9d1ccbe
Merge "[Settings] Add a verification flow for exiting repair mode" into udc-qpr-dev am: e1c9d65cda am: 721a7bacaa
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23629341
Change-Id: If01a1c5c13433e85f9b91790375dc2f297777dd7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-15 07:19:57 +00:00
Wesley Wang
ddbb5bcd5c
Update tablet help article link (1/2)
...
Bug: 287122689
Test: make SettingsRoboTests
Change-Id: If09f7a6aab01f00bdb1675444237698643e6ba93
2023-06-15 14:38:59 +08:00
Rhed Jao
721a7bacaa
Merge "[Settings] Add a verification flow for exiting repair mode" into udc-qpr-dev am: e1c9d65cda
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23629341
Change-Id: I58bc332082495cf4451228aa8179f6d2e6a2c73b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-15 06:34:53 +00:00
Rhed Jao
e1c9d65cda
Merge "[Settings] Add a verification flow for exiting repair mode" into udc-qpr-dev
2023-06-15 04:55:45 +00:00
Rhed Jao
b7a4a7daa4
[Settings] Add a verification flow for exiting repair mode
...
Handles the ACTION_CONFIRM_REPAIR_MODE_DEVICE_CREDENTIAL
intent to launch the confirm device credential activity for
users to exiting repair mode. The activity passes a special
user id USER_REPAIR_MODE to the framework and verify credentials
that the user enrolled in normal mode.
Bug: 277561275
Test: am start -a android.app.action.PREPARE_REPAIR_MODE_DEVICE_CREDENTIAL
settings put global repair_mode_active 1
am start -a android.app.action.CONFIRM_REPAIR_MODE_DEVICE_CREDENTIAL
The credential is verified successfully.
Change-Id: I9ffe32f9925ee2b990c49d5674d27196a4c9edf7
2023-06-15 02:14:41 +00:00
Hao Dong
9e1435a0dc
Merge "Wait for systemui udfps overlay ready to show settings udfps enroll view." into udc-qpr-dev am: 61659799de am: a9f1ed3501
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23595181
Change-Id: I88d843e5c1164e054d4cb48e3f953618e63e2e64
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-15 01:46:36 +00:00
Hao Dong
a9f1ed3501
Merge "Wait for systemui udfps overlay ready to show settings udfps enroll view." into udc-qpr-dev am: 61659799de
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23595181
Change-Id: Ia545f7902df20a47c6dc154cfb3d781541bb25ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-15 01:45:55 +00:00
Hao Dong
61659799de
Merge "Wait for systemui udfps overlay ready to show settings udfps enroll view." into udc-qpr-dev
2023-06-15 01:22:22 +00:00
Bill Yi
e689c94435
Merge "Import translations. DO NOT MERGE ANYWHERE"
2023-06-14 13:21:34 +00:00
Bill Yi
bf7dfbc5fe
Merge "Import translations. DO NOT MERGE ANYWHERE"
2023-06-14 13:21:34 +00:00
TreeHugger Robot
9d38813d4b
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev
2023-06-14 05:24:47 +00:00
TreeHugger Robot
c937ce7a22
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev
2023-06-14 05:24:47 +00:00
Treehugger Robot
c706f8544d
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev
2023-06-14 03:32:14 +00:00
Wenhui Yang
e839945290
Merge "Fix face model delete message" into udc-d1-dev am: d56f96aaba
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23677227
Change-Id: I147cb8b08941e5b56836c2d95456b605a2ed55f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-13 21:11:21 +00:00
TreeHugger Robot
3b89844e7f
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev
2023-06-13 19:58:54 +00:00
TreeHugger Robot
6fd46cf3a3
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev
2023-06-13 19:58:54 +00:00