PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
116,753 Commits 1 Branch 0 Tags
bb4d0250bbf44ac7aeb8501bee8a86cfdb6fe94e
Commit Graph

116753 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tim Peng
b0bef1c529 [automerger skipped] Merge "RESTRICT AUTOMERGE Refactoring settings UI" into tm-qpr-dev am: 67537336a6 am: f315f0c89f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0d965af3a79b703aba6296ad02ebcfd06a826cea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-12 07:08:17 +00:00
Hugh Chen
8ae452f48b [automerger skipped] RESTRICT AUTOMERGE Refactoring settings UI am: f891f7ba86 am: b1fac0fb92 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ida5f9d23c16e6d0f13e12b17183963222b19971b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-12 07:08:10 +00:00
TreeHugger Robot
f4e14e153b Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev 2022-10-12 06:55:58 +00:00
TreeHugger Robot
4cddf997d6 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev 2022-10-12 06:55:58 +00:00
TreeHugger Robot
24c7d47de2 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev 2022-10-12 06:55:58 +00:00
Chaohui Wang
4357589771 Use getStorageSize from SpaPrivilegedLib 
Bug: 236346018
Test: Manual with "All App" App List
Change-Id: If05f334eea365f23e8fc7d7452aed4603c9cdc30
 2022-10-12 14:47:28 +08:00
Tim Peng
f315f0c89f Merge "RESTRICT AUTOMERGE Refactoring settings UI" into tm-qpr-dev am: 67537336a6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20034710

Change-Id: I16b44dc7bb298426b37669579fc9b175152d3a34
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-12 06:35:55 +00:00
Hugh Chen
b1fac0fb92 RESTRICT AUTOMERGE Refactoring settings UI am: f891f7ba86 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20034710

Change-Id: I2e6bb7660f690b2aa2db5a2ef4c628e406d674c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-12 06:35:46 +00:00
Josh Hou
2c4f8fd26f Merge "[Panlingual] Separate the app locale information by profiles" into tm-qpr-dev am: 9c2e35244d am: b589be652d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20064275

Change-Id: Id41300275c5fa7fde6d688419dc7f4d526ea8da5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-12 06:07:17 +00:00
Tim Peng
67537336a6 Merge "RESTRICT AUTOMERGE Refactoring settings UI" into tm-qpr-dev 2022-10-12 06:01:43 +00:00
Wei Wang
f71883b2bb Merge "Fix tests broken by below CL:" 2022-10-12 05:54:54 +00:00
Wei Wang
878ce96163 Fix tests broken by below CL: 
platform/packages/apps/Settings/+/0fe65b582abde16c1b46cb314a8358752cef1658

Change-Id: Ie6b6b7ffca15476a05e363fc68d2fa4ba0693895
Test: m RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.wifi.p2p.WifiP2pSettingsTest.*"
Bug: 252671269
 2022-10-12 05:54:34 +00:00
Josh Hou
b589be652d Merge "[Panlingual] Separate the app locale information by profiles" into tm-qpr-dev am: 9c2e35244d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20064275

Change-Id: I1bfd03028218d068c239a087ca1bd1a5e01286b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-12 05:34:03 +00:00
Edgar Wang
0b7944d38e Update the strings of Admin-Support Dialog 
Bug: 252967902
Test: manual
Change-Id: I1c196aef3bea0771e99487b583c7d29fe9264a98
 2022-10-12 13:08:24 +08:00
Josh Hou
9c2e35244d Merge "[Panlingual] Separate the app locale information by profiles" into tm-qpr-dev 2022-10-12 05:03:52 +00:00
Lauren Winston
246597c1ac Merge "Revert "Add a cursor preference to Accessibility Settings"" 2022-10-11 23:00:34 +00:00
Xin Li
a8e760c170 [automerger skipped] Merge "Merge tm-qpr-dev-plus-aosp-without-vendor@9129937" into stage-aosp-master am: 5ebaa600a1 -s ours am: 2b11f79bab -s ours 
am skip reason: Merged-In I9ebe26c6a8058798ea654523ad1405a8447268b8 with SHA-1 6ecbe4c18e is already in history

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

