PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
123,048 Commits 1 Branch 0 Tags
a210c84eb8f6c2ee99a60f372bf1e57fa277cee7
Commit Graph

123048 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
SongFerng Wang
a210c84eb8 Merge "When config is changed, update the profile's visibility" into udc-d1-dev 2023-06-09 02:26:16 +00:00
Mady Mellor
7605e122ac Merge "Fix colors in bubble settings so they're more visible" into udc-dev am: 8a47899369 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23607273

Change-Id: I66d7e691b5472f108303950f4a1a45347febb903
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-08 18:22:45 +00:00
Mady Mellor
8a47899369 Merge "Fix colors in bubble settings so they're more visible" into udc-dev 2023-06-08 17:35:55 +00:00
Mady Mellor
f184678802 Fix colors in bubble settings so they're more visible 
Test: manual - get a bubble, go to that apps bubble settings screen,
               observe the colors look correct, switch theme and
               check again.
Bug: 283951560
Change-Id: I361b1c20e293c02b4d604e0b5845a074c31e5103
 2023-06-08 09:21:13 -07:00
SongFerngWang
7dc3cf0b32 When config is changed, update the profile's visibility 
Bug: 286328464
Test: build pass
Change-Id: I2beef587a71f9fdc1b1e8a97b9b5656dbb52a9f3
 2023-06-08 10:40:54 +00:00
Treehugger Robot
c0338e5dc3 Merge "Fix low contrast on work challenge screen emergency call button" into udc-dev am: a34a510a40 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23601981

Change-Id: I452681812b4be6dccae36f3ec711e992a31b9924
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-08 00:50:15 +00:00
Treehugger Robot
a34a510a40 Merge "Fix low contrast on work challenge screen emergency call button" into udc-dev 2023-06-08 00:15:18 +00:00
Oli Thompson
ab73c1a3e3 Fix low contrast on work challenge screen emergency call button 
Bug: 285718470
Test: btest a.d.g.WorkTelephonyTest#workChallengePinScreen_whenAllSubscriptionsManaged_hasEmergencyButton -nm
Change-Id: I546e30e7f0b9b5eccd54e912274eeb6ba1a7a6e6
 2023-06-07 19:25:59 +00:00
Aleksandar Kiridžić
c449423483 Merge "speech: On-device recognition settings profile selector" into udc-dev am: b5b15a6689 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23517421

Change-Id: I9ead6c07f3f8c8b901301a7eed9de148490b4bda
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-07 18:43:15 +00:00
Aleksandar Kiridžić
b5b15a6689 Merge "speech: On-device recognition settings profile selector" into udc-dev 2023-06-07 17:53:38 +00:00
TreeHugger Robot
9b68c3c9c1 Merge "[Settings] Fix crash when user enter bluetooth page quickly." into udc-dev am: 3e374cc7a7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23601556

Change-Id: I5f9975f49ec0793eabf171c5dba0791683ab0d15
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-07 13:03:22 +00:00
TreeHugger Robot
3e374cc7a7 Merge "[Settings] Fix crash when user enter bluetooth page quickly." into udc-dev 2023-06-07 12:13:51 +00:00
tom hsu
bf7865b27e [Settings] Fix crash when user enter bluetooth page quickly. 
- When SliceManager try to pinSlice, process may not have the permssion
   yet, so in Androix lib it use try/catch to avoid Security exception.
   However, if SliceManger quickly unpinSlice after pinSlice, process
   may still not get the permission yet, then due to no security
   exception, it cause the settings crash.

Bug: 283065718
Test: atest passed
Test: Manual test passed
Change-Id: I2293fca73e65dfaa34237abe57e0c6a3fe0f62bb
 2023-06-07 09:37:21 +00:00
George Chang
29dd0bf796 Merge "Correct typo in the launch via NFC bottom string" into udc-dev am: 832e0b015e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23584036

