Commit Graph

79217 Commits

Author SHA1 Message Date
TreeHugger Robot
0cb322b44e Merge "a11y fix: read emergency numbers as digits, not numbers." 2020-12-16 20:04:54 +00:00
Peter Wang
5eb94b4a00 Merge "Added an option in reset menu in Settings to enable resetting Euicc data only" 2020-12-16 20:03:25 +00:00
Xiangyu/Malcolm Chen
04d95b6e8e Merge "Automatically dismiss SIM combination warnings and selection dialogs." am: 33657f8d44
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1531286

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I37c0f54c42db2ba1338238d6477a2e3b88c20e85
2020-12-16 19:30:17 +00:00
Xiangyu/Malcolm Chen
33657f8d44 Merge "Automatically dismiss SIM combination warnings and selection dialogs." 2020-12-16 19:01:52 +00:00
Arc Wang
a3a063417b Merge "Migrate robolectric tests to junit tests" 2020-12-16 13:34:25 +00:00
Jeremy Goldman
6efeeaafec Owners updates
Add goldmanj to tests/unit for junit migration and
utility library creation
Add connectivity settings eng to settings/datausage.

Test: N/A, just owners update
Change-Id: I182ad6093677dc151b171d9e5aaa15cdd353c474
2020-12-16 10:40:49 +00:00
Wilson Wu
714a9b8f8f Merge "Apply ResultCallback to isImeTraceEnabled" 2020-12-16 09:33:42 +00:00
Pasty Chang
2715e885cf Merge "Migrate attribute sudMarginSides into sudMarginStart and sudMarginEnd for settings" 2020-12-16 05:35:31 +00:00
Arc Wang
62c78ff3fa Migrate robolectric tests to junit tests
This change do the 2 things:

1. Add new junit tests files which replace robolectric
   RobolectricTestRunner & RuntimeEnvironment with
   AndroidX objects without problem.
2. Remove the robolectric test files which have it's new junit files.

This change migrate 103 files, there are still 1209
files to go.

Bug: 174728471
Test: atest
      make RunSettingsRoboTests
Change-Id: I15ed3f4745b85862f720aabbf710ce1475aced93
2020-12-16 11:17:57 +08:00
TreeHugger Robot
7f5e061b77 Merge "Mark emergency gesture container view unimportant for a11y." 2020-12-16 02:47:35 +00:00
Bonian Chen
0da056b2dd [Settings] Close reset network confirm dialog when SIM removed
When SIM removed, the network reset confirm UI no longer represents
the wordings which presented to the user.

Proceed on resetting will only reset APN on removed SIM and
lead to some side effect if user inserted a new SIM while
keeping displaying the confirmation dialog.

With this situation, close the confirmation dialog is current
decision in design. And the UI which prior to the confirm UI
also need to be updated to avoid from user accessing that
removed SIM.

Bug: 171070050
Test: manual
Change-Id: I338835ca98593f95d98bafa70f12b177c43bf91a
2020-12-16 02:35:26 +00:00
Peter Wang
ecd856eeeb Added an option in reset menu in Settings to enable resetting Euicc data
only

Bug: 159650638
Fix: 159650638
Test: Local
Change-Id: Ia260b47a4dd0ddf0363740891b5e1d818c8631b7
2020-12-15 18:27:34 -08:00
Malcolm Chen
1305cee98e Automatically dismiss SIM combination warnings and selection dialogs.
When configuring CBRS profiles this dialog / notification will be
dismissed after configuration is done, to avoid confusion.

Bug: 142092510
Test: manual and unittest
Change-Id: Iaf30062f555ec2c119c4aafd6aa013e73b5253f0
Merged-In: Iaf30062f555ec2c119c4aafd6aa013e73b5253f0
2020-12-15 16:45:27 -08:00
Malcolm Chen
abd767ab1d Automatically dismiss SIM combination warnings and selection dialogs.
When configuring CBRS profiles this dialog / notification will be
dismissed after configuration is done, to avoid confusion.

