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

103316 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
c0473f683a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: b299745a6c -s ours am: c53da610b2 -s ours am: f26007c8ef -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic25e06d7ff34f2d46236d40b25a3b6d2e5336c6e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 18:36:31 +00:00
Bill Yi
d975bfd607 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ca510b1550 -s ours am: 57b6374513 -s ours am: 006db32086 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ifb5919cb0820eb6489fca924977c81612cbc3b7c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 18:36:28 +00:00
TreeHugger Robot
a5a1c5710e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 940c2d25fb -s ours am: d22b43c6a5 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6370b4b7c11bdb4d2514c601acd93b141060e7a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 18:14:55 +00:00
Bill Yi
db2dfb95da [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e658709ef2 -s ours am: 812e79c8cf -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I86f0b1dc43806b330b5d18f36aba3dea181b14ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 18:14:52 +00:00
TreeHugger Robot
f26007c8ef [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: b299745a6c -s ours am: c53da610b2 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id50ca54e69d4273ef635cce3db7f15ded82a0163
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 18:14:04 +00:00
Bill Yi
006db32086 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ca510b1550 -s ours am: 57b6374513 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I511a9059ccf3c323d7eb7cc96438b3c27bff6bf9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 18:14:00 +00:00
TreeHugger Robot
d22b43c6a5 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 940c2d25fb -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib8d08684f79433ec17dfad8daf29de4e23b28eb1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 17:47:26 +00:00
Bill Yi
812e79c8cf [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e658709ef2 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic507bfd58ddae3eef0b30505327b18ceac24e676
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 17:47:24 +00:00
Bill Yi
57e6a29f1a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: b67694c1cb -s ours am: 20efc0cc64 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I27a6f80388bbf495a621c9323c3e21d905773f8e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 17:47:16 +00:00
TreeHugger Robot
c53da610b2 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: b299745a6c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If3fcaae0791677a5244d0006375b38f09847194a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 17:47:15 +00:00
Bill Yi
d700cfe212 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 76f5b29384 -s ours am: 4b073cf421 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8151cc6183dee4aca9e57a8884ef975c08f38f22
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 17:47:15 +00:00
Bill Yi
57b6374513 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ca510b1550 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1a89457b55725eb781c4106d2a15ee53a15d7dd1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 17:47:01 +00:00
TreeHugger Robot
1fd59e05d9 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: e3b581c350 -s ours am: 0312b67407 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ied28975e9ee048034465f7a680b2349d52133e20
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 17:46:03 +00:00
Lucas Silva
f8c7a84eb8 Merge "Add hyphenation to customize button text." into tm-dev am: b31dbbb1cf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17758405

Change-Id: I087523825288400c738a188c04ac5d9bea53a3da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 17:45:16 +00:00
TreeHugger Robot
e9c60d9d72 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 2212edb907 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I504a845295c3f73bf08f3f26e464c412789f36f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 17:45:00 +00:00
Bill Yi
942891fc3c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 23f2bfb3a3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I427dcfa9066828733b05add13eaff191c9d0180b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 17:44:59 +00:00
TreeHugger Robot
0ec6ee3588 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 2880f9c765 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic21ba199682d8fbdb941775739ac79a2b1b9c7a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 17:44:08 +00:00
Bill Yi
da6144dcbd [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b31a221ace -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iff358f9dff5601de01a21e17ccc59d050183d9d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 17:44:07 +00:00
Bill Yi
20efc0cc64 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: b67694c1cb -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9ba51c4cd89e5182cdc096a4b18179e5a641405e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 17:40:13 +00:00
Bill Yi
4b073cf421 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 76f5b29384 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0ddd79cb6636eba32d51861c90fd5f5bfcf1bacf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 17:40:08 +00:00
TreeHugger Robot
fe3d04de86 Merge changes from topic "presubmit-am-5e82c0fb6c2a413f9587cafc2046d978" into tm-dev am: 55e91da24e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17745184

Change-Id: I9cecbd87511cb97a05fff121fac736e26f140ce3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 17:39:59 +00:00
Bill Yi
7044a2ee63 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 17b4bfa5b0 am: 5a7f4fcb00 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib0ae216d77188d560933313a35a1b02196a22737
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 17:39:58 +00:00
TreeHugger Robot
0312b67407 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: e3b581c350 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I26e318e71a59517302ae0db449f649f586766093
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 17:39:34 +00:00
Lucas Silva
b31dbbb1cf Merge "Add hyphenation to customize button text." into tm-dev 2022-04-14 17:39:13 +00:00
Victor Truong
05e824e9e0 Set Active dream to not be clickable when active. 
Setting Active dream to not be clickable to stop Talkback from prompting
user to "Double tap to activate".

Bug: 228573813
Test: Manually tested on device.
Change-Id: I5f646bcf82d8c4172127f0739b6c0d7af890dabb
 2022-04-14 17:38:26 +00:00
Bill Yi
b67694c1cb Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod 2022-04-14 17:17:45 +00:00
Bill Yi
89a0c5fb00 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev 2022-04-14 17:16:07 +00:00
Bill Yi
08549ed959 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev 2022-04-14 17:14:41 +00:00
TreeHugger Robot
940c2d25fb Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2022-04-14 17:12:57 +00:00
TreeHugger Robot
b299745a6c Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2022-04-14 17:12:54 +00:00
TreeHugger Robot
2212edb907 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-04-14 17:10:29 +00:00
TreeHugger Robot
2880f9c765 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-04-14 17:08:33 +00:00
TreeHugger Robot
55e91da24e Merge changes from topic "presubmit-am-5e82c0fb6c2a413f9587cafc2046d978" into tm-dev 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 17b4bfa5b0
  Import translations. DO NOT MERGE ANYWHERE
 2022-04-14 17:08:18 +00:00
TreeHugger Robot
e3b581c350 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod 2022-04-14 17:08:18 +00:00
Yuri Lin
554ab1fe3e Special handling for intent coming from "welcome" notification. 
This notification is an introduction to new notification permission changes in T and is shown to the user upon upgrade; this change records that the user has seen/interacted with the notification already so we don't have to keep showing it.

This change essentially makes a copy of the existing functionality of NotificationAppListActivity, but meant only for access internally (so that neither the activity nor the associated action is exported/publicly accessible).

Bug: 225373531
Test: manual with the change that sends the notification
Change-Id: I20c6084652ea11a8d0a002a21561fe50b9cf5de3
 2022-04-14 12:54:56 -04:00
TreeHugger Robot
de1481d68a Merge "Add 2 pixels to top of Advanced Options component" into tm-dev am: 37c2ac2c6a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17745804

Change-Id: I675e9e5e1100c91eb01639a020be65f0bdd47e64
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 16:34:59 +00:00
Quang Luong
0bbdf3a983 Merge "Use WifiEntry.getStandardString() for Wi-Fi Type summary" into tm-dev am: 93ae7acbf4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17483256

Change-Id: I6839b69c92f10905e1386c0a4555a4c980eccebc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 16:34:52 +00:00
TreeHugger Robot
37c2ac2c6a Merge "Add 2 pixels to top of Advanced Options component" into tm-dev 2022-04-14 16:28:11 +00:00
Quang Luong
93ae7acbf4 Merge "Use WifiEntry.getStandardString() for Wi-Fi Type summary" into tm-dev 2022-04-14 16:14:21 +00:00
Tsung-Mao Fang
de992a99f8 Merge "Use androidx.window from prebuilt." into tm-dev am: 7877c073e5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17644388

Change-Id: I89af98755aef258bfa9234bcdd490ca9a43c9e94
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 15:05:45 +00:00
Lucas Silva
1ccbf8b7d5 Add hyphenation to customize button text. 
In some languages, customize may be a long word which doesn't fit in a
single line and should be hyphenated.

Bug: 228329886
Test: locally on device
Change-Id: Ibf647fc4c18b3eb927f2b6f6ca018f2b38e6f7b1
 2022-04-14 14:48:14 +00:00
Tsung-Mao Fang
7877c073e5 Merge "Use androidx.window from prebuilt." into tm-dev 2022-04-14 14:40:21 +00:00
YK Hung
fe2e6b19d8 Merge "Pass the activtiy launch flags into the AdvancedPowerUsageDetail" into tm-dev am: 3a08246bd9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17751849

Change-Id: If8eba2fe329e9b4d078d2b9d25bc345480d9a64b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 14:33:31 +00:00
YK Hung
3a08246bd9 Merge "Pass the activtiy launch flags into the AdvancedPowerUsageDetail" into tm-dev 2022-04-14 14:12:33 +00:00
ykhung
39972db17d Pass the activtiy launch flags into the AdvancedPowerUsageDetail 
Bug: 227978302
Test: manual
Change-Id: I036bc90eb91fd59137b51817665378f218bbad1a
 2022-04-14 19:57:14 +08:00
SongFerng Wang
97b86392fb [automerger skipped] Merge changes I6871db6c,Ia261e3b4,I1588bd4a,I1b81faf0,I9a596440, ... am: 3e9e489c0c am: 459429c182 am: 9d10f0a9fb -s ours am: 68defd99f1 -s ours 
am skip reason: Merged-In I6871db6c2d8d7b9f3cb334bb5cd2c7978b5b3b85 with SHA-1 506c3df5b9 is already in history

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

Change-Id: Ida9b92e9fabcbdef72e5b011829c658796f7ba7a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 10:35:23 +00:00
SongFerngWang
11213d623e [automerger skipped] In E+E, the user can't enable the PSIM am: ccd55cc5c9 am: 6282d8a5de am: 10d36c9800 -s ours am: d1ae5c3d08 -s ours 
am skip reason: Merged-In Ia261e3b41c6c4a43a5429815d93ae9f6ff16f0ec with SHA-1 68cfaafe73 is already in history

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

Change-Id: I08f71204bde6bc3ac730cf9b118de9b3af66caf7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 10:35:22 +00:00
SongFerngWang
cc06f67db0 [automerger skipped] [MEP] psim's logical slot index is 0 am: 2479c9f7bd am: 83311b6208 am: bca382eefb -s ours am: f137d36ea7 -s ours 
am skip reason: Merged-In I1588bd4a2f552a6b41844883b6ad50f1bfec95de with SHA-1 0b948c827b is already in history

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

Change-Id: I26e1533faafa71b8bb4a068c0dee15ba62ff0cd5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 10:35:21 +00:00
SongFerngWang
bd457c3c5c [automerger skipped] [MEP] The condition of "null point check" is wrong am: 5c0df6913b am: 6a0742b2fb am: ffdf3513ec -s ours am: d625370f83 -s ours 
am skip reason: Merged-In I1b81faf082163643c1d17eae2f66d75b450288fe with SHA-1 ce8232d0a4 is already in history

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

Change-Id: I0e42a5db8d4449133810982658b8da7c242d82c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 10:35:19 +00:00
SongFerngWang
8c636211e4 [automerger skipped] Fix the settings crash when SimDialogActivity is null am: d786b64ff6 am: a800c05ac7 am: d65110a8ff -s ours am: 444690e5ec -s ours 
am skip reason: Merged-In I9a5964400a63053e362632944b9e7aa8ec1bbea8 with SHA-1 a3b98f5d04 is already in history

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

Change-Id: Ice4340331914db9b888587944a2bb6d9fbc9797d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 10:35:18 +00:00