PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
103,688 Commits 1 Branch 0 Tags
e6613a454ea87c0246573a85fc1475a54c497314
Commit Graph

103688 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Arc Wang
2f6114e8ee [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: I26573352d10be10abf88be972d7462b6224af689
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-24 00:29:21 +00:00
TreeHugger Robot
7aef2a082f [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: I048eeda38556a07693785b7ea96b322edd225c5c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-24 00:28:53 +00:00
Bill Yi
b0c3d40284 [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: Ifd346dd88f15a3fda7689b0c7d1f34563d861b69
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-24 00:28:47 +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
Bonian Chen
b88828b155 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: I5bd96bac8e7313ec76a461a0d4e453da90ba9072
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-23 04:25:38 +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
071719856d 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: I48ec660d0ac6aecd3a28368a3b2035dbfb6fe297
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-22 22:47:52 +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
e9cdc176a6 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: I8391c6e89654e3595a496de6da4485f27834bfda
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-22 19:24:20 +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ó
10e5657a39 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: I7fcfd55573d121122867893a5624c297a1f18653
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-22 17:43:23 +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
c00d5a7f5d [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: Ib3dea3a493038f22ed97886bd0c25b6373777056
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-21 16:39:20 +00:00
Bill Yi
d753deda12 [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: Ie5f49d9c904c50b3b92e3892107b3617986ccb9c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-21 16:39:15 +00:00
Bill Yi
3f823f660a [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: I9c75de2e6515a2d7fe252960d660b1d1bc03c860
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-21 16:39:06 +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
d32b801680 [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: I06f07b7b02f0901e7a68bdad53e88608e5e6eb74
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-20 07:35:23 +00:00
Bill Yi
12d891d823 [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: I7fdb09f6363a6ba36ff1907de0146ff7406163a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-20 07:30:37 +00:00
SongFerngWang
fd583a0459 Fix the NullPointException am: 5a4df243f0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18921546

Change-Id: Icb8aae31d833d27bb64040af296f096471838785
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-20 07:27:56 +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
Bill Yi
e00a15d95f Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I0be2cdb059a4b42e7a9f73d91ca859c9832a3bb3
 2022-06-18 19:47:16 -07:00
Bill Yi
980d88cc0d Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I8e73269e1f3bd05c9ffbeb56659b9d1bac5aad55
 2022-06-18 19:20:22 -07:00
Bill Yi
49b4ab94b7 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I8f85c7cccfc1b44e604611c4499245812136ea1d
 2022-06-18 18:57:39 -07:00
Treehugger Robot
42a9ac3a7c [automerger skipped] Merge "DO NOT MERGE - Skip SQ3A.220605.009" am: 2b57ca5c98 -s ours am: 29531e9296 -s ours 
am skip reason: Merged-In I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3 with SHA-1 d0a23dc840 is already in history

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

Change-Id: Iff96edc9a2fda29fbeba6650aa1edf54d23ac238
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-17 21:28:27 +00:00
Xin Li
39dd57ee3a [automerger skipped] DO NOT MERGE - Skip SQ3A.220605.009 am: 25fdacad92 -s ours am: a3ca7b04eb -s ours 
am skip reason: Merged-In I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3 with SHA-1 d0a23dc840 is already in history

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

Change-Id: Ie9f798529f14ac40361f03583c5f2d3acda169e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-17 21:27:27 +00:00
Treehugger Robot
29531e9296 [automerger skipped] Merge "DO NOT MERGE - Skip SQ3A.220605.009" am: 2b57ca5c98 -s ours 
am skip reason: Merged-In I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3 with SHA-1 d0a23dc840 is already in history

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

Change-Id: I5992b8ca6c5293098ff6d8f3f5ebfd09415de471
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-17 20:07:25 +00:00
Xin Li
a3ca7b04eb [automerger skipped] DO NOT MERGE - Skip SQ3A.220605.009 am: 25fdacad92 -s ours 
am skip reason: Merged-In I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3 with SHA-1 d0a23dc840 is already in history

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

Change-Id: Ie4d02f376d95fdd7ce9c3c54746e32b3df2f18e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-17 20:06:31 +00:00
Treehugger Robot
2b57ca5c98 Merge "DO NOT MERGE - Skip SQ3A.220605.009" 2022-06-17 14:29:01 +00:00
Xin Li
25fdacad92 DO NOT MERGE - Skip SQ3A.220605.009 
Bug: 236045730
Merged-In: I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3
Change-Id: I7ea531b8f0c9f1adad00b497ae6033531416905d
 2022-06-16 22:50:46 -07:00
Xin Li
4642c65d0a [automerger skipped] Merge "Merge Android 12 QPR 3" am: a258d7760f -s ours am: 403c3de881 -s ours 
am skip reason: Merged-In Ie1e14a6b697af624854a9360a60383fac63bb02c with SHA-1 a5a729f523 is already in history

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

Change-Id: I5c7844643c9410751d52a366d2f2aa9c43439035
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-17 00:15:31 +00:00
Xin Li
a073091919 [automerger skipped] Merge Android 12 QPR 3 am: d6c80bd8e3 -s ours am: 8d42cc939b -s ours 
am skip reason: Merged-In Ie1e14a6b697af624854a9360a60383fac63bb02c with SHA-1 a5a729f523 is already in history

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

Change-Id: I1316d5e48662fdcec04c12a98ea2b49ffe090cd8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-17 00:14:14 +00:00