Change-Id: Ibddecfab34b1063e4378a1e9351830a248fac591
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-11 20:12:20 +00:00
Xin Li
fd6d6b42d7 [automerger skipped] Merge tm-qpr-dev-plus-aosp-without-vendor@9129937 am: 302b01f8e2 -s ours am: 6c1c71059c -s ours 
am skip reason: Merged-In I9ebe26c6a8058798ea654523ad1405a8447268b8 with SHA-1 6ecbe4c18e is already in history

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

Change-Id: Ifc670a8584beb517e1f507635de582bb473bdbe7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-11 20:09:36 +00:00
Lauren Winston
4f493778a6 Revert "Add a cursor preference to Accessibility Settings" 
This reverts commit 205018a854.

Reason for revert: Software Cursor not launching in Android U

Change-Id: Ieddc6b27a8a28910e7c12328ee6d1b5e0d2e4c17
 2022-10-11 18:32:27 +00:00
Xin Li
2b11f79bab [automerger skipped] Merge "Merge tm-qpr-dev-plus-aosp-without-vendor@9129937" into stage-aosp-master am: 5ebaa600a1 -s ours 
am skip reason: Merged-In I9ebe26c6a8058798ea654523ad1405a8447268b8 with SHA-1 6ecbe4c18e is already in history

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

Change-Id: I8af8de0926f04686ccd5648f6a2c1453d2087166
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-11 17:58:17 +00:00
Xin Li
6c1c71059c [automerger skipped] Merge tm-qpr-dev-plus-aosp-without-vendor@9129937 am: 302b01f8e2 -s ours 
am skip reason: Merged-In I9ebe26c6a8058798ea654523ad1405a8447268b8 with SHA-1 6ecbe4c18e is already in history

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

Change-Id: Idaef5eec13477eaf80685f9c97234d529d458d9a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-11 17:55:37 +00:00
Xin Li
5ebaa600a1 Merge "Merge tm-qpr-dev-plus-aosp-without-vendor@9129937" into stage-aosp-master 2022-10-11 17:39:16 +00:00
Xuanang Zhao
4318187037 Merge "Add HINT_PARTIAL to stub slice." 2022-10-11 13:35:09 +00:00
TreeHugger Robot
2d539a83da Merge "Add AppPermissionPreference for Spa" 2022-10-11 10:46:19 +00:00
Xuanang Zhao
b28a8a4634 Add HINT_PARTIAL to stub slice. 
Change-Id: Idc0847828063afe708b69a5b0a1178b9729a5b5b
Bug: 249101421
 2022-10-11 10:42:34 +00:00
Xuanang Zhao
98f7b2b227 Clean the slice in onUnpinned rather than onBinded. 
Change-Id: Idda7cbedb0ce7b0ec83fc2f11a2505634d2b465c
Bug: 249101421
 2022-10-11 10:35:31 +00:00
Chaohui Wang
2b11c1fe12 Add AppPermissionPreference for Spa 
This is the permission preference in the App Settings page.
The summary is single line.

Add the first Kotlin Robolectric Test for Settings, since Kotlin is not
directly supported by the Robolectric test, using a Java class as a
wrapper.

Bug: 236346018
Test: Manual with App Settings page
Test: Robolectric Test
Change-Id: Ic5a4f7d965885a9cd143428a8cd1900981e316a9
 2022-10-11 09:15:26 +00:00
Treehugger Robot
fcf10fa0a5 Merge "Add fallback summary text if there is no matching screen timeout value" am: 007c215c3e am: 44431c73e7 am: 332183ee4d 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2239486

Change-Id: I3a672bdfab89c1b7048f6501c3444a4b598daaf3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-11 07:29:39 +00:00
Treehugger Robot
332183ee4d Merge "Add fallback summary text if there is no matching screen timeout value" am: 007c215c3e am: 44431c73e7 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2239486

Change-Id: I39f0b958a99e4109b454a2edc66c0dee1c03a7ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-11 06:56:21 +00:00
Treehugger Robot
44431c73e7 Merge "Add fallback summary text if there is no matching screen timeout value" am: 007c215c3e 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2239486

