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

104048 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
e960cbff45 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 12968349f4 -s ours am: 803533153b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3e5afa698a89c721a7a325940d06f9d126eb9ac6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-24 00:35:13 +00:00
Arc Wang
464acaa669 [automerger skipped] [DO NOT MERGE] Verify ringtone from ringtone picker is audio am: 640eab60f2 am: 3d9bdda678 -s ours am: ec921eea1a -s ours am: f0065e3adf -s ours am: 09c382d878 -s ours am: c717665361 -s ours am: 0270951c5e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1447eb1dcbe803f7a88bb95041281e93cd0cdae6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-24 00:31:17 +00:00
Arc Wang
4594cc7e8e [automerger skipped] [DO NOT MERGE] Verify ringtone from ringtone picker is audio am: 1682354551 -s ours am: d47388ce79 -s ours am: 5f01cd3e3f -s ours am: 7dd3084f1a -s ours am: ac35d1fba1 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Idaa63bd6dfcfd29f5b3d5362bd7318026cedaf66
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-24 00:31:12 +00:00
Arc Wang
643b9bde10 [automerger skipped] [DO NOT MERGE] Verify ringtone from ringtone picker is audio am: 4b02b7dc7d -s ours am: bb81ea5351 -s ours am: a13b99e496 -s ours am: 56094f5a5e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Icf37253d2a827c10d2b7d0588501f6f5c24c1500
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-24 00:31:07 +00:00
Arc Wang
fc6f460183 [automerger skipped] Merge changes from topic "presubmit-am-1ef493659d7c45ffb8e88367e8e0f3d7" into sc-mainline-prod am: 5adcf47c4f -s ours am: f6d30578b6 -s ours 
am skip reason: Merged-In I0a9ca163f5ae91b67c9f957fde4c6db326b8718d with SHA-1 640eab60f2 is already in history

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

Change-Id: I3a79373e8557f7d254c81f6e3e476841c06f289b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-24 00:30:32 +00:00
TreeHugger Robot
2fae3c8608 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 94061be6ee -s ours am: 7828afe859 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If55c036e66029f9f40366cb6fe05cf4f763be054
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-24 00:30:19 +00:00
Bill Yi
d36fa64c17 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c60e7098d2 -s ours am: 2819fde801 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Idfb9cf3bc7e1208b7ad8ba011095695025e23555
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-24 00:30:14 +00:00
Bill Yi
1da0b28099 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6424f8d388 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib98e5cf90da64be0b86d62d3c75b6b3a523d2804
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-24 00:29:33 +00:00
Hugh Chen
e4d07bd71c [automerger skipped] RESTRICT AUTOMERGE Make bluetooth not discoverable via SliceDeepLinkTrampoline am: 06139d3ffc am: c2bb599eeb -s ours am: 8ddd1d70b2 -s ours am: 22ce749aa6 -s ours am: 8ce854af29 -s ours am: 5124046494 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I39b00c38808a30b956295ca511e69fe9884aa75d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-24 00:25:13 +00:00
Hugh Chen
c70937ef85 [automerger skipped] RESTRICT AUTOMERGE Make bluetooth not discoverable via SliceDeepLinkTrampoline am: c44b6fed73 am: d925f52768 -s ours am: 8d4a4b690f -s ours am: b71cc3b9fd -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ieb64860b140639650a9632626545c93126eb2165
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-24 00:25:06 +00:00
Hugh Chen
d5d8bbd18d [automerger skipped] RESTRICT AUTOMERGE Make bluetooth not discoverable via SliceDeepLinkTrampoline am: 9399a699d7 -s ours am: 1e636ad03e -s ours am: 7bde548ee0 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib58173e8bdc8e2c906f1430fc0bb745fc714fea1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-24 00:24:59 +00:00
TreeHugger Robot
8ebd0c1381 Merge changes from topic "presubmit-am-36bba661a52b4792a8d74b3037c240af" into sc-mainline-prod am: ff36a38719 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18330690

