PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
96,455 Commits 1 Branch 0 Tags
fe8c04d952fb20af9881e63c9b8483ad5131bdbc
Commit Graph

96455 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
c2808253cf Merge changes from topic "presubmit-am-a06c7bd415ae40e4af4a40c0d99cecd7" into sc-qpr1-dev am: bdbca48e77 am: 579e3fece3 am: 6199884a88 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15932729

Change-Id: I898667810fa6384eceb8de450c8bc0fe041b3eac
 2021-09-29 17:48:35 +00:00
Bill Yi
c08152f333 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 3769790fed am: a27f0eaf3d -s ours am: aa7fb69d3c -s ours am: 35763a75c7 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5ff05edede67824988d7fdca30ab4904f52c87fb
 2021-09-29 17:48:33 +00:00
Bill Yi
a725c72dae Merge changes from topic "presubmit-am-a06c7bd415ae40e4af4a40c0d99cecd7" into sc-dev-plus-aosp am: 2c7cd22dee am: e6c645a44d am: 71a71624b3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15932729

Change-Id: I5dff000dacb84182ca8304742a021398fefb11f0
 2021-09-29 17:46:28 +00:00
Bill Yi
a52539abae [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 3769790fed am: 43b9cb669c -s ours am: 8c9a83328b -s ours am: 0780c5901e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ibed432862fce4beb7a0bfa1f9eee84db5a2f2235
 2021-09-29 17:46:24 +00:00
Bill Yi
48865e78b9 Merge changes from topic "presubmit-am-a06c7bd415ae40e4af4a40c0d99cecd7" into sc-qpr1-dev am: bdbca48e77 am: 81d0121ce0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15932729

Change-Id: Iff5107f1d5ad6cb3e66889827ea8be6e37399503
 2021-09-29 17:41:03 +00:00
Bill Yi
25596468ae [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 3769790fed am: a27f0eaf3d -s ours am: 88bf3f3238 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ifcf815a4f07040ca398164f725c9a9e494b0dcf9
 2021-09-29 17:40:59 +00:00
TreeHugger Robot
cfb043298c Merge "[Large screen] Disable/enable DeepLinkHomepageActivity" into sc-v2-dev am: 9a7d259341 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15926635

Change-Id: I0f2bcc51715a3829508539f2adab949efcd83a65
 2021-09-29 17:36:57 +00:00
Bill Yi
6199884a88 Merge changes from topic "presubmit-am-a06c7bd415ae40e4af4a40c0d99cecd7" into sc-qpr1-dev am: bdbca48e77 am: 579e3fece3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15932729

Change-Id: I79b6f813027bab8326e876a89fee9ad08ba92e73
 2021-09-29 17:35:58 +00:00
Bill Yi
35763a75c7 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 3769790fed am: a27f0eaf3d -s ours am: aa7fb69d3c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6038d4305b97935422ef70a09c2f01307197b4b9
 2021-09-29 17:35:56 +00:00
Bill Yi
71a71624b3 Merge changes from topic "presubmit-am-a06c7bd415ae40e4af4a40c0d99cecd7" into sc-dev-plus-aosp am: 2c7cd22dee am: e6c645a44d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15932729

Change-Id: Ie320bcc2c82a7fc9a3b4c87b3e6d146d20cd4784
 2021-09-29 17:35:11 +00:00
Bill Yi
0780c5901e [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 3769790fed am: 43b9cb669c -s ours am: 8c9a83328b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6a4d6dc8935a3e9c4c8e0ca184266c73485a3107
 2021-09-29 17:35:09 +00:00
TreeHugger Robot
9a7d259341 Merge "[Large screen] Disable/enable DeepLinkHomepageActivity" into sc-v2-dev 2021-09-29 17:33:23 +00:00
Bill Yi
579e3fece3 Merge changes from topic "presubmit-am-a06c7bd415ae40e4af4a40c0d99cecd7" into sc-qpr1-dev am: bdbca48e77 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15932729

Change-Id: I7ddc08c6517f03cf6b333f76fb44939bfeac96ef
 2021-09-29 17:24:32 +00:00
Bill Yi
aa7fb69d3c [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 3769790fed am: a27f0eaf3d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7d1e135cb86d0541a541745f6ffd9ecd38ebe158
 2021-09-29 17:24:31 +00:00
Bill Yi
81d0121ce0 Merge changes from topic "presubmit-am-a06c7bd415ae40e4af4a40c0d99cecd7" into sc-qpr1-dev am: bdbca48e77 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15932729

Change-Id: I6baee344ad8cd621010d02feab31f91b11435124
 2021-09-29 17:23:24 +00:00
Bill Yi
88bf3f3238 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 3769790fed am: a27f0eaf3d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia86c28d779abdb85b0a2aca6dcf07d94d1e0af82
 2021-09-29 17:23:21 +00:00
Bill Yi
e6c645a44d Merge changes from topic "presubmit-am-a06c7bd415ae40e4af4a40c0d99cecd7" into sc-dev-plus-aosp am: 2c7cd22dee 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15932729

Change-Id: Ia0d5acb5f9b1b1fc91ac927e1a33152d48b6cd48
 2021-09-29 17:23:15 +00:00
Bill Yi
8c9a83328b [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 3769790fed am: 43b9cb669c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I79de19bc08d1dd408b8b7579a7aafa2cf557974d
 2021-09-29 17:23:14 +00:00
Bill Yi
cc61e712e3 Merge changes from topic "presubmit-am-a06c7bd415ae40e4af4a40c0d99cecd7" into sc-mainline-prod am: 61ea6910e3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15932729

Change-Id: I71c31ccbf7260be4371a761597b5c28ea9b7bd7f
 2021-09-29 17:22:34 +00:00
Bill Yi
61ea6910e3 Merge changes from topic "presubmit-am-a06c7bd415ae40e4af4a40c0d99cecd7" into sc-mainline-prod 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 3769790fed
  Import translations. DO NOT MERGE ANYWHERE
 2021-09-29 17:08:57 +00:00
Bill Yi
2c7cd22dee Merge changes from topic "presubmit-am-a06c7bd415ae40e4af4a40c0d99cecd7" into sc-dev-plus-aosp 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 3769790fed
  Import translations. DO NOT MERGE ANYWHERE
 2021-09-29 17:08:57 +00:00
Bill Yi
bdbca48e77 Merge changes from topic "presubmit-am-a06c7bd415ae40e4af4a40c0d99cecd7" into sc-qpr1-dev 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 3769790fed
  Import translations. DO NOT MERGE ANYWHERE
 2021-09-29 17:08:57 +00:00
Bill Yi
cf153bff2b Merge changes from topic "presubmit-am-a06c7bd415ae40e4af4a40c0d99cecd7" 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 3769790fed 2p: 337aa028ef
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 3769790fed
  Import translations. DO NOT MERGE ANYWHERE
 2021-09-29 17:08:56 +00:00
Bill Yi
2c73b1111d Merge changes from topic "presubmit-am-5fd82b5b9c684f41b93e5b11e5550795" 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2c348d5230
  Import translations. DO NOT MERGE ANYWHERE
 2021-09-29 17:08:18 +00:00
TreeHugger Robot
dcd1683d1d Merge "Fix the summary format problem of the installed apps" into sc-v2-dev am: e65b3dae22 am: 9d3e4aba06 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15939313

Change-Id: I400f5f0bce4d533b60568c299776b714181c2a4a
 2021-09-29 13:27:43 +00:00
TreeHugger Robot
9d3e4aba06 Merge "Fix the summary format problem of the installed apps" into sc-v2-dev am: e65b3dae22 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15939313

Change-Id: I0c0cdfb10b68a9776dd6a5f2db6157baecd76d09
 2021-09-29 13:19:18 +00:00
TreeHugger Robot
e65b3dae22 Merge "Fix the summary format problem of the installed apps" into sc-v2-dev 2021-09-29 13:04:51 +00:00
Sunny Shao
256a65c467 Fix the summary format problem of the installed apps 
- The summary of each installed apps in Opening links page is differnt
  with the summary of the Open by default in App info page.
- Let the format of the installed apps' summary is same as the Open
  by default.

Fixes: 193455965
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.applications.managedomainurls
Change-Id: Ifef4b27795300dc81c83ac1cc5063e8e22f54497
 2021-09-29 19:21:17 +08:00
TreeHugger Robot
caae5326ef [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 83423b2dff -s ours am: b9355b5c9b -s ours am: 538ae818d1 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3d7517a28b4797697a9f55f9bf66d3d0f461a4b7
 2021-09-29 08:44:33 +00:00
TreeHugger Robot
4a5aa6edd5 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 83423b2dff -s ours am: b05731a195 -s ours am: 8ab3769a8c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I68b49a9fa04f9ba070781790768f97cc92634ce9
 2021-09-29 08:44:15 +00:00
TreeHugger Robot
538ae818d1 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 83423b2dff -s ours am: b9355b5c9b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6391bc2b4483f558af4f8640f561a7b26b8da733
 2021-09-29 08:29:38 +00:00
TreeHugger Robot
8ab3769a8c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 83423b2dff -s ours am: b05731a195 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie2c02cf5bd0ed5fb0106168c24b586f31cb9619d
 2021-09-29 08:28:35 +00:00
TreeHugger Robot
b05731a195 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 83423b2dff -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Icadf73353bcc7f27f511fadc794b943809b11fcf
 2021-09-29 08:16:19 +00:00
TreeHugger Robot
b9355b5c9b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 83423b2dff -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I95f02e98666c5921cce2f2431cb4c478921cec69
 2021-09-29 08:16:19 +00:00
TreeHugger Robot
d8f5a88b6d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: cd10fa3120 -s ours am: da7eba93d9 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie926b9b65f8b188fa003cbba55b097a8cbf60ebb
 2021-09-29 08:11:17 +00:00
TreeHugger Robot
83423b2dff Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev 2021-09-29 08:04:35 +00:00
TreeHugger Robot
da7eba93d9 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: cd10fa3120 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I27c25690b32dec79af372b319d62942dec9a21f6
 2021-09-29 08:00:45 +00:00
Syaoran Kuo
e7fca48169 Merge "Use power manager instead of adb to wake up screen." 2021-09-29 07:54:08 +00:00
TreeHugger Robot
cd10fa3120 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2021-09-29 07:32:58 +00:00
Xin Li
d4a9a1e98a [automerger skipped] Merge SP1A.210812.016 am: 8aa74d1ad4 -s ours am: dc818b7b1f -s ours am: 32f9c41a53 -s ours am: 6fc837c6e7 -s ours 
am skip reason: Merged-In Ie9cea79f825b78495b1f93527f3fa980f9b975e3 with SHA-1 11655705db is already in history

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

Change-Id: I5d420c1da7ec84ad3159ae7fec86c4d5375f21a2
 2021-09-29 06:26:49 +00:00
TreeHugger Robot
8932ba55a8 Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-09-29 06:19:23 +00:00
Xin Li
6fc837c6e7 [automerger skipped] Merge SP1A.210812.016 am: 8aa74d1ad4 -s ours am: dc818b7b1f -s ours am: 32f9c41a53 -s ours 
am skip reason: Merged-In Ie9cea79f825b78495b1f93527f3fa980f9b975e3 with SHA-1 11655705db is already in history

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

Change-Id: Ib58f4593f1bfc0bcda852298e331a8b27f0b9d25
 2021-09-29 06:06:02 +00:00
Xin Li
32f9c41a53 [automerger skipped] Merge SP1A.210812.016 am: 8aa74d1ad4 -s ours am: dc818b7b1f -s ours 
am skip reason: Merged-In Ie9cea79f825b78495b1f93527f3fa980f9b975e3 with SHA-1 11655705db is already in history

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

Change-Id: I223a4cfd2637ea81a139c186a640b2078cb62fc0
 2021-09-29 05:52:02 +00:00
Xin Li
dc818b7b1f [automerger skipped] Merge SP1A.210812.016 am: 8aa74d1ad4 -s ours 
am skip reason: Merged-In Ie9cea79f825b78495b1f93527f3fa980f9b975e3 with SHA-1 11655705db is already in history

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

Change-Id: I8efcd178648ac15b8a32e75f7481c5943af94af4
 2021-09-29 05:38:41 +00:00
Arc Wang
54f619dfb8 [Large screen] Disable/enable DeepLinkHomepageActivity 
This change enable/disable DeepLinkHomepageActivity according to
SplitController#isSplitSupported when receiving PRE_BOOT_COMPLETED.

PRE_BOOT_COMPLETED is an Intent which broadcasts once when the user
is booting after a system update.

Bug: 201236463
Bug: 201237323
Test: manual
      1. On a large screen device, Launcher -> Wallpaper & style
         Observe it uses intent ACTION_SETTINGS_LARGE_SCREEN_DEEP_LINK.
      2. On a small screen device, Launcher -> Wallpaper & style
         Observe it does NOT use intent ACTION_SETTINGS_LARGE_SCREEN_DEEP_LINK.
Change-Id: Icf6ab6d0cba38224c4b80276141d84a8468da760
 2021-09-29 03:39:35 +00:00
YUKAI HUNG
185c1597d9 Merge "Invoke close() method for BatteryUsageStats to close cursor window" 2021-09-29 03:27:10 +00:00
TreeHugger Robot
f5d0a1e6b0 Merge "Do not update the previously connected devices for the sub device" 2021-09-29 01:40:22 +00:00
Xin Li
8aa74d1ad4 Merge SP1A.210812.016 
Merged-In: Ie9cea79f825b78495b1f93527f3fa980f9b975e3
Change-Id: Ib853137811901796f73e4d720accb3249a7db963
 2021-09-28 19:39:58 +00:00
ykhung
454698d97e Invoke close() method for BatteryUsageStats to close cursor window 
invoke close() method for BatteryUsageStats to close cursor window,
since BatteryUsageStats will implement "Closeable" interface in T.
(from Dimitri's request)

Bug: 201229421
Test: make SettingsRoboTests
Change-Id: Ibfca404d00cce51405cffddb636f685869ac130b
 2021-09-29 00:44:11 +08:00
Xin Li
15707e7858 [automerger skipped] DO NOT MERGE - Empty merge to indicate SP1A.210812.001 is already merged am: c41a577e37 am: 7a7b87716f am: d62dc93bff -s ours am: 9d07b3b7fa -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1feff9c45a5905100a743f8c945934d4c78c82a0
 2021-09-28 15:39:26 +00:00