Commit Graph

8410 Commits

Author SHA1 Message Date
Fan Zhang
4df4d40e1a Merge "Remove disable mobile data confirm dialog for single sim." into qt-dev am: c78e4d1e0f
am: 3a5dd82969

Change-Id: Ica58d6efd8ed29551388f8c5b8183e0acd4bdb7a
2019-04-25 00:32:55 -07:00
Antony Sargent
4b20393348 Merge "Implement off state for SIM details page" into qt-dev am: 62d580d5b4
am: d6209877b1

Change-Id: I3f7ae6636b367eba9a64c9166dc1c2712e749dff
2019-04-25 00:30:36 -07:00
Julia Reynolds
a35e3d9d88 Merge "Fix notification preferences" into qt-dev am: 42eefd0d7e
am: 953bb4514c

Change-Id: I7110af8c4e1e5c7b740faa6df4437dd6ceb2272a
2019-04-25 00:18:15 -07:00
Fan Zhang
3a5dd82969 Merge "Remove disable mobile data confirm dialog for single sim." into qt-dev
am: c78e4d1e0f

Change-Id: I10e0331a85f7bb1626639896ecca7a445855dcac
2019-04-25 00:14:59 -07:00
Antony Sargent
d6209877b1 Merge "Implement off state for SIM details page" into qt-dev
am: 62d580d5b4

Change-Id: I37c513eb170667c6729b6a94a7788f24229dcf5a
2019-04-25 00:12:19 -07:00
Julia Reynolds
953bb4514c Merge "Fix notification preferences" into qt-dev
am: 42eefd0d7e

Change-Id: I177e26feac7fd555e9e86c4bc730764a993e36bb
2019-04-25 00:08:26 -07:00
TreeHugger Robot
c78e4d1e0f Merge "Remove disable mobile data confirm dialog for single sim." into qt-dev 2019-04-24 22:50:24 +00:00
TreeHugger Robot
62d580d5b4 Merge "Implement off state for SIM details page" into qt-dev 2019-04-24 21:00:38 +00:00
Fan Zhang
56c6f89a22 Remove disable mobile data confirm dialog for single sim.
Fixes: 124005813
Test: robotest
Change-Id: I2da563f26d6dbb1ec3c6c205f21a96c896b51334
2019-04-24 13:50:09 -07:00
Lei Yu
d68c8c59e5 Fix settings unit test
Also remove some obsolete tests

Fixes: 126257657
Test: atest
Change-Id: Ib9b654b9076176db3c331bf5ca14ac185c9e0b5f
2019-04-24 20:40:59 +00:00
Antony Sargent
74d8d9c31f Implement off state for SIM details page
When a subscription is disabled, we need to hide most things on the
details page. The UX mocks called for leaving in a few things such as
the data usage header and some carrier information, but in tests I've
done it looks like the telephony APIs don't have any of that available
when the subscription is disabled. So for now the only thing left on the
page in the disabled case is the on/off toggle at the very top.

Fixes: 129665956
Test: make RunSettingsRoboTests
Change-Id: I98f4590fca38d03b1e5ff2cf0d2b4876d2adf936
2019-04-24 10:54:47 -07:00
Julia Reynolds
e103aa8fd2 Fix notification preferences
- ImportancePreference should not be separately clickable
- new strings

Bug: 127796543
Fixes: 131060409
Test: make sure talkback doesn't read 'double tap to activate' when
the preference is focused

Change-Id: I6b6eef0915873b4e0b44c59758e5f4b5a265364b
2019-04-24 09:59:20 -04:00
tmfang
846f77ab81 Merge "Tweak search result for adaptive brightness" into qt-dev am: 4d03377901
am: 5cdafbc9ca

Change-Id: I26a132f195ae62e2f484cfdd936797f6e9fb4cd8
2019-04-24 01:21:42 -07:00
tmfang
5cdafbc9ca Merge "Tweak search result for adaptive brightness" into qt-dev
am: 4d03377901

Change-Id: Id63484b713666cecf041b3eafe20f8a0360102ad
2019-04-24 01:06:36 -07:00
TreeHugger Robot
4d03377901 Merge "Tweak search result for adaptive brightness" into qt-dev 2019-04-24 06:08:18 +00:00
hughchen
36ec99914a Merge "Fix crash when no Bluetooth feature in Settings" into qt-dev am: 7a237a40d7
am: 9eec44bdb0

Change-Id: If3bd9e5cd537dec317268385827019b0834b7bce
2019-04-23 22:50:18 -07:00
Fan Zhang
142dc4e3f7 Merge "Fix a NPE when removing accounts." into qt-dev am: 0014cd721e
am: 67c8031f08

Change-Id: I94888acb6d87bf2130c67d175bfded85a5635ebe
2019-04-23 21:54:29 -07:00
lindatseng
5c47099259 Merge "Fix robotests in settings/panel" into qt-dev am: 3225026ed6
am: 55c4916fb7

