Jason Hsu
884bc10f9b
Merge "Update hearing aids to hearing devices" into udc-dev am: f7f38b2d66
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23123003
Change-Id: I717d5d434cef75149c3c110cb9e80835af15be0a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 13:01:39 +00:00
Jason Hsu
08b309dd75
Merge "Update hearing aids to hearing devices" into udc-dev am: f7f38b2d66
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23123003
Change-Id: I176b47f5a016381829d7fc4528691cfa9f51acf2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 13:01:35 +00:00
Jason Hsu
db3a350e4d
Merge "Update hearing aids to hearing devices" into udc-dev am: f7f38b2d66
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23123003
Change-Id: Ie46216f90ac9df4776e626885b218cf306b3dbb1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 12:57:38 +00:00
Jason Hsu
f7f38b2d66
Merge "Update hearing aids to hearing devices" into udc-dev
2023-05-11 12:15:02 +00:00
Mill Chen
f321799f43
Update string for touch sounds
...
Bug: 274081150
Test: visual verify
Change-Id: I953f108884cafc91e2a3a76bd1292ea30386d862
2023-05-11 17:24:32 +08:00
jasonwshsu
7eeed19d28
Update hearing aids to hearing devices
...
* We change the string 'hearing aids' to 'hearing devices', here are
some left strings need to be updated.
Bug: 281782174
Test: flash rom and check UI
Change-Id: I0e3395c91d42b037158d135d1cbe519acac50aa0
2023-05-11 16:41:54 +08:00
Yanting Yang
bc297b9f3c
Make “Reset app preferences” restricted by DISALLOW_APPS_CONTROL
...
When DISALLOW_APPS_CONTROL restriction is enabled, users should not be
able to enable/disable apps, clear app caches and clear app data.
“System >Reset options > Reset app preferences” can take the above
actions which should be restricted by DISALLOW_APPS_CONTROL to fix the
security vulnerability.
Bug: 278559731
Test: Verify change by turning on/off DISALLOW_APPS_CONTROL with TestDPC.
Change-Id: I387a95aa7f54fe04d5ed92372e43a88d5fe3e79a
2023-05-11 16:29:07 +08:00
SongFerng Wang
b421dfeeac
Merge "Update the wording for LE Audio" into udc-dev am: c487d5a10c
am: 376ca216ad
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23156659
Change-Id: I56e8b9e3330c1a933ed39f426b598791a560bb45
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 08:21:03 +00:00
SongFerng Wang
96df087783
Merge "Update the wording for LE Audio" into udc-dev am: c487d5a10c
am: 2319563b00
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23156659
Change-Id: I1d2da49d6dae634f3498943fd42c79e5e2956076
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 08:05:52 +00:00
SongFerng Wang
343602fd5e
Merge "Update the wording for LE Audio" into udc-dev am: c487d5a10c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23156659
Change-Id: Ifd85fa0461be871e9bdc52977f1e5b91a8fa1aac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 07:44:20 +00:00
SongFerng Wang
376ca216ad
Merge "Update the wording for LE Audio" into udc-dev am: c487d5a10c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23156659
Change-Id: I768f9c3b6d1ee556bbd2238ea1f3b72ae008bac3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 07:44:15 +00:00
SongFerng Wang
2319563b00
Merge "Update the wording for LE Audio" into udc-dev am: c487d5a10c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23156659
Change-Id: I7745d09826da393c5d3c2377f37ab2761d313dc7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 07:40:02 +00:00
SongFerng Wang
c487d5a10c
Merge "Update the wording for LE Audio" into udc-dev
2023-05-11 07:11:11 +00:00
TreeHugger Robot
00cc06ab7a
Merge "Show disable dialog box when none is selected" into udc-dev am: 1742524dd3
am: 728b1b8337
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23139605
Change-Id: Iec6d97042a0fc3b6d68a194ff0eff37f3243c0bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 05:33:47 +00:00
TreeHugger Robot
758c01fbb8
Merge "Show disable dialog box when none is selected" into udc-dev am: 1742524dd3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23139605
Change-Id: I91aaaf25b6b8e8d865b4104eac643bb97bf52a8a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 05:13:36 +00:00
TreeHugger Robot
728b1b8337
Merge "Show disable dialog box when none is selected" into udc-dev am: 1742524dd3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23139605
Change-Id: I9e96a83571c105b8858dc4bdc4f578dc6720f652
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 05:12:49 +00:00
TreeHugger Robot
3d886d929e
Merge "Show disable dialog box when none is selected" into udc-dev am: 1742524dd3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23139605
Change-Id: I0e960f28ea3818f8d9dc1200bb4087ddf668846b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 05:12:41 +00:00
SongFerngWang
f4c5c8ef5e
Update the wording for LE Audio
...
Add the summary for LE Audio toggle
Bug: 280000165
Test: build pass
Change-Id: Ic1eee71d6ff70d01e9a37ab0ec06cfaf639fe963
2023-05-11 12:30:59 +08:00
Angela Wang
cd1a68db34
Merge "Disabled state UI of Flash Notifications preview button" into udc-dev am: 22d3116188
am: ae04daac19
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23081916
Change-Id: Ic2362f572bd3be5a857788e62d9e6afb97e06b0d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 03:00:38 +00:00
Angela Wang
c4ff1e822f
Merge "Disabled state UI of Flash Notifications preview button" into udc-dev am: 22d3116188
am: 16fc56f72c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23081916
Change-Id: I6088b5e1c4e5bb7db783ecca348e490c87b0a1d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 02:44:28 +00:00
Becca Hughes
8e9119f5ab
Show disable dialog box when none is selected
...
Also remove from CMPP since that will be
hidden.
Test: ondevice
Bug: 281147573
Merged-In: Ic2b59c42ed4ddbc83a770b8bb99c641d2f1a383d
Change-Id: Ic2b59c42ed4ddbc83a770b8bb99c641d2f1a383d
2023-05-11 02:28:54 +00:00
Angela Wang
e9106f35ce
Merge "Disabled state UI of Flash Notifications preview button" into udc-dev am: 22d3116188
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23081916
Change-Id: Ifac01d28e06f50734882f9f8a04d3040809e3553
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 02:20:02 +00:00
Angela Wang
ae04daac19
Merge "Disabled state UI of Flash Notifications preview button" into udc-dev am: 22d3116188
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23081916
Change-Id: I1aaac6f95b1821c08a59cabda22f84f69bfb3051
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 02:19:39 +00:00
Angela Wang
16fc56f72c
Merge "Disabled state UI of Flash Notifications preview button" into udc-dev am: 22d3116188
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23081916
Change-Id: I580326606ec0e281f42e57dd464be5265e9bf948
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 02:15:50 +00:00
Angela Wang
22d3116188
Merge "Disabled state UI of Flash Notifications preview button" into udc-dev
2023-05-11 01:41:47 +00:00
Becca Hughes
9272c0e3c8
Show disable dialog box when none is selected
...
Also remove from CMPP since that will be
hidden.
Test: ondevice
Bug: 281147573
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:16d3b54aaf802c66be439bf65c877cba60c4390d )
Merged-In: Ic2b59c42ed4ddbc83a770b8bb99c641d2f1a383d
Change-Id: Ic2b59c42ed4ddbc83a770b8bb99c641d2f1a383d
2023-05-10 23:41:56 +00:00
Bill Yi
7b0fe10dd5
Merge "Import translations. DO NOT MERGE ANYWHERE"
2023-05-10 23:28:46 +00:00
Bill Yi
deaa34f3f7
Merge "Import translations. DO NOT MERGE ANYWHERE"
2023-05-10 23:28:46 +00:00
Hao Dong
755a67a931
Set EXTRA_KEY_FOR_FINGERPRINT for choose lock screen.
...
Bug: 279823572
Test: atest FingerprintSettingsFragmentTest
Test: atest ChooseLockGenericTest
Change-Id: Ie4bc18bf245eb7a755862401c710d85381063ff9
Merged-In: Ie4bc18bf245eb7a755862401c710d85381063ff9
2023-05-10 23:26:02 +00:00
Treehugger Robot
1c9bf31044
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-mainline-prod
2023-05-10 21:57:58 +00:00
Treehugger Robot
8eb849c4b2
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev
2023-05-10 21:57:56 +00:00
Treehugger Robot
52978dea76
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev
2023-05-10 21:57:56 +00:00
Treehugger Robot
bb298358c9
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-mainline-prod
2023-05-10 21:57:36 +00:00
Treehugger Robot
d28f600d0e
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev
2023-05-10 21:55:15 +00:00
Treehugger Robot
3b7b23acb8
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev
2023-05-10 21:55:15 +00:00
TreeHugger Robot
80190179ba
Merge "Fix title of no-screen-lock notification" into udc-dev am: c0c0edd078
am: 1e7990341c
am: ed35b5e376
am: 672ef42ab8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23061496
Change-Id: I4934e755229741218d3b8979fc8318a2b412f168
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-10 21:28:05 +00:00
Jigar Thakkar
b6e12d7ff1
Merge "Modify clone profile accounts info section" into udc-dev am: 002f06e120
am: 854a93c2d3
am: 28449684ca
am: 33f1f4c479
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22761582
Change-Id: I196a12897085e7dd54caf5dcc3110c9b4a8a922e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-10 20:46:31 +00:00
Marcello Galhardo
6255d37ad9
Merge "Move Note Shortcut from Settings to SystemUI" into udc-dev am: f5a3485300
am: d608996d1f
am: d478fe535e
am: af658f1ab4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23048850
Change-Id: Iab8c01d073f10dbbb55ebead9b8a883f5a93065a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-10 18:57:21 +00:00
Bill Lin
4caa3ece94
[conflict] Merge "Refine SkipDialog title and desc by device configs" into udc-dev am: 4d5063ffdc
am: f6d23468b1
am: e5dfcc0270
am: 547f6d63a2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22779802
Change-Id: I61fed7e932c8dc476b689ca61bbf8ee919924bed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-10 16:29:52 +00:00
TreeHugger Robot
ed35b5e376
Merge "Fix title of no-screen-lock notification" into udc-dev am: c0c0edd078
am: 1e7990341c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23061496
Change-Id: I30b75d09f1827198e788b2afac096df87bf79306
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-10 16:02:06 +00:00
TreeHugger Robot
1e7990341c
Merge "Fix title of no-screen-lock notification" into udc-dev am: c0c0edd078
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23061496
Change-Id: I3e9f8ee058f36819fad9675afd69f07d6524cbe4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-10 15:24:16 +00:00
TreeHugger Robot
2075dbd4c3
Merge "Fix title of no-screen-lock notification" into udc-dev am: c0c0edd078
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23061496
Change-Id: I6165748f6dd4a8a81d539e6f26904eb6e495b0ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-10 15:23:58 +00:00
TreeHugger Robot
11a070b2ae
Merge "Fix title of no-screen-lock notification" into udc-dev am: c0c0edd078
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23061496
Change-Id: Iefe0f6f46d38961d58a3548a9767fa2b106cbc0d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-10 15:19:40 +00:00
TreeHugger Robot
c0c0edd078
Merge "Fix title of no-screen-lock notification" into udc-dev
2023-05-10 14:33:36 +00:00
Jigar Thakkar
28449684ca
Merge "Modify clone profile accounts info section" into udc-dev am: 002f06e120
am: 854a93c2d3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22761582
Change-Id: I5260cc0cf08d72f1d37b9689355b6a894a01dd8b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-10 14:01:30 +00:00
Jigar Thakkar
5577564ed0
Merge "Modify clone profile accounts info section" into udc-dev am: 002f06e120
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22761582
Change-Id: I53c3877f388f99cf9f175f1737794ce0590df2aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-10 13:59:39 +00:00
Jigar Thakkar
854a93c2d3
Merge "Modify clone profile accounts info section" into udc-dev am: 002f06e120
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22761582
Change-Id: I1b5382aa0f132545d23082e3273e4756aa5d54ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-10 13:40:58 +00:00
Jigar Thakkar
e36f5fd311
Merge "Modify clone profile accounts info section" into udc-dev am: 002f06e120
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22761582
Change-Id: Ic3a653f6780fea6e7c94b50f3dedbb2e5042589c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-10 13:40:45 +00:00
Jigar Thakkar
002f06e120
Merge "Modify clone profile accounts info section" into udc-dev
2023-05-10 13:38:58 +00:00
Marcello Galhardo
af658f1ab4
Merge "Move Note Shortcut from Settings to SystemUI" into udc-dev am: f5a3485300
am: d608996d1f
am: d478fe535e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23048850
Change-Id: I400e5f91996be0e02d488d0fee5e2b59e3b1b7ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-10 09:48:00 +00:00