Change-Id: I2a5103f40ff538d327f1db9d1062de044683b615
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-11 06:27:16 +00:00
Treehugger Robot
007c215c3e Merge "Add fallback summary text if there is no matching screen timeout value" 2022-10-11 05:51:12 +00:00
Hugh Chen
f891f7ba86 RESTRICT AUTOMERGE Refactoring settings UI 
Bug: 248174653
Test: build & boot pass
Change-Id: I124a65941349d3338145865cae2c8354678897fa
 2022-10-11 04:30:09 +00:00
Chaohui Wang
d41dc06a6a Merge "Update onPermissionSummaryResult()" 2022-10-11 03:06:06 +00:00
TreeHugger Robot
95b0f3af2d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 67c367596d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I95e33fa8722bd557377cf47aa07ae660d132bcd4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-11 02:42:17 +00:00
TreeHugger Robot
b2b4e25d2a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 368a98c747 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I55ed6b36f17fdc23e119642d705e2b8d1716a5a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-11 02:40:05 +00:00
Bill Yi
35cfeb7168 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b172ac177f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0bf5f54c673abd48588379b9bc7106def749f9e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-11 02:40:01 +00:00
TreeHugger Robot
e738e15dd5 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 27709c9688 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1b15e1cd7d4da4c5af319541aaee5ea96866c222
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-11 02:39:56 +00:00
TreeHugger Robot
67c367596d Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod 2022-10-11 01:58:52 +00:00
TreeHugger Robot
368a98c747 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod 2022-10-11 01:58:52 +00:00
TreeHugger Robot
b0ccabc602 Merge changes from topic "tc_change_22101006_34" 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: c9a075a1e6
  Import translations. DO NOT MERGE ANYWHERE
 2022-10-11 01:58:52 +00:00
TreeHugger Robot
27709c9688 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod 2022-10-11 01:58:52 +00:00
TreeHugger Robot
82010b2fe3 Merge changes from topic "tc_change_22101006_34" 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: ad156a0b43
  Import translations. DO NOT MERGE ANYWHERE
 2022-10-11 01:58:52 +00:00
TreeHugger Robot
982f36da87 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 19971433a3 -s ours am: 8b00fad21e -s ours am: d1dd16222b -s ours am: 8565fcd9a5 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7f47f522936761f431481a722c1b2290a56e057d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-10 23:41:10 +00:00
Bill Yi
72a1ffcb16 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 177fea7707 -s ours am: 3f4d598606 -s ours am: 27d2c1d387 -s ours am: efe0eb20b4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I183c5dcf377bca73805f19cde970e97820fb8c47
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-10 23:41:08 +00:00
TreeHugger Robot
0dcef791a8 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: afe5f1ac18 -s ours am: eac07869ff -s ours am: 4c021c6b06 -s ours am: aea49f9352 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I11c7534820168674b32676dba8240315f110e369
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-10 23:41:03 +00:00
Bill Yi
82a69e9ae4 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4ba8745b10 -s ours am: cbf161d09b -s ours am: 272b07dd04 -s ours am: cc0d0ce6db -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I824021f29f132fffd77b4dfe1cc754c24658dbf7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-10 23:40:50 +00:00
Bill Yi
1591f7d908 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 467155435c -s ours am: 18560c1147 -s ours am: d7cf3b29e3 -s ours am: 2e6ec07996 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ieecbe0bdbb1db5d7ada97dbc84607f93a693971e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-10 23:40:29 +00:00
TreeHugger Robot
8565fcd9a5 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 19971433a3 -s ours am: 8b00fad21e -s ours am: d1dd16222b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3650db656bd32153d05504bf0204fc45ce1095b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-10 23:24:35 +00:00
Bill Yi
efe0eb20b4 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 177fea7707 -s ours am: 3f4d598606 -s ours am: 27d2c1d387 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iaddb9179e35a0a80b4370626f8fa4cdbf7936f40
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-10 23:24:33 +00:00
TreeHugger Robot
aea49f9352 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: afe5f1ac18 -s ours am: eac07869ff -s ours am: 4c021c6b06 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9ec7640944322633e646311cf6b0d7ec1101977e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-10 23:24:26 +00:00