PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
102,645 Commits 1 Branch 0 Tags
1a83cbde6df1a65944260759859852ad1b49ec4c
Commit Graph

102645 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
1a83cbde6d Merge "Set Active dream to not be clickable when active." into tm-dev am: 2f178cfdf3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17760486

Change-Id: I8d698fa9b66d38751155cc03d5cbfc6b9a5165e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 20:07:17 +00:00
TreeHugger Robot
2f178cfdf3 Merge "Set Active dream to not be clickable when active." into tm-dev 2022-04-14 19:41:32 +00:00
TreeHugger Robot
edfab288ee [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 940c2d25fb -s ours am: d22b43c6a5 -s ours am: a5a1c5710e -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: Ide621c4e166819a8536b3a90cc867f5133ba5b9c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 18:35:51 +00:00
Bill Yi
51bb20b3d5 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e658709ef2 -s ours am: 812e79c8cf -s ours am: db2dfb95da -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: I21e6b1da5e9f34d8d7ac15e7b9df806eaa0cf817
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 18:35:50 +00:00
TreeHugger Robot
e7eaab7e60 [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: Iccbf6d891e5ce1d1c79aa5aa99a0a5e6b827d0b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 18:35:17 +00:00
Bill Yi
8aed68a1e6 [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: If26e9374379b7748fd4aae371d07b62b92f7231f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 18:35:16 +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
35b98a573e [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: I79c3fb4cbe83a82d9c83a3c2ae028037ebf79b34
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 17:47:17 +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
bcf07d3494 [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: I8aebed68ff4e19df907c0c16c056c593b8fd78b0
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
707734caa1 [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: I529b821168f8e3be3592b34579be9c2759af189a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 17:45:39 +00:00
Lucas Silva
2e5ef5b243 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: I2516875810ba4edae05d1daad596b1933606aae9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 17:44:32 +00:00
TreeHugger Robot
36d4b842e3 [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: I5792ad63d89d471affddece516ca08d06bb78737
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 17:43:40 +00:00
Bill Yi
1c67732678 [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: I7a762b8a1c98dbbcd6f3194bd09dad319e2b4eb6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 17:43:39 +00:00
TreeHugger Robot
ff58aef35b [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: I0fb1f858e0c0e847a3854b89ac7c871448b7e6fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 17:42:02 +00:00
Bill Yi
52fcdc6fdc [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: I468e46e474d51c23548dede40b5ab66efa0a3a28
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 17:42:01 +00:00
TreeHugger Robot
ff1617a8fb 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: I932f20402f1e84ad4f3e388996600f283e7aba16
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 17:40:20 +00:00
Bill Yi
c5dc2de7c5 [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: Ib60d65d3794dcd1f814bc8cc0c96bf83c47729df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 17:40:19 +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
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
8d00d149a6 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod 2022-04-14 17:17:57 +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
b0765d9675 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod 2022-04-14 17:17:29 +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
TreeHugger Robot
d23bd16dd7 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: I1ff64d526b48eb492a3a5a2a8a5a700f8b32192f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 16:33:58 +00:00
Quang Luong
6f7a9b88ba 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: I1193e74c90338de9a110f73dae40aaf07df556c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 16:33:51 +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
6c02827b8b 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: I364f2fe39496649d00752c01e7e88f8754c0e4c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 15:04:40 +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
2fbedfdb5d 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: I77a0e7e80ddd64f6cf3ece887585daf279eb396c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 14:32:22 +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
9b8939238a [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: Ib527629497de7581d7bfa99da2d40b5c1ae5790c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 10:34:33 +00:00
SongFerngWang
8c63cd8943 [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: I9d60ef1d005f6c4ba004813ab5d0880c10aa6eef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 10:34:31 +00:00