PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
88,690 Commits 1 Branch 0 Tags
d537fa10e96db59ed4ca6288587128b52f20ee53
Commit Graph

88690 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Arc Wang
407a725278 Use startActivity for android.settings.APP_SEARCH_SETTINGS 
The Activity launched by android.settings.APP_SEARCH_SETTINGS
does not setResult. So it's no meaning to use
startActivityForResult for the Intent.

Bug: 196923591
Test: manual
      Settings -> Search settings -> search an item ->
      click back button twice and back to Settings home.
Change-Id: Ia760a301465bb87814326611a1ec2368887f120a
 2021-09-30 01:52:48 +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
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
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
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
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
TreeHugger Robot
cd10fa3120 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2021-09-29 07:32:58 +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
Xin Li
8aa74d1ad4 Merge SP1A.210812.016 
Merged-In: Ie9cea79f825b78495b1f93527f3fa980f9b975e3
Change-Id: Ib853137811901796f73e4d720accb3249a7db963
 2021-09-28 19:39:58 +00:00
Xin Li
9d07b3b7fa [automerger skipped] DO NOT MERGE - Empty merge to indicate SP1A.210812.001 is already merged am: c41a577e37 am: 7a7b87716f am: d62dc93bff -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: I12ecb3ea819c98b2befffa6e0e4b83c46019d172
 2021-09-28 15:22:47 +00:00
Xin Li
d62dc93bff DO NOT MERGE - Empty merge to indicate SP1A.210812.001 is already merged am: c41a577e37 am: 7a7b87716f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15930864

Change-Id: I618b06ffd1b1e9029575a4f7d080dcb0c5329b60
 2021-09-28 15:01:42 +00:00
Xin Li
7a7b87716f DO NOT MERGE - Empty merge to indicate SP1A.210812.001 is already merged am: c41a577e37 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15930864

Change-Id: I9ed0817f2ef9449e472476dfd5ed54b4e126bd5d
 2021-09-28 14:43:13 +00:00
ykhung
f63b2e08da [Robustness] protect get battery stats from DeadSystemException am: e893a890ca 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15926630

Change-Id: I3b7223abc84971b2d9051d2c777a37c85404985a
 2021-09-28 11:33:46 +00:00
ykhung
e893a890ca [Robustness] protect get battery stats from DeadSystemException 
Refine the original workaround patch in the ag/15527095 from NPE to
return default BatteryUsageStats instance as we merged in the
ag/15919139 (align the same solution).

Bug: 195306545
Test: make SettingsRoboTests
Change-Id: Ic03e8296d16ecb8629155f75727e9cde48c303eb
 2021-09-28 10:00:50 +00:00
Bill Yi
39812e84c0 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ib6505319ebf6b05ecfee3e8fd410a0052a9c6b62
 2021-09-28 09:08:38 +00:00
Bill Yi
069684e925 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I5025bf1696bea34629632b29351fc463f33ef27d
 2021-09-28 09:04:57 +00:00
Bill Yi
43b9cb669c [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 3769790fed 
Blank merge reason: commit message contains skip directive

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

Change-Id: Iea597fedb4bf06eae6760f6d313bc8f7909f2077
 2021-09-28 09:01:34 +00:00
Bill Yi
a27f0eaf3d [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 3769790fed 
Blank merge reason: commit message contains skip directive

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

Change-Id: I0ab870320ff4498bd159cef7c9659eef3ce00139
 2021-09-28 09:01:33 +00:00
Bill Yi
3769790fed Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I5cf6feb89d6b5418866abcb32e14d00eaaae73ef
 2021-09-28 09:01:22 +00:00
Xin Li
c41a577e37 DO NOT MERGE - Empty merge to indicate SP1A.210812.001 is already merged 
Merged-In: Ibe8d1224361b31f6dfb782b5400d3ff6aad5e77f
Change-Id: I90b2538fb0737a35170b87864c776d94f575418f
 2021-09-28 07:55:18 +00:00
YUKAI HUNG
8f2938221a [automerger skipped] Merge "[S-QPR1] protect gettinng battery stats from DeadSystemException" into sc-qpr1-dev am: 36072e86ef -s ours am: d9db89af86 -s ours 
am skip reason: Merged-In I75fcf63f4f69d86d6dce0e12bd4d738b1219ae47 with SHA-1 ad346e12d5 is already in history

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

Change-Id: I04b9ecf8bf34eaa52aee9cb2e176c0de95024e9b
 2021-09-28 07:53:44 +00:00
YUKAI HUNG
f4d84faee7 Merge "[S-QPR1] add package name for enable/disable app user actions metric" into sc-qpr1-dev am: 4a4f13d5b0 am: 0c99e2b1c8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15919140

Change-Id: I9d596ccce1459e92c244fb013e3933c0f357ffb8
 2021-09-28 07:53:39 +00:00
YUKAI HUNG
301bdd05d4 [automerger skipped] Merge "[S-QPR1] protect gettinng battery stats from DeadSystemException" into sc-qpr1-dev am: 36072e86ef am: 5e32dec664 -s ours 
am skip reason: Merged-In I75fcf63f4f69d86d6dce0e12bd4d738b1219ae47 with SHA-1 ad346e12d5 is already in history

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

Change-Id: Id1c00fe8ff9ad03edb8392331fd9613c07296197
 2021-09-28 07:53:14 +00:00
YUKAI HUNG
3d6fc7d275 Merge "[S-QPR1] add package name for enable/disable app user actions metric" into sc-qpr1-dev am: 4a4f13d5b0 am: 4f513d7237 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15919140

Change-Id: I235cc4cb1dfabccdcb901e2de5eca1a33a237ad0
 2021-09-28 07:53:07 +00:00
YUKAI HUNG
5e32dec664 Merge "[S-QPR1] protect gettinng battery stats from DeadSystemException" into sc-qpr1-dev am: 36072e86ef 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15919139

Change-Id: I92e32ec565c45d58b28c1430693f5fba11780844
 2021-09-28 07:30:26 +00:00
YUKAI HUNG
d9db89af86 [automerger skipped] Merge "[S-QPR1] protect gettinng battery stats from DeadSystemException" into sc-qpr1-dev am: 36072e86ef -s ours 
am skip reason: Merged-In I75fcf63f4f69d86d6dce0e12bd4d738b1219ae47 with SHA-1 ad346e12d5 is already in history

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

Change-Id: I176606ea2e056d6cb109fdf4dc03b2fe7ceffdcb
 2021-09-28 07:30:19 +00:00
YUKAI HUNG
0c99e2b1c8 Merge "[S-QPR1] add package name for enable/disable app user actions metric" into sc-qpr1-dev am: 4a4f13d5b0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15919140

Change-Id: I71ccb502dc5e7697b5f54daa803a56bba1e2c565
 2021-09-28 07:30:14 +00:00