Bug: 142092510
Test: manual and unittest
Change-Id: Iaf30062f555ec2c119c4aafd6aa013e73b5253f0
Merged-In: Iaf30062f555ec2c119c4aafd6aa013e73b5253f0
2020-12-15 22:11:55 +00:00
android-build-team Robot
81509558db Merge cherrypicks of [13231586, 13231437, 13231588, 13230397, 13230399, 13231350, 13231351, 13231354, 13231356, 13231439, 13231441, 13231358, 13231443, 13231360, 13231030, 13231457, 13230243, 13231032, 13231725, 13230838, 13231034, 13230840, 13230842, 13231361, 13231363, 13231745, 13231458, 13231747, 13231749, 13231751, 13229580, 13229582, 13231589, 13231591, 13231764, 13230400, 13230402, 13231784, 13231786, 13231788, 13231790] into rvc-qpr1-release
Change-Id: Iaa4c4134161d41c43126a821177254ae2c570783
2020-12-15 21:47:42 +00:00
Chris Manton
f065b87433 Add bluetooth package to permission request intent
Limit the component that may resolve this intent to the
bluetooth package.

Bug: 158219161
Test: Security Fix
Tag: #security
Change-Id: If732f940a7aa256f5975349118e8eb6cf5584676
(cherry picked from commit 1951d27669)
2020-12-15 21:46:25 +00:00
Jakub Pawlowski
763a4d5967 Prevent overlay drawing on top of Bluetooth activity dialog
Bug: 168504491
Change-Id: I04ebe580db2b299af2bd5e44e0b0f20bd42f8535
(cherry picked from commit 4f7edf692f)
2020-12-15 21:46:21 +00:00
Eugene Susla
8cef97cb2b RESTRICT AUTOMERGE
Prevent non-system overlays from showing over notification listener consent dialog

Bug: 170731783
Test: use a visible overlay, ensure it's gone when notification consent is open
Change-Id: I58e017982f385ffc0d0ba2174512490b1d83dd36
(cherry picked from commit bfa7a75545)
2020-12-15 21:46:16 +00:00
Fan Zhang
6e999c5004 Mark emergency gesture container view unimportant for a11y.
Similar to change I415090fb8601bc4cb129999a50ac35e045ef7830, the
container has nothing meaningful for accessibility tools. Marking it
unimportant forces children view's accessibility events to show up.

Fix: 175515538
Fix: 175515122
Test: manual
Change-Id: Ib9c9b67622f7ea67368dc3fe04c78c984b70c7e5
2020-12-15 13:09:02 -08:00
Fan Zhang
8e154d094f a11y fix: read emergency numbers as digits, not numbers.
Instead of reading as one hundred and ten, it should read as one-one-o.

Also make the number override dialog text input box a little bigger

Fix: 175517632
Fix: 175514672
Test: robotests
Change-Id: I7e3e823792f885004868ede790fc414a3fa66f01
2020-12-15 12:29:39 -08:00
Wesley.CW Wang
0306871503 Update Battery Defender tips title am: ee1d07d59b am: 421cbc63ad
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13223683

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I25a3e0f2e6f0bb2369149c02009262ef89c315e0
2020-12-15 19:09:58 +00:00
Wesley.CW Wang
421cbc63ad Update Battery Defender tips title am: ee1d07d59b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13223683

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib651d0c708471af6cac52255b25159730269843e
2020-12-15 18:48:30 +00:00
Weng Su
9d0e832c0b [Provider Model] Add “Airplane-safe networks” icon
- Screenshot:
  https://screenshot.googleplex.com/8FhcaVDFpsJUbeF