Change-Id: I3d5105e3416afe6d0e5acb64da61b9b2d39f0915
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-24 00:24:50 +00:00
Hugh Chen
d37402a2de [automerger skipped] [automerge] RESTRICT AUTOMERGE Make bluetooth not discoverable via SliceDeepLinkTrampoline 2p: 1c4142e1ae am: 10bdea1a98 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3dce5e69a84497905ba2c1579b827720fb4a3bc0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-24 00:24:46 +00:00
TreeHugger Robot
8af957252a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 9f9f0706d1 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I76baca80a92ced5c84844c648ee9b466886e7e51
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-24 00:20:45 +00:00
Bill Yi
ff8cd75636 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 17c2fde132 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic513985f0a682f21d4934463304e179c4f752089
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-24 00:20:25 +00:00
Bill Yi
803533153b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 12968349f4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie9bd95a0d8ce82385dfdc3435ddce5b129fcb98c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-24 00:20:07 +00:00
Arc Wang
0270951c5e [automerger skipped] [DO NOT MERGE] Verify ringtone from ringtone picker is audio am: 640eab60f2 am: 3d9bdda678 -s ours am: ec921eea1a -s ours am: f0065e3adf -s ours am: 09c382d878 -s ours am: c717665361 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic4b722086175803d1352855915ffb3d32eb1e55a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-24 00:06:36 +00:00
Arc Wang
ac35d1fba1 [automerger skipped] [DO NOT MERGE] Verify ringtone from ringtone picker is audio am: 1682354551 -s ours am: d47388ce79 -s ours am: 5f01cd3e3f -s ours am: 7dd3084f1a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I85ce0fb7c6c80d140055a348a66373b2978116fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-24 00:06:29 +00:00
Arc Wang
56094f5a5e [automerger skipped] [DO NOT MERGE] Verify ringtone from ringtone picker is audio am: 4b02b7dc7d -s ours am: bb81ea5351 -s ours am: a13b99e496 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie8c4b1bff4f405371c46810afac011d2655d92a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-24 00:06:21 +00:00
Arc Wang
f6d30578b6 [automerger skipped] Merge changes from topic "presubmit-am-1ef493659d7c45ffb8e88367e8e0f3d7" into sc-mainline-prod am: 5adcf47c4f -s ours 
am skip reason: Merged-In I0a9ca163f5ae91b67c9f957fde4c6db326b8718d with SHA-1 640eab60f2 is already in history

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

Change-Id: Id338f4ffe6d94f2552281c47c5589739604c5fc0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-24 00:06:14 +00:00
TreeHugger Robot
7828afe859 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 94061be6ee -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I29c94990fd4fd817084566ded10bb1bc851ebcec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-24 00:04:10 +00:00
Bill Yi
2819fde801 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c60e7098d2 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I09548afe761010b4909cc3a2453d1980776d6b15
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-24 00:03:59 +00:00
TreeHugger Robot
49a681bb37 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev 2022-06-23 11:24:26 +00:00
TreeHugger Robot
f08bf7780a Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev 2022-06-23 11:24:26 +00:00
Bonian Chen
31b8174c10 Merge "[Settings] Avoid from close dialog when touch outside." into tm-dev am: c5fc5db0e7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18869528

Change-Id: I7484149765a66e9c9beeeac1bb9dd596670a6ba8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-23 04:27:06 +00:00
Bonian Chen
c5fc5db0e7 Merge "[Settings] Avoid from close dialog when touch outside." into tm-dev 2022-06-23 04:08:21 +00:00
Bill Yi
07bfd0bbd9 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I7201ffacb47728950b9799b2c72db212dc290df7
 2022-06-22 19:10:00 -07:00
Bill Yi
b070ddda17 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I2d6dbb4522ef217b94075bb4999a5276f983095f
 2022-06-22 19:05:21 -07:00
Salud Lemus
7e3c6913d3 Merge "Fix title used for financed device info in Settings" into tm-dev am: bb149294dd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18934542

Change-Id: I6237d72f20faa1961a5e7005244c8f0962bf891f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-22 22:49:19 +00:00
Salud Lemus
bb149294dd Merge "Fix title used for financed device info in Settings" into tm-dev 2022-06-22 22:33:18 +00:00
Bonian Chen
e941740b35 Merge "[Settings] Adjusted the API of Settings app" into tm-dev am: 29a00dbc31 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18660040

