Commit Graph

26436 Commits

Author SHA1 Message Date
Lei Yu
70f7a64133 Merge "Fix issue in panel logging" into qt-dev
am: 2b60204dba

Change-Id: I6561852b672e29f5aaddd2ef242e59698e1e2b6c
2019-04-25 00:14:09 -07:00
Fan Zhang
7be1bcf26c Merge "Fix incorrect mapping to get subscriptioninfo" into qt-dev
am: 9fa82a370b

Change-Id: If9af81bfa4d99eee0b211b7216b3ca9d1baa66f2
2019-04-25 00:13:10 -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
Ilya Matyukhin
67459a21ff Merge "Use auth token from intent extras" into qt-dev
am: 172d03c758

Change-Id: Ia410ae2ee581bd318f5d245e829b7d4a53af9b12
2019-04-24 23:44:06 -07:00
Lei Yu
2b60204dba Merge "Fix issue in panel logging" into qt-dev 2019-04-24 22:48:55 +00:00
Fan Zhang
9fa82a370b Merge "Fix incorrect mapping to get subscriptioninfo" into qt-dev 2019-04-24 21:44:53 +00:00
TreeHugger Robot
62d580d5b4 Merge "Implement off state for SIM details page" into qt-dev 2019-04-24 21:00:38 +00:00
Lei Yu
3aacfca16f Fix issue in panel logging
Update log key to slice uri since previous key has no meaning.

Previously it is something like:
androidx.slice.widget.SliceLiveData$SliceLiveDataImpl@1a30b5

Bug: 131094876
Test: Manual
Change-Id: I52d605eb826821ef622aa075c04f829c60692976
2019-04-24 12:50:46 -07: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
42eefd0d7e Merge "Fix notification preferences" into qt-dev 2019-04-24 17:46:28 +00:00
Ilya Matyukhin
172d03c758 Merge "Use auth token from intent extras" into qt-dev 2019-04-24 16:27:55 +00:00
andychou
6185e381e0 Fix incorrect mapping to get subscriptioninfo
getActiveSubscriptionInfoList() returns a list of active subscription.
It doesn't 1:1 mapping with slotId. So it is not correct to use slotId
as index to get subscriptioninfo from list.
Use framework interface getActiveSubscriptionInfoForSimSlotIndex() to
get subscriptioninfo per slotid instead.

Bug: 131123246
Test: Test with dual SIM device and atest SimStatusDialogControllerTest
pass

Change-Id: If7140f602571a5cb8dcdfff939bd84ccff0b482f
2019-04-24 23:18:51 +08: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
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
Kevin Chyn
10e7e5d8d0 Merge "Stay in face settings unless the user explicitly backs out" into qt-dev
am: b70f2b58e0

Change-Id: I49ea46f8456ed4e418d942b3a059126c1962c685
2019-04-23 22:37:29 -07:00
Kevin Chyn
b70f2b58e0 Merge "Stay in face settings unless the user explicitly backs out" into qt-dev 2019-04-24 04:56:11 +00:00
Ilya Matyukhin
3be240fd8a Use auth token from intent extras
Bug: 124324349
Test: confirmation dialog doesn't show up when intent has auth token
Change-Id: I9e071b06e1041b0d3c78932d8cb2c16c4c32bca5
2019-04-23 20:53:31 -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
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
TreeHugger Robot
0014cd721e Merge "Fix a NPE when removing accounts." into qt-dev 2019-04-24 01:22:49 +00:00
Kevin Chyn
8770f0866b Merge "Update toggle layout and always show footer text" into qt-dev
am: e7eba5d246

Change-Id: I81ad6d91b104af0f2a7e0a24d5254608bd0304ad
2019-04-23 18:21:45 -07:00
Kevin Chyn
e7eba5d246 Merge "Update toggle layout and always show footer text" into qt-dev 2019-04-24 00:12:45 +00:00
Kevin Chyn
0dfc2769cf Stay in face settings unless the user explicitly backs out
Bug: 130898604

Test: Builds
Change-Id: I7159c3a6259d298f78b8328b2c6974ba46fb56f9
2019-04-23 17:05:47 -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
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
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
Kweku Adams
6b91eb3047 Merge "Using explicit Looper in Handler initialization." into qt-dev
am: bb1d4e7f1e

Change-Id: Iacf57a71ef728c6c0954973b6811825c47931ccd
2019-04-23 12:24:50 -07:00
Hyunyoung Song
e85166328c Merge "Reduce binder call to OverlayManager (3->1)" into qt-dev
am: 5f328aff51

Change-Id: Ief93c695a1c160fe4c53f4492d1b2c25eac59ce0
2019-04-23 12:12:12 -07:00
Arc Wang
a23f01673b Merge "Add action metrics for Wi-Fi provision features" into qt-dev
am: 79f75e483f

Change-Id: I66646329c5f7813679dc8181ddd70d1cc3b4d3e6
2019-04-23 11:57:02 -07:00
TreeHugger Robot
bb1d4e7f1e Merge "Using explicit Looper in Handler initialization." into qt-dev 2019-04-23 18:28:56 +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
TreeHugger Robot
5f328aff51 Merge "Reduce binder call to OverlayManager (3->1)" into qt-dev 2019-04-23 17:50:05 +00:00
TreeHugger Robot
79f75e483f Merge "Add action metrics for Wi-Fi provision features" into qt-dev 2019-04-23 17:36:54 +00: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
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
ccc73b4ced Merge "Expand advanced button by default in Notifications." into qt-dev
am: ab2b8c5bfa

Change-Id: Ided47e34125d26ece6bdea048b444a90a8b8b2b5
2019-04-23 02:43:17 -07:00
TreeHugger Robot
ab2b8c5bfa Merge "Expand advanced button by default in Notifications." into qt-dev 2019-04-23 09:33:47 +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
Jason Chiu
a73d7715d1 Automatically direct the user to the captive portal in Wi-Fi Slice
Save the SSID when the user clicks the network, and then automatically
start login page when the network gets the captive portal capability.

Fixes: 128056349
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.wifi
Change-Id: Ia25241a8243d7d6aae604f341b512350404d9fd1
2019-04-23 12:07:20 +08:00
Clown SHEN
e0dbee7894 Merge "Correct detail page UI once user change MAC randomized setting" into qt-dev
am: 2e340d284e

Change-Id: I65852f7e05b31db4633a27d007c3bc5e0f0326f6
2019-04-22 20:13:24 -07:00
Clown SHEN
2e340d284e Merge "Correct detail page UI once user change MAC randomized setting" into qt-dev 2019-04-23 03:01:48 +00:00
Kevin Chyn
5c2842c1c8 Update toggle layout and always show footer text
Fixes: 130740123

Test: Builds

Change-Id: I5f64e22ca8123c6f2825d4341d94581a301551f7
2019-04-22 18:54:01 -07:00
cosmohsieh
b7fc587b5b Merge "Improve some comments of strings and codes" into qt-dev
am: 0bc3fac6d9

Change-Id: I7638a753e235ae4dee29cb0294918e896089d85e
2019-04-22 18:01:09 -07:00
Fan Zhang
d1bc5895b0 Merge "Partial revert Ib2396575bbc69a7cca5e9c90e113c76ff6db00b5" into qt-dev
am: 5e42b894bc

Change-Id: Id3fc9e6a6e211d530d4b33a0050fafd0de11e2d7
2019-04-22 17:32:32 -07:00