TreeHugger Robot
299117b77e
[automerger skipped] Merge "Add more info on the dialog of AllowBindAppWidgetActivity" into sc-qpr1-dev am: 468bad73d7
am: 6d4c35933c
-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: I904e24c13539c25beae1a61bf2cbf746fd2875b8
2021-10-01 23:53:36 +00:00
TreeHugger Robot
6d4c35933c
Merge "Add more info on the dialog of AllowBindAppWidgetActivity" into sc-qpr1-dev am: 468bad73d7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15952458
Change-Id: I5d3ee4751264b436a3e1bc9d9ff7f90037a92102
2021-10-01 23:44:05 +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
2fe1fd69e6
[automerger skipped] Merge "Fetch admin details if not present in Intent." into sc-qpr1-dev am: e750fb7528
am: 83c5600879
-s ours
...
am skip reason: Merged-In Idda6078a64c03588f0b786ebc79079198ab722fe with SHA-1 49d20fa68e
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15843434
Change-Id: I064be8d68f3ec14955b07bfd82871be6083a7bc5
2021-10-01 18:29:15 +00:00
TreeHugger Robot
a9b0b5f659
Merge "Fetch admin details if not present in Intent." into sc-qpr1-dev am: e750fb7528
am: 39fae9778c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15843434
Change-Id: If019d80c9d23c420824cff63e58035fd39f647fb
2021-10-01 18:24:26 +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
39fae9778c
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: I0e708bc4dd419c72389dafb51dadb240fa8a79e7
2021-10-01 18:17:16 +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
Diego Vela
7f96530bf8
Update window aar
...
Update window aar to match api in Jetpack.
Bug: 199123327
Test: Manual
Change-Id: If1b07be9501823b1811a84715e9b9362eef75176
2021-10-01 10:15:03 -07:00
Weng Su
cabcecb2e8
[RESTRICT AUTOMERGE] Revert "Add SafetyNet logging"
...
This reverts commit 199528d460
.
Reason for revert: rollback CLs to avoid compatibility risks
Bug: 185126813
Change-Id: I5ed1782f1a35681ab6be4f74ea3156420b7dad5f
2021-10-01 15:06:20 +00:00
Weng Su
f9e7a17247
[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-01 15:00:12 +00:00
Weng Su
f1f0353ed7
[RESTRICT AUTOMERGE] Revert "Add SafetyNet logging"
...
This reverts commit 199528d460
.
Reason for revert: rollback CLs to avoid compatibility risks
Bug: 185126813
Change-Id: I5ed1782f1a35681ab6be4f74ea3156420b7dad5f
2021-10-01 14:51:33 +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
d9195b80af
Merge "Punt battery status action when entering Settings main page" into sc-v2-dev am: 99554d3c34
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15938356
Change-Id: I0c3c6b03e522c7320387253b0bd4546b6409b641
2021-10-01 08:43:07 +00:00
Yanting Yang
a9598c2f80
Start Safety & regulatory manual with new task
...
Based on the large screen design, Safety & regulatory manual should be
launched as a new task since it doesn’t fulfill the Settings UI design.
And it is not suitable to customize the background and font style with
Settings since the manual is provided by the legal team, we should keep
the content and style aligning with the server side.
Fixes: 197702066
Test: visual
Change-Id: Icaba237961cc774ed1bdca50d9095dc5409039e8
2021-10-01 16:42:59 +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
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
Tim Peng
9e1455492b
Phone fails to switch channel mode from stereo to mono
...
-Set codec to SBC when HD audio is off
Bug: 194349060
Test: make -j50 RunSettingsRoboTests
Change-Id: Iae4aa3f1d77350f5b4d91e7a687e048091c1daea
Merged-In: Iae4aa3f1d77350f5b4d91e7a687e048091c1daea
(cherry picked from commit 1469626b4a
)
2021-09-29 18:57:41 +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