Change-Id: I8c39ef8a089394c52b5a80ea98fa77f2ab0f2ab8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-22 19:25:48 +00:00
Bonian Chen
29a00dbc31 Merge "[Settings] Adjusted the API of Settings app" into tm-dev 2022-06-22 18:59:54 +00:00
Oriol Prieto Gascó
0dfc94f668 Merge "Use com.android.bluetooth as the BT stack APK" into tm-dev am: d6166e42a0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18981799

Change-Id: I0af1ada1c42fe907243bcde356f51d8302bfb5c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-22 17:45:17 +00:00
Oriol Prieto Gascó
d6166e42a0 Merge "Use com.android.bluetooth as the BT stack APK" into tm-dev 2022-06-22 17:18:45 +00:00
Bonian Chen
d10618d489 [Settings] Adjusted the API of Settings app 
The API of Settings app get changed in order to support large screen.
This is a fix to adopt the change related to this work.

A short brief:
1. Accept ACTION_MAIN for launching MobileNetworkActivity.
2. Support deep-link intent while MobileNetworkActivity in foreground.
3. Avoid from binding MobileNetworkActivity as a single instance.

Bug: 230047450
Bug: 234406562
Bug: 229371407
Test: local & unittest
Change-Id: Ifcb9d4c564839199d998bd503f390f021c6bf3ad
 2022-06-22 07:51:47 +08:00
TreeHugger Robot
16a6989a3e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: d9fba9380a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id68dad65a41f070989c3af1eb9a771ac36694d0e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-21 16:23:39 +00:00
Bill Yi
8c356181d3 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fabd8de898 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7bc9900be8bff52607e50c04e5101bf155722e03
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-21 16:23:33 +00:00
Bill Yi
ba3e9a0be7 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1b92a98891 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib124601d7cf447559e33a4e6b863c0d6ad33aff4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-21 16:23:24 +00:00
TreeHugger Robot
d9fba9380a Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-06-21 16:17:20 +00:00
Bill Yi
1b92a98891 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I6239cc468a57eec0e714dab336bf2a913b54267e
 2022-06-21 04:15:29 -07:00
Bill Yi
fabd8de898 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I99e5ebe3a8c58c3c9dd9ba74a3081aed861c859b
 2022-06-21 04:11:01 -07:00
Bill Yi
382bed292d Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I3c1724acd927e61e022d74d348092d256d2072ed
 2022-06-20 23:19:45 -07:00
Bill Yi
2714015bac Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I09a80efa89b4558201beeb22aa7c854b2e86096e
 2022-06-20 23:15:51 -07:00
SongFerngWang
6426382e90 The UI only shows the active LE device 
At the media device, it only shows the active LE device which is
connected.

Bug: 232892046
Test: make RunSettingsRoboTests ROBOTEST_FILTER=AvailableMediaBluetoothDeviceUpdaterTest
make RunSettingsRoboTests ROBOTEST_FILTER=ConnectedBluetoothDeviceUpdaterTest
make RunSettingsRoboTests ROBOTEST_FILTER=SavedBluetoothDeviceUpdaterTest

Change-Id: Iac661206def4d43bc40ab9bb1938f084926899c2
 2022-06-20 21:30:34 +08:00
TreeHugger Robot
90884f3225 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev 2022-06-20 07:40:11 +00:00
Bill Yi
85204b39fd [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e00a15d95f -s ours am: 4066539cc9 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id627f73cebdb6c2192ed74ef77e68381b5342870
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-20 07:35:58 +00:00
Bill Yi
3caf5ab605 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 980d88cc0d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie1defe5780a660c7ab64d607407a7b73de010fa9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-20 07:31:35 +00:00
SongFerngWang
5221cb21bd Fix the NullPointException am: 5a4df243f0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18921546

Change-Id: Ifcb7bb32737ee460e8ddbcf7730426017fc018db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-20 07:28:03 +00:00
Bill Yi
4066539cc9 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e00a15d95f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I10ea6e14ee85058126a4fedee4265fd4b651e4fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-20 07:24:43 +00:00
Oriol Prieto Gasco
f528e7de49 Use com.android.bluetooth as the BT stack APK 
Test: TH
Bug: 236187653, 236192423
Change-Id: Ia86d195780a4994607b5533420cb72bd458d4f9a
 2022-06-19 23:06:06 +00:00