PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
97,248 Commits 1 Branch 0 Tags
84ddf1452cb4c86a1f64b0eb787c3e15e0de5963
Commit Graph

97248 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
84ddf1452c [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 247075dcd5 am: bace1bf648 -s ours am: 1aa1369fd8 -s ours am: 7939993517 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I01fa957cac9e83f178b3d437757394c69f2a4dd0
 2021-10-22 01:51:12 +00:00
Bill Yi
e4666489dd [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 52146b1b0a -s ours am: 9b4af9ca03 -s ours am: 6d0d3e2d81 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie0bfa219ad297c5dabc680257237192e1d50e9f1
 2021-10-22 01:50:36 +00:00
Bill Yi
7939993517 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 247075dcd5 am: bace1bf648 -s ours am: 1aa1369fd8 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5bb931e43e2115ec047c72a3bbdf71ea1939fd96
 2021-10-22 01:37:55 +00:00
Bill Yi
6d0d3e2d81 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 52146b1b0a -s ours am: 9b4af9ca03 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I337b89b36a85c2d55e90d4d712a32bedc1637c43
 2021-10-22 01:37:44 +00:00
Bill Yi
1aa1369fd8 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 247075dcd5 am: bace1bf648 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id40fd4e26953fcf755ac5ea6cc4643720a199e58
 2021-10-22 01:21:56 +00:00
Bill Yi
9b4af9ca03 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 52146b1b0a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I93be458d57eb11d851fcf6570e1dc12345ebc661
 2021-10-22 01:21:39 +00:00
TreeHugger Robot
bfa31dcc4d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 2695589c47 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I95bfec8a1e8327ccabf45f338a5a51ba52ab6837
 2021-10-22 01:20:23 +00:00
TreeHugger Robot
40867ec6ea [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 0c4b29958b -s ours am: 7288675fec -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I34f6ab29dc6a0c61e8482a268072ea7a31bbf0c6
 2021-10-22 01:19:55 +00:00
TreeHugger Robot
2695589c47 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod 2021-10-22 01:10:24 +00:00
TreeHugger Robot
7fceed0bbe Merge changes from topic "presubmit-am-de00ef94fed748d48fb5792e0702e81b" 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 691a937581
  Import translations. DO NOT MERGE ANYWHERE
 2021-10-22 01:10:24 +00:00
TreeHugger Robot
b2eab9faab Merge changes from topic "presubmit-am-7ec75ddcc57e4269a8bd00190c66c479" 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 247075dcd5 2p: d8be8ad5f2
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 247075dcd5
  Import translations. DO NOT MERGE ANYWHERE
 2021-10-22 01:04:30 +00:00
TreeHugger Robot
7288675fec [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 0c4b29958b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0a5a0b0f61da0053d5e2376d924228509848102d
 2021-10-22 01:04:08 +00:00
TreeHugger Robot
a2927a326b Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-10-22 00:55:18 +00:00
TreeHugger Robot
0c4b29958b Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2021-10-22 00:49:01 +00:00
TreeHugger Robot
d1118678b1 [automerger skipped] Merge "RESTRICT AUTOMERGE Remove connection preferences "Files received via Bluetooth"" into sc-v2-dev am: c1770fe4cf am: c635251a94 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I97324fe9877d635665e908c74f7983535317dd06
 2021-10-21 15:35:37 +00:00
Chienyuan
4954064840 [automerger skipped] RESTRICT AUTOMERGE Remove connection preferences "Files received via Bluetooth" am: 1b9a21ffb5 am: f06def46f7 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If3bf074c153b78d95eceeaaa7bb8eeb0bee30136
 2021-10-21 15:35:35 +00:00
TreeHugger Robot
c635251a94 Merge "RESTRICT AUTOMERGE Remove connection preferences "Files received via Bluetooth"" into sc-v2-dev am: c1770fe4cf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16048451

Change-Id: Ic24c74bff7c2c88d558620897500b4f560a81f7f
 2021-10-21 15:18:18 +00:00
Chienyuan
f06def46f7 RESTRICT AUTOMERGE Remove connection preferences "Files received via Bluetooth" am: 1b9a21ffb5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16048451

Change-Id: I7a693b6644e200a7aa66f09704e39c178aa2baa7
 2021-10-21 15:18:13 +00:00
TreeHugger Robot
c1770fe4cf Merge "RESTRICT AUTOMERGE Remove connection preferences "Files received via Bluetooth"" into sc-v2-dev 2021-10-21 15:04:46 +00:00
Julia Reynolds
0bbff606f2 Merge "Remove unused code" 2021-10-21 14:44:15 +00:00
Weng Su
256ca716c0 Merge "Keep compatibility for old WiFi shortcut" am: ab7640dcd9 am: 400e5b0fba am: 8cf3250517 am: 76e3973684 am: e155a7b61d 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1853101

Change-Id: I1cf85ca6c59ab6d6d20ca17d235aeabc5d300a9d
 2021-10-21 13:47:47 +00:00
Weng Su
e155a7b61d Merge "Keep compatibility for old WiFi shortcut" am: ab7640dcd9 am: 400e5b0fba am: 8cf3250517 am: 76e3973684 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1853101

Change-Id: Ic5115a90c11784019c2be7b1ef7c8a47de02e846
 2021-10-21 13:37:59 +00:00
Weng Su
76e3973684 Merge "Keep compatibility for old WiFi shortcut" am: ab7640dcd9 am: 400e5b0fba am: 8cf3250517 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1853101

Change-Id: Ifc9692777cd4e99ee358a4599317b69a619745ac
 2021-10-21 13:20:13 +00:00
Weng Su
8cf3250517 Merge "Keep compatibility for old WiFi shortcut" am: ab7640dcd9 am: 400e5b0fba 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1853101

Change-Id: Idb08b9650e7c5efce4ab40eb949ccab0e5949333
 2021-10-21 13:10:56 +00:00
Weng Su
400e5b0fba Merge "Keep compatibility for old WiFi shortcut" am: ab7640dcd9 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1853101

Change-Id: I44f373cab6a829af3e08ab95d62d53a42516d41a
 2021-10-21 12:56:02 +00:00
Betty Chang
bce2922780 Merge "Remove the Advanced item when Security type is open" into sc-v2-dev am: 54abe8fac8 am: 42fe8e4d59 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16091077

Change-Id: Ib847e9ae43683f2ca66617e203015c34afa0344f
 2021-10-21 12:55:04 +00:00
Weng Su
ab7640dcd9 Merge "Keep compatibility for old WiFi shortcut" 2021-10-21 12:38:12 +00:00
Betty Chang
42fe8e4d59 Merge "Remove the Advanced item when Security type is open" into sc-v2-dev am: 54abe8fac8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16091077

Change-Id: I738cf43b802c21afc59d3ca277b8b690ab8e0877
 2021-10-21 12:38:10 +00:00
Betty Chang
54abe8fac8 Merge "Remove the Advanced item when Security type is open" into sc-v2-dev 2021-10-21 12:23:59 +00:00
Sergey Nikolaienkov
607409c49c Merge "Use new constructor for CDM's Associations" 2021-10-21 12:01:13 +00:00
Yanting Yang
4d30055853 Merge "Rephrase dialog message of clear storage dialog for security concern" into sc-v2-dev am: 06ebebdf0f am: 260365b00a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16081488

Change-Id: Id0e945a93fb4dde5b713c90bd89015d571189c2b
 2021-10-21 11:13:03 +00:00
Yanting Yang
260365b00a Merge "Rephrase dialog message of clear storage dialog for security concern" into sc-v2-dev am: 06ebebdf0f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16081488

Change-Id: If2595b9b8fafcb138e692a2cc35cd378f5524f2b
 2021-10-21 11:09:06 +00:00
YUKAI HUNG
265d683dc1 Merge "Update app usage page power summary" into sc-v2-dev am: 8e97bdd76c am: 054f3b5199 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16091765

Change-Id: Ic7bf43d79304b740b5b6cf2a148b317860ea4869
 2021-10-21 11:08:48 +00:00
Yanting Yang
06ebebdf0f Merge "Rephrase dialog message of clear storage dialog for security concern" into sc-v2-dev 2021-10-21 10:52:25 +00:00
YUKAI HUNG
054f3b5199 Merge "Update app usage page power summary" into sc-v2-dev am: 8e97bdd76c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16091765

Change-Id: Ifbe0fee50f01f00784bd65aa6124081b41b1f3c7
 2021-10-21 10:48:11 +00:00
YUKAI HUNG
8e97bdd76c Merge "Update app usage page power summary" into sc-v2-dev 2021-10-21 10:31:31 +00:00
Wesley.CW Wang
23a5fb5e74 Update app usage page power summary 
- Present empty string when this app consumed power but no usage time,
 usually they are some system components

Bug: 197749108
Test: make -j64 RunSettingsRoboTest
Change-Id: I1e88babb30c871748fa1f5fc23c7b4d834e384fd
 2021-10-21 17:29:36 +08:00
Bill Yi
34f9c66cf0 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I8d64b289a352c07336d55b2d561a5855934c5d8b
 2021-10-21 08:20:09 +00:00
Bill Yi
52146b1b0a Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Idf72f0b25491f38f592613b85cd7e20c5935681a
 2021-10-21 08:16:13 +00:00
Bill Yi
55387e1a48 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 247075dcd5 2p: d8be8ad5f2 
Blank merge reason: parent was merged -s ours

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

Change-Id: I50564b2434b40a1b96e52dc77d89aea49bc69653
 2021-10-21 08:12:49 +00:00
Bill Yi
bace1bf648 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 247075dcd5 
Blank merge reason: commit message contains skip directive

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

Change-Id: Ic81a43d273bbb6f70c73eab5b8c2ea43a3684bf8
 2021-10-21 08:12:44 +00:00
Bill Yi
d8be8ad5f2 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 247075dcd5 
Blank merge reason: commit message contains skip directive

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

Change-Id: I990be2a057aedc3a465a6547af9b782d51096eda
 2021-10-21 08:12:44 +00:00
Bill Yi
247075dcd5 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ia2cd9e21b6ad60ef3f4ebabdc7fbe77c752c34f0
 2021-10-21 08:12:37 +00:00
Bill Yi
47c3f79249 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I4ed723b68cf979f2d12cb6833bfd24eac15e8eca
 2021-10-21 08:08:40 +00:00
Bill Yi
667fece2ac [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 691a937581 
Blank merge reason: commit message contains skip directive

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

Change-Id: I06df1727df3cfccd257ad2e7bff3e63141d213c6
 2021-10-21 07:58:13 +00:00
Bill Yi
691a937581 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I3dd32e24bc59c003587d57c0b26107bd93777e90
 2021-10-21 07:58:04 +00:00
Sergey Nikolaienkov
52ab4af51f Use new constructor for CDM's Associations 
Bug: 197933995
Test: make SettingsRoboTests
Change-Id: I6097053a9a58128366f5d12b918d3e0721d752f2
 2021-10-21 07:53:41 +00:00
changbetty
6ceab7b916 Remove the Advanced item when Security type is open 
Bug: 202674761
Test: Manual test
Test: make RunSettingsRoboTests ROBOTEST_FILTER=WifiTetherSettingsTest
Change-Id: Iaac76a5a1370d5f9fcea2e1aaa0f02310ed4a5a3
 2021-10-21 05:51:20 +00:00
Julia Reynolds
ac8911fda8 Remove unused code 
Test: make
Bug: 194833441
Change-Id: I99a91281fd8f8a347f80ebfa881eafb960d7f144
 2021-10-20 13:20:33 -04:00
Jason Hsu
f876306c36 Merge "Fix software shortcut in dialog did not update when content change." into sc-v2-dev am: 56e82fe112 am: 33914ed556 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16005288

Change-Id: I061d40c46ff678d6199db650e212d32d23ce57db
 2021-10-20 10:42:01 +00:00