TreeHugger Robot
99554d3c34
Merge "Punt battery status action when entering Settings main page" into sc-v2-dev
2021-10-01 08:34:35 +00:00
Wesley.CW Wang
0cd29a70a4
Punt battery status action when entering Settings main page
...
- Checking battery sharing states at the beging may have some performance issue, post battery status update to background thread to avoid ANR
Bug: 193600924
Test: make SettingsRoboTests
Change-Id: I3b73e6bd4f952bc832783b9b3b5d45db560d088c
2021-10-01 15:15:25 +08:00
Sunny Shao
f25e8aa74c
Add more info on the dialog of AllowBindAppWidgetActivity
...
- Show the label of the bound widget on the dialog of the AllowBindAppWidgetActivity.
Bug: 184676316
Test: manual test
Change-Id: Idf1f73bc1cdb8ef9ce632bfe4722b1469a6b8531
Merged-In: Idf1f73bc1cdb8ef9ce632bfe4722b1469a6b8531
(cherry picked from commit 1564ef5ca1
)
2021-10-01 05:45:49 +00:00
TreeHugger Robot
261ab7a07e
Merge "PaymentDefaultDialog Could be Overlaid" into sc-dev am: a2e975064e
am: cddd334ee6
am: a214347698
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15821792
Change-Id: I2ff7d271ecbb1832e772bb93ac2381d0ec2228d5
2021-09-30 19:40:55 +00:00
TreeHugger Robot
f695f7790e
Merge "PaymentDefaultDialog Could be Overlaid" into sc-dev am: a2e975064e
am: cddd334ee6
am: bed34d70fb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15821792
Change-Id: Ic44876c0fa7a6a179e8d8b3876d515e8aa4db202
2021-09-30 19:40:33 +00:00
TreeHugger Robot
68636fecf7
Merge "PaymentDefaultDialog Could be Overlaid" into sc-dev am: a2e975064e
am: 9a573b1942
am: f00be6bdfc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15821792
Change-Id: I7a1067e4d2c7ff8af697b9e65304f6cf7b34ba5d
2021-09-30 19:40:20 +00:00
TreeHugger Robot
a214347698
Merge "PaymentDefaultDialog Could be Overlaid" into sc-dev am: a2e975064e
am: cddd334ee6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15821792
Change-Id: I8c227ad10956e94c1feb3d019bafe88f65c4116a
2021-09-30 19:23:24 +00:00
TreeHugger Robot
bed34d70fb
Merge "PaymentDefaultDialog Could be Overlaid" into sc-dev am: a2e975064e
am: cddd334ee6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15821792
Change-Id: Ia0111381dc70bb1b4d73ff337fb2e303b52d8b48
2021-09-30 19:23:22 +00:00
TreeHugger Robot
f00be6bdfc
Merge "PaymentDefaultDialog Could be Overlaid" into sc-dev am: a2e975064e
am: 9a573b1942
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15821792
Change-Id: Idd67e658def711bd9c63f24dfda05dedb989d795
2021-09-30 19:22:59 +00:00
TreeHugger Robot
cddd334ee6
Merge "PaymentDefaultDialog Could be Overlaid" into sc-dev am: a2e975064e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15821792
Change-Id: Ia84dd48edcae481fb006b582e9e5c2274d2e86e7
2021-09-30 19:06:45 +00:00
TreeHugger Robot
9a573b1942
Merge "PaymentDefaultDialog Could be Overlaid" into sc-dev am: a2e975064e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15821792
Change-Id: Id94319ec70f89a5f153d4e7f6db9ed2cba036997
2021-09-30 19:05:51 +00:00
TreeHugger Robot
a2e975064e
Merge "PaymentDefaultDialog Could be Overlaid" into sc-dev
2021-09-30 18:51:47 +00:00
TreeHugger Robot
0cb180e6a3
Merge "Fix USB tether option" into sc-qpr1-dev am: 7ba545d992
am: b75781c7bc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15868748
Change-Id: If82810ee40918bc379631b426343c5909f7a6d8e
2021-09-30 12:34:11 +00:00
TreeHugger Robot
a3272a14be
Merge "Fix USB tether option" into sc-qpr1-dev am: 7ba545d992
am: 0db131b42b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15868748
Change-Id: I56205568bc623b726ae074bdc421187c5bdb1c1e
2021-09-30 12:33:35 +00:00
TreeHugger Robot
0db131b42b
Merge "Fix USB tether option" into sc-qpr1-dev am: 7ba545d992
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15868748
Change-Id: I152a4223fbbf0ceaadfab992dc14bce46af763cd
2021-09-30 12:21:45 +00:00
TreeHugger Robot
b75781c7bc
Merge "Fix USB tether option" into sc-qpr1-dev am: 7ba545d992
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15868748
Change-Id: I4db07fe42154f484d9918096949427aa8569744d
2021-09-30 12:21:44 +00:00
TreeHugger Robot
7ba545d992
Merge "Fix USB tether option" into sc-qpr1-dev
2021-09-30 12:06:41 +00:00
Arc Wang
6d6a1b136a
Use startActivity for android.settings.APP_SEARCH_SETTINGS am: 407a725278
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15939310
Change-Id: I3dda7d8dbaf171c8aafad18a86425af3205ef060
2021-09-30 02:06:25 +00:00
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