Change-Id: Ia01b885bb31631ebf62d85597e9a8e1358e686b8
2019-04-23 19:59:42 -07:00
hughchen
9eec44bdb0 Merge "Fix crash when no Bluetooth feature in Settings" into qt-dev
am: 7a237a40d7

Change-Id: Iaea1651a7ba22f1731ee8ad991664b073c5233c3
2019-04-23 19:57:47 -07:00
Amin Shaikh
55169adcd5 Merge "Add overlayable_icons_test.xml for Settings." into qt-dev am: cd52cf18ce
am: e6f875f267

Change-Id: Ifbc0be8431eb463c8748e919bbfa6cd543ec9711
2019-04-23 19:48:14 -07:00
TreeHugger Robot
7a237a40d7 Merge "Fix crash when no Bluetooth feature in Settings" into qt-dev 2019-04-24 02:45:09 +00:00
tmfang
e4753a3632 Tweak search result for adaptive brightness
- Create a new controller for auto brightness in
auto_brightness_detail.xml.
- We only show slice version for search result.
- Change slice summary for adaptive brightness.

Test: visual
Fixes: 130651278
Change-Id: If9b71735bbb2a0ee22676d9dfedab2cf9e778493
2019-04-24 10:04:38 +08:00
Fan Zhang
67c8031f08 Merge "Fix a NPE when removing accounts." into qt-dev
am: 0014cd721e

Change-Id: I7eb956631acac2f44040aca5c9ee325007f8e1f5
2019-04-23 19:03:19 -07:00
Fan Zhang
3e8626b6dc Merge "Test case clean up." into qt-dev am: c6bc40d397
am: 8243f6ae44

Change-Id: I70978d1fe98c7e4b04c068d5d0f376d9a8be84aa
2019-04-23 18:53:41 -07:00
TreeHugger Robot
0014cd721e Merge "Fix a NPE when removing accounts." into qt-dev 2019-04-24 01:22:49 +00:00
Fan Zhang
f489fb9bd1 Merge "Force the adapter to rebind cards with a toggle." into qt-dev am: 141984df7f
am: ab12ffbbb3

Change-Id: Ifda9379665a641a046f0c9b70430acf2d636f261
2019-04-23 17:21:47 -07:00
lindatseng
55c4916fb7 Merge "Fix robotests in settings/panel" into qt-dev
am: 3225026ed6

Change-Id: I9e34dfd5420266fe43b119a352f0e93dc29b2993
2019-04-23 17:15:00 -07:00
Antony Sargent
74cc69fb2e Merge "Always show disabled pSIMs in single-sim mode" into qt-dev am: cd07aa1cc4
am: 4d9ff1e113

Change-Id: I7b0a4bd4d0ac01c17998784bbf8ff49e025a28a6
2019-04-23 17:07:43 -07:00
TreeHugger Robot
3225026ed6 Merge "Fix robotests in settings/panel" into qt-dev 2019-04-23 23:44:31 +00:00
Amin Shaikh
e6f875f267 Merge "Add overlayable_icons_test.xml for Settings." into qt-dev
am: cd52cf18ce

Change-Id: I3f926f0d02076e2c97b15a4e438d3bcb1b305f3c
2019-04-23 15:49:38 -07:00
Fan Zhang
8243f6ae44 Merge "Test case clean up." into qt-dev
am: c6bc40d397

Change-Id: I20ebfd2bddc7d93305f4075343d27bcf0c5ecc41
2019-04-23 15:48:20 -07:00
Fan Zhang
ab12ffbbb3 Merge "Force the adapter to rebind cards with a toggle." into qt-dev
am: 141984df7f

Change-Id: I74eac95f91152760ca6abed6eff729e6eec0e933
2019-04-23 15:46:30 -07:00
TreeHugger Robot
cd52cf18ce Merge "Add overlayable_icons_test.xml for Settings." into qt-dev 2019-04-23 22:39:55 +00:00
Fan Zhang
c6bc40d397 Merge "Test case clean up." into qt-dev 2019-04-23 22:34:46 +00:00
Fan Zhang
141984df7f Merge "Force the adapter to rebind cards with a toggle." into qt-dev 2019-04-23 22:33:16 +00:00
Fan Zhang
e3ecf5bb9e Fix a NPE when removing accounts.
Guard against null activity. If activity is already null, there is no
need to call finish().

Fixes: 131180213
Test: robotests
Change-Id: I19232ed67ddd0c3539b1827de23fdc584850b519
2019-04-23 15:23:36 -07:00
Andrew Sapperstein
7aa1566584 Merge "Fix WifiDetailPreferenceControllerTest new test case failure" into qt-dev am: 28cfb72aaa
am: b2ad73da8e