Change-Id: Ifc98c5ea76ad9fb5205ec3421470ebd7bf17473c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-07 09:33:13 +00:00
George Chang
832e0b015e Merge "Correct typo in the launch via NFC bottom string" into udc-dev 2023-06-07 09:02:51 +00:00
SongFerng Wang
add7deceb2 Merge "Add the log and moving it into onResume" into udc-d1-dev 2023-06-07 02:45:20 +00:00
SongFerngWang
ea85e3b2fa Add the log and moving it into onResume 
Since user can open two settings app(one is via settings app button and other one is via quick settings) and user can switch them to foreground by the recent page. If user can goto the deviceDetails at Settings_A and then changes the config value at settings_B, then the user goes back Settings_A to check the UI. If config is in the init, the UI can't refresh the UI.
Bug: 285086232
Test: build pass.
Change-Id: I2284940eddcd02c543522b60f951c0d8d25775fd
 2023-06-07 01:45:31 +00:00
SongFerng Wang
4929da451c Merge "ForgetDeviceDialogFragment check whether device is null or not" into udc-d1-dev 2023-06-07 01:33:59 +00:00
Ale Nijamkin
1e3ecf6352 Merge "Fixes nav stack issue." into udc-dev am: b5dda005fd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23573917

Change-Id: I93ad7cae5cf900539bbded918807ea19b4c358b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-06 19:44:29 +00:00
Ale Nijamkin
b5dda005fd Merge "Fixes nav stack issue." into udc-dev 2023-06-06 18:48:59 +00:00
Treehugger Robot
fb4945a4ae Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev 2023-06-06 14:58:40 +00:00
Treehugger Robot
8db6cc323c Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev 2023-06-06 14:58:40 +00:00
Treehugger Robot
c1fdb0bec2 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev 2023-06-06 14:58:40 +00:00
Treehugger Robot
1dc6b2d265 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: f996cfceba -s ours am: 059773bd86 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23559398

Change-Id: I72e52377e732dfa56e16340b98aa6660ca06858f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-06 14:51:01 +00:00
Bill Yi
c0e9862110 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 506e105fdb -s ours am: 284d320abb -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23559398

Change-Id: If5c7d94531d805bce9a9cab5dad7a3101e384973
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-06 14:50:56 +00:00
Treehugger Robot
12ec34641e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: ba4dc8f0bc -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23559401

Change-Id: I08b52fc6dc39253d43dcebb5eb32bd4dc0bce3ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-06 14:49:33 +00:00
Bill Yi
fe99021d55 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ea2e6b3670 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23559401

Change-Id: I27f7e7aebe7833c9c406fbde1bcd905ac848adfb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-06 14:49:27 +00:00
Treehugger Robot
04f844c712 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: d8d85a8485 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23559396

Change-Id: Ie1f7e796600b5ed714c99ae7fa74cf8455962030
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-06 14:49:23 +00:00
Bill Yi
5e71a3fdf4 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7d99401b8e -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23559396

Change-Id: Id98b771b0dbd7773b3574cbb6d65cacce5d72e4c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-06 14:49:08 +00:00
Treehugger Robot
f14e96fe88 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 8c296cdd64 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23559244

Change-Id: I55893373046dc2d041b6b9fe8b5bba6ff4fd8b55
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-06 14:48:55 +00:00
Bill Yi
4fdf445fc4 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d152c7b1bf -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23559244

Change-Id: I6f63c4860010286a27d32882b3f3bcdfb743c2ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-06 14:48:41 +00:00
Treehugger Robot
059773bd86 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: f996cfceba -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23559398

