Weng Su
5cbaa375cd
[RESTRICT AUTOMERGE] Revert "Add comment to AndroidManifest"
...
This reverts commit 56a88885cc
.
Reason for revert: rollback CLs to avoid compatibility risks
Bug: 185126813
Change-Id: Ie9d17faa536186e9787ff17b9bc7f7e30adabd1c
2021-10-04 07:36:06 +00:00
TreeHugger Robot
982e22c6e1
Merge "Audio balance slider is off-center" into sc-v2-dev
2021-10-04 05:37:24 +00:00
TreeHugger Robot
02b3384ae1
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: da8e9c1108
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15962727
Change-Id: I2e108813b56f1a2a0bdfbf26b1299704f818a372
2021-10-02 06:43:05 +00:00
Bill Yi
35e8964074
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: ae858a0237
am: 853fdb2f22
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15962722
Change-Id: I41cdf263c606a7e4307abc7a82afa6cb7012707c
2021-10-02 06:43:02 +00:00
TreeHugger Robot
131a6a8b05
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev
2021-10-02 06:34:39 +00:00
TreeHugger Robot
da8e9c1108
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev
2021-10-02 06:34:33 +00:00
Bill Yi
9e6aca3b26
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Iced2e8ac5c2387729982b92d55c1776460c4d369
2021-10-02 04:50:03 +00:00
Bill Yi
41533a64d6
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I9a5eb92a2e472ba7faca95791c4b748f71c20a58
2021-10-02 04:46:24 +00:00
Bill Yi
853fdb2f22
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: ae858a0237
...
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15962722
Change-Id: If00f802350f9a2769fb8cc2d992c0f7b42f09f43
2021-10-02 04:43:05 +00:00
Bill Yi
ae858a0237
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I6ce3387fb38bbb8530d28c7265ccd7563e19be4d
2021-10-02 04:42:52 +00:00
TreeHugger Robot
10198632d3
[automerger skipped] Merge "Add more info on the dialog of AllowBindAppWidgetActivity" into sc-qpr1-dev am: 468bad73d7
-s ours
...
am skip reason: Merged-In Idf1f73bc1cdb8ef9ce632bfe4722b1469a6b8531 with SHA-1 1564ef5ca1
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15952458
Change-Id: I7fe4515ab8344495d0086c574c9a099bbf0fc34f
2021-10-01 23:43:30 +00:00
TreeHugger Robot
468bad73d7
Merge "Add more info on the dialog of AllowBindAppWidgetActivity" into sc-qpr1-dev
2021-10-01 23:26:52 +00:00
TreeHugger Robot
83c5600879
Merge "Fetch admin details if not present in Intent." into sc-qpr1-dev am: e750fb7528
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15843434
Change-Id: Ie4441b828293a92208ba4b1bcd589fbd1d5e3f7e
2021-10-01 18:21:22 +00:00
TreeHugger Robot
e750fb7528
Merge "Fetch admin details if not present in Intent." into sc-qpr1-dev
2021-10-01 18:15:58 +00:00
Tsung-Mao Fang
2421121c90
Audio balance slider is off-center
...
The center mark of the audio balance slider is not
centered.
Fix: 201024782
Test: Open Accessibility and check the balance slider,
the center mark should be in the center
Change-Id: Ibd100604d0ff9981c1e22993465c183c181fd5e7
2021-10-01 17:17:48 +08:00
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
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
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
a2e975064e
Merge "PaymentDefaultDialog Could be Overlaid" into sc-dev
2021-09-30 18:51:47 +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
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
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
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
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
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
cd10fa3120
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev
2021-09-29 07:32:58 +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
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
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
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
YUKAI HUNG
36072e86ef
Merge "[S-QPR1] protect gettinng battery stats from DeadSystemException" into sc-qpr1-dev
2021-09-28 07:19:59 +00:00
YUKAI HUNG
4a4f13d5b0
Merge "[S-QPR1] add package name for enable/disable app user actions metric" into sc-qpr1-dev
2021-09-28 07:12:01 +00:00
PETER LIANG
65faee72f5
Merge "Add the max height restriction into the illustration view." into sc-v2-dev
2021-09-28 05:43:21 +00:00
TreeHugger Robot
244e0f536b
Merge "Ues permission to protect DeepLinkHomepageActivity" into sc-v2-dev
2021-09-28 04:23:19 +00:00
Curtis Belmonte
a9c582262e
Make biometric setting toggles show dynamic auth types
...
Updates the preference toggles shown on the combined biometric settings
screen to indicate which types of biometric sensor (e.g. face and/or
fingerprint) each setting applies to. This is done by checking the
maximum registered strength for each type of sensor.
Test: Manual
Bug: 193714498
Bug: 201306569
Change-Id: I1f27bbe1fdd172ebc899c3c5f1daef9095b338bd
2021-09-27 15:55:43 -07:00
Bill Yi
61e7977aaa
Merge changes from topic "presubmit-am-460367b50a5247a5815d9ee30f905f93" into sc-qpr1-dev am: 7378aac868
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15915537
Change-Id: I6ef621135279240a1064db3fce4ac6223357389b
2021-09-27 16:07:35 +00:00
Bill Yi
e605139474
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 92e5e1d54b
am: fe3544e435
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15915537
Change-Id: Ia6f944e0662704852fdb1b3b6f97950da567b75a
2021-09-27 16:07:35 +00:00
Bill Yi
cf07eec3b7
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 49ce6473d6
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15915622
Change-Id: I12048a123ef9fd2ade0d46bf21f6d92edf1aa210
2021-09-27 16:07:16 +00:00
Julia Reynolds
c86d3d5218
Always return the same result code in access screens am: 1aff9c726a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15908133
Change-Id: I328c2178b009849d67a9ab1c74b22af832e0ca3c
2021-09-27 16:07:00 +00:00