Change-Id: I2d267d88965d3db10849ece1a920f27f75687590
2019-04-23 15:13:36 -07:00
lindatseng
f19f7981df Fix robotests in settings/panel
Remove @Ignore for tests in settings/panel after testing.
Also update VolumePanelTest according to the recent changes to
remote volume slice.

Test: atest PanelFragmentTest
Test: atest SettingsPanelActivityTest
Test: VolumePanelTest
Fixes: 130896218
Change-Id: Iaa99e65d959cafd382d7209664f2fdbf660c29e0
2019-04-23 15:03:34 -07:00
Antony Sargent
4d9ff1e113 Merge "Always show disabled pSIMs in single-sim mode" into qt-dev
am: cd07aa1cc4

Change-Id: I830e9604d1005f354d10ff5cb30c911243284e42
2019-04-23 14:28:57 -07:00
TreeHugger Robot
cd07aa1cc4 Merge "Always show disabled pSIMs in single-sim mode" into qt-dev 2019-04-23 21:06:47 +00:00
Andrew Sapperstein
b2ad73da8e Merge "Fix WifiDetailPreferenceControllerTest new test case failure" into qt-dev
am: 28cfb72aaa

Change-Id: I5543b540f1b61a4c0f844f11886e45d56959162d
2019-04-23 12:19:11 -07:00
Amin Shaikh
1a5317c34d Add overlayable_icons_test.xml for Settings.
This ensures that developers do not accidentally delete/rename overlayed
icons without updating overlayable_icons_test.xml and renaming overlayed assets.

Bug: 128571899
Test: make RunSettingsRoboTests
Change-Id: I991883a7d480fbae848106ab24033a16d1405300
2019-04-23 15:04:02 -04:00
Andrew Sapperstein
28cfb72aaa Merge "Fix WifiDetailPreferenceControllerTest new test case failure" into qt-dev 2019-04-23 18:18:41 +00:00
Antony Sargent
bdd9eb3ba7 Always show disabled pSIMs in single-sim mode
In single-sim mode, you can have both an eSIM subscription and a pSIM
inserted into the device, and only one of them can be enabled. It turns
out that if the pSIM is the disabled one, we would not show it in the
settings UI; this CL fixes that.

It also fixes a somewhat related problem that I noticed while testing
this, that if you have only one subscription that happens to be
disabled, we were not showing the on/off switch at the top of the page,
which would leave you with no way to enable it.

Bug: 129864878
Test: make RunSettingsRoboTests
Change-Id: I4214ad34c59ac2df429772c066c51a9318f5baa7
2019-04-23 10:55:51 -07:00
Jason Chiu
a8feaee8e0 Merge "Automatically direct the user to the captive portal in Wi-Fi Slice" into qt-dev am: 805e208f14
am: 86d8a9ce8d

Change-Id: I449770b897407afae739ae5e9e852a694512f70f
2019-04-23 09:30:01 -07:00
Jason Chiu
86d8a9ce8d Merge "Automatically direct the user to the captive portal in Wi-Fi Slice" into qt-dev
am: 805e208f14

Change-Id: I733b0eb6cfded17baa0f1fb1e329618fb16547c3
2019-04-23 09:13:56 -07:00
Yi-Ling Chuang
80dd452e89 Test case clean up.
Move some test cases from ContextualCardLoader to
EligibleCardChecker.

Fixes: 131147203
Test: robotests
Change-Id: Ia6508962d7b878c5f89b8d350c791a44cadb9d36
2019-04-23 20:41:50 +08:00
TreeHugger Robot
805e208f14 Merge "Automatically direct the user to the captive portal in Wi-Fi Slice" into qt-dev 2019-04-23 11:47:21 +00:00
Yi-Ling Chuang
acb50f2c6a Force the adapter to rebind cards with a toggle.
A card dismissal and scheduled card collection trigger a reload. During
card reloading, we perform slices pre check. The pre check goes through
the whole slice binding process, which means slices will be pinned and unpinned.
Hence, the on screen slices will gets unpinned resulting to the
unresponsive toggling.

As we have DiffCallbck implmented, if the card list are the same, then
bindView in the renderer will be ignored, which means the unpinned slice
will have no chance to re-register slice callback. So here we force it
to rebind the views.

Fixes: 123174237
Test: robotests
Change-Id: Id98bc16632bf024cbb611b40890e4d2629f08d7b
2019-04-23 17:19:56 +08:00
clownshen
b87e5455bc Fix WifiDetailPreferenceControllerTest new test case failure
Bug: 130370187
Test: make RunSettingsRoboTests -j32 ROBOTEST_FILTER=com.android.settings.wifi.details.WifiDetailPreferenceControllerTest
Change-Id: I314702be14db4e853412874c123e0a4b229849a2
2019-04-23 17:15:32 +08:00