Change-Id: I03d8e31c1ab27742b95e0a528a135aa15db4e4dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-06 14:46:16 +00:00
Bill Yi
284d320abb [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 506e105fdb -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23559398

Change-Id: I4e9438ad10906e729a3eafbb69410fa4ce011c7c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-06 14:46:11 +00:00
Treehugger Robot
ba4dc8f0bc Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev 2023-06-06 14:43:16 +00:00
Treehugger Robot
d8d85a8485 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev 2023-06-06 14:43:16 +00:00
Treehugger Robot
8c296cdd64 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev 2023-06-06 14:43:16 +00:00
Treehugger Robot
f996cfceba Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2023-06-06 14:19:16 +00:00
George
d41299016e Correct typo in the launch via NFC bottom string 
Bug: 283521954
Test: manual check the string
Change-Id: Ia32817ee1735831d0156a84ef7f48af94131dc73
 2023-06-06 21:39:01 +08:00
Aleksandar Kiridzic
a882fd268d speech: On-device recognition settings profile selector 
`Settings > System > Languages > On-device speech recognition`
entry is currently proceeding to the settings page for the personal
profile by default. If a work profile exists,
a profile selector should be shown first.

Bug: 269575714
Test: Manual, already existing robotests
Change-Id: Id95a9716358ec3a813c77275bd65f0cbdfc9aefc
 2023-06-06 14:10:34 +01:00
SongFerngWang
13cd052693 ForgetDeviceDialogFragment check whether device is null or not 
Bug: 280687867
Test: build pass
Change-Id: I4134569854165f20f6287406d9ed627b2c15c05b
 2023-06-06 09:53:36 +00:00
Treehugger Robot
d05997872a Merge "Revert "Revert "Update theme for ChannelPanelActivity""" into udc-dev am: 185244f43d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467968

Change-Id: Ice47c201387d778d3bee0aa239fdd3b3eb59a031
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-06 06:38:00 +00:00
Treehugger Robot
185244f43d Merge "Revert "Revert "Update theme for ChannelPanelActivity""" into udc-dev 2023-06-06 05:49:40 +00:00
Alejandro Nijamkin
6f9f3a4594 Fixes nav stack issue. 
By marking the Intent that's being sent to WPP as "launched from
settings", the code in CustomizationPickerActivity can correctly
conclude that the multi-pane wrapper does not need to be applied to the
intent, preventing the odd "disordering" of the back stack in the bug.

Fix: 284809020
Test: manually verified, on a large screen device with a multi-pane
settings configuration, that going to Display > Lock screen > Shortcuts
and then swiping back off the left edge of the display correctly exits
settings instead of revealing an incorrect screen like it did in the
bug.
Test: also manually verified that the long-press on the home screena and
on the lock screen paths both open the right tab in WPP in settings
correctly.

Change-Id: Iac2b4e9fa5bab91b6a5251f1c51b4d21a0824f00
 2023-06-05 16:02:17 -07:00
TreeHugger Robot
0741621536 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 719a4c645f -s ours am: 8f5a0bc281 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23559281

Change-Id: I1d14b256b2f3ab3c1ea5aaa8c5a48245b703a03e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-05 20:58:50 +00:00
Bill Yi
556351d016 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b80d56cfc0 -s ours am: a18807d9ca -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23559281

Change-Id: I5def613da9cbba552a080f9091114950f8c44fbc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-05 20:58:46 +00:00
Bill Yi
6f0fe3ef25 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fe27600237 -s ours am: aeacaaee64 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23557235

Change-Id: Ib2adb162afea02633fbdecf13b0f984b9769d0fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-05 20:37:16 +00:00
Bill Yi
0813a0de64 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1b5824f6c9 -s ours am: 0a31322199 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23559400

Change-Id: I4792833097104a72e31f67733d77948812fcb699
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-05 20:37:01 +00:00
TreeHugger Robot
8f5a0bc281 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 719a4c645f -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23559281

Change-Id: Ie20278858c925933506dbd5bc6d71e486d45e89b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-05 20:19:27 +00:00
Bill Yi
a18807d9ca [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b80d56cfc0 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23559281

Change-Id: I9c3201ad1377bc074940b211483a7c0f76630d56
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-05 20:19:23 +00:00
Bill Yi
aeacaaee64 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fe27600237 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23557235

Change-Id: Ie42f1d09d6218ba3350b6971370fd554ea10f719
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-05 20:18:41 +00:00