Bug: 174022082
Test: manual test
Change-Id: Ie1e3a8d8fe2f4239816056ce778919daa86b331d
2020-12-15 17:06:32 +00:00
Wesley.CW Wang
ee1d07d59b Update Battery Defender tips title
Bug: 175662315
Test: make SettingsRoboTests
Change-Id: I13ba773ea4402c5ae54260a8b8cbea4620eed535
2020-12-15 10:21:06 +00:00
Jeremy Goldman
f705f7933e Merge "Remove Settings robolectric tests which also have a junit test." 2020-12-15 07:41:20 +00:00
tim peng
b802a1a878 Merge "Remove MediaOutputGroupSlice" 2020-12-15 07:10:03 +00:00
Jiashen Wang
c1ed4d5485 Move eSIM reset before telephony manager reset in ResetNetworkConfirm
TelephonyManager#resetSettings triggers modem restart. It could cause
eSIM reset failure since Modem is not available. In order to resolve
this issue, we move eSIM reset befor telephony manager reset.
Bug: 175239934
Test: Manually tested

Change-Id: I44644c67577469898726ba07dcd6b68b3fb73b2a
2020-12-14 22:44:41 -08:00
Wilson Wu
8279b8ee5a Apply ResultCallback to isImeTraceEnabled
With CL[1], the isImeTraceEnabled in InputMethodManager
require to use ResultCallback mechanism. Change this API
usage in DevelopmentTiles.

[1] : I1547b98b2aacf764e33aadc9ab784f2013f58f2f

Bug: 163453493
Test: make RunSettingsRoboTests ROBOTEST_FILTER="WinscopeTraceTest"
Change-Id: I767069892c713023b064525105ef2b55946b7bb8
2020-12-15 14:08:11 +08:00
Hugh Chen
2b1473002a [automerger skipped] Add condition to check case of accessory combinations am: b767df1a08 am: 416110bac0 -s ours
am skip reason: Change-Id I7c80f02de5340799e292949608e19b86b187b982 with SHA-1 7d71081d45 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I033d1b9b5eb516dd781304b2627da1ebe8a8728a
2020-12-15 05:17:39 +00:00
Hugh Chen
c832433b40 [automerger skipped] Do nothing when choosing file transfer when in accessory mode am: e8dc7bc283 am: c61ec502f5 -s ours
am skip reason: Change-Id I1749c6c43d2a192e4ce1bf1ae5343ff8deafbe48 with SHA-1 3251a04ba3 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6d8fda135546ba928e85163a58c50b5d188dbea5
2020-12-15 05:17:33 +00:00
Hugh Chen
542a60b1f9 [automerger skipped] Fix the usb menu didn't switch to "File Transfer/Android Auto" right after connecting to the car unit. am: 91ed63124c am: 2676dd763c -s ours
am skip reason: Change-Id I0eca89a23670c674b74753fc526256cc1d52e759 with SHA-1 af0a45bb7a is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id2d75719fbb02a2b95abb312f8966eff50ad2ca2
2020-12-15 05:17:19 +00:00
Jeremy Goldman
be4d554bd3 Remove Settings robolectric tests which also have a junit test.
Before the JUnit test suite was a blocking presubmit, new junit tests
would be written without removing the old robolectric test. Now that the
JUnit tests are productionized, we can remove the robolectric tests if
there is also an associated Junit one.

Utility script which was used to generate this list can be found at
https://paste.googleplex.com/5113068112576512.

Bug: 175389659
Test: atest SettingsUnitTests
Change-Id: Iabf4dbcccd573e9e1482b3a3e61c0f169f81bcb4
2020-12-15 13:07:45 +08:00
Hugh Chen
416110bac0 Add condition to check case of accessory combinations am: b767df1a08
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13218259

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4a4502e3568d0049c4fff7f730b42d1bc975cea4
2020-12-15 05:01:42 +00:00
Hugh Chen
c61ec502f5 Do nothing when choosing file transfer when in accessory mode am: e8dc7bc283
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13218257

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3bd051363458a75a0dd190f41b0cf2901e3bf680
2020-12-15 05:01:34 +00:00
Hugh Chen
2676dd763c Fix the usb menu didn't switch to "File Transfer/Android Auto" right after connecting to the car unit. am: 91ed63124c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13218253

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3ca5a04cc2e8db3b2f50d1656fa54c8e02f8e394
2020-12-15 05:01:25 +00:00
Xiangyu/Malcolm Chen
aebc5db4f3 Merge "Automatically dismiss SIM combination warnings and selection dialogs." 2020-12-15 04:53:44 +00:00
timhypeng
c5a28d3ec0 Remove MediaOutputGroupPanel
Bug: 174192979
Test: build pass
Change-Id: I8023b66f24825bbe019c5d8369bb4813f5ba95f1
2020-12-15 12:25:04 +08:00
Yi Jiang
cf9e39b2f3 Merge "Grays out Screen Timeout Setting when disabled." 2020-12-15 02:59:04 +00:00
timhypeng
1602bccd9e Remove MediaOutputGroupSlice
Bug: 170558292
Test: build pass
Change-Id: I06c710a8b06c8666cb2cf5198d5b59eda7a7649a
2020-12-15 09:47:39 +08:00
Jiashen Wang
881d253247 Merge "Fix minor issue for DeleteEuiccSubscriptionDialogActivity" 2020-12-15 01:32:15 +00:00
Diego Vela
afdf5ed0d4 Merge "Revert^2 "Add <uses-library> information."" am: a2e406ed85 am: 8403231bbb am: 25ee8c7cf0
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1526684

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6db438a43e58f0ee0df43c12cb1db69ed1ae218d
2020-12-14 22:56:14 +00:00
Diego Vela
ed5986c335 Merge "Revert "Add <uses-library> information."" am: 54b741096b am: 9d61c8a23d am: acba236677
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1527773

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ief413bfbeadd5c47529d7dade9dad7e365d8b3bb
2020-12-14 22:55:50 +00:00
Diego Vela
25ee8c7cf0 Merge "Revert^2 "Add <uses-library> information."" am: a2e406ed85 am: 8403231bbb
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1526684

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9a772056ff7f76d79e2f4864e0e796b5fddc1a27
2020-12-14 22:38:33 +00:00
Diego Vela
acba236677 Merge "Revert "Add <uses-library> information."" am: 54b741096b am: 9d61c8a23d
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1527773

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I04da28694d92bf00afee8eec26f6cf9dc63e13a4
2020-12-14 22:25:47 +00:00
Diego Vela
8403231bbb Merge "Revert^2 "Add <uses-library> information."" am: a2e406ed85
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1526684

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1b27110024a7422343149b0eff00ed97bc726419
2020-12-14 22:24:05 +00:00
Diego Vela
a2e406ed85 Merge "Revert^2 "Add <uses-library> information."" 2020-12-14 22:09:58 +00:00
Diego Vela
1ef19adf52 Revert^2 "Add <uses-library> information."
7f1950928f

Change-Id: I8d3d6fee8e5a2b6eb337abb53f21b9b909b007c9
2020-12-14 22:05:04 +00:00
Diego Vela
9d61c8a23d Merge "Revert "Add <uses-library> information."" am: 54b741096b
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1527773

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib54a0349bf3590b40165d2205171e9c58a0a7b6f
2020-12-14 21:59:32 +00:00
Diego Vela
54b741096b Merge "Revert "Add <uses-library> information."" 2020-12-14 21:49:14 +00:00
Diego Vela
7f1950928f Revert "Add <uses-library> information."
Revert submission 1427961-uses-libs-23

Reason for revert: Broken build
Bug: 175607244
Reverted Changes:
I6ab699005:Add <uses-library> information.
Id5d5fe1df:Add <uses-library> information.
Id12741c9b:Add <uses-library> information.
I2fe6e09c2:Add <uses-library> information.

Change-Id: If1ca723c357ba3e8d9343fbb0f5d980d1e7ca1fb
2020-12-14 21:14:24 +00:00