Commit Graph

27127 Commits

Author SHA1 Message Date
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
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
Kevin Chyn
e7eba5d246 Merge "Update toggle layout and always show footer text" into qt-dev 2019-04-24 00:12:45 +00: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
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
Kweku Adams
ffba9c7c40 Merge "Using explicit Looper in Handler initialization." into qt-dev am: bb1d4e7f1e
am: 6b91eb3047

Change-Id: Iff6065d49960e71fd8527752e65f2b964ed94b19
2019-04-23 15:21:54 -07:00
Hyunyoung Song
1a0a4c1bb0 Merge "Reduce binder call to OverlayManager (3->1)" into qt-dev am: 5f328aff51
am: e85166328c

Change-Id: Ic68b26bbe3daa61650b78bc00372566a3194e97a
2019-04-23 15:10:06 -07:00
Arc Wang
9680a5892b Merge "Add action metrics for Wi-Fi provision features" into qt-dev am: 79f75e483f
am: a23f01673b

Change-Id: I4c22fc284b5ae87dd04cfe5052a400421657f22c
2019-04-23 14:49:05 -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
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
pastychang
ec0a30a8b9 Set QR scan activity to light theme in setup flow
Test: atest
Bug: 131029518
Change-Id: Ibec28e78fcf17390cd3844ead4a88a4e6bff6094
2019-04-23 13:38:39 +00: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
21903c6c9b Merge "Expand advanced button by default in Notifications." into qt-dev am: ab2b8c5bfa
am: ccc73b4ced

Change-Id: Id09dd033a788aa0cc949b6d934d0996295bbf6a7
2019-04-23 02:51:18 -07: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
50234a6d6f Merge "Correct detail page UI once user change MAC randomized setting" into qt-dev am: 2e340d284e
am: e0dbee7894

Change-Id: I0f499ed7e65cc4cc1b8736694577493c5e535caf
2019-04-22 20:35:56 -07: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
46bf431734 Merge "Improve some comments of strings and codes" into qt-dev am: 0bc3fac6d9
am: b7fc587b5b

Change-Id: Ie78c6030466f81b4526cf2e26986bae816d811ea
2019-04-22 18:29:44 -07:00
Fan Zhang
2df01c1ae9 Merge "Partial revert Ib2396575bbc69a7cca5e9c90e113c76ff6db00b5" into qt-dev am: 5e42b894bc
am: d1bc5895b0

Change-Id: I9a1bde9ec5bbd3b6ca00cce451e0970d7a6c79ae
2019-04-22 18:11:43 -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
TreeHugger Robot
0bc3fac6d9 Merge "Improve some comments of strings and codes" into qt-dev 2019-04-23 00:04:56 +00:00
Hyunyoung Song
205bac7c26 Reduce binder call to OverlayManager (3->1)
Bug: 131112014
Test: builds, manually tested

Change-Id: I1f0fba30a55713be92b8755c0793ee84928f9d5e
2019-04-22 16:59:45 -07:00
Kweku Adams
1db16a7d4b Using explicit Looper in Handler initialization.
Bug: 130639146
Test: flash device and toggle settings
Change-Id: I40d0578487c94da9fc9d940089bacbddf3a43751
2019-04-22 16:52:48 -07:00
Fan Zhang
c25fe8d6d1 Merge "Fix CodeInspectionTest" into qt-dev am: 4b54ad9bd5
am: d9fb048712

Change-Id: Ie7e99df8d2a2721120178886763db00b4c4adbc5
2019-04-22 16:02:46 -07:00
Fan Zhang
5e42b894bc Merge "Partial revert Ib2396575bbc69a7cca5e9c90e113c76ff6db00b5" into qt-dev 2019-04-22 22:48:59 +00:00
Fan Zhang
d9fb048712 Merge "Fix CodeInspectionTest" into qt-dev
am: 4b54ad9bd5

Change-Id: I9f5885c5c9e52019ea9142337b18722e903a459c
2019-04-22 15:14:51 -07:00
TreeHugger Robot
4b54ad9bd5 Merge "Fix CodeInspectionTest" into qt-dev 2019-04-22 21:37:29 +00:00
Fan Zhang
12533b9588 Partial revert Ib2396575bbc69a7cca5e9c90e113c76ff6db00b5
The previous change removed summary text for gesture settings too
aggresively. We still need summary in main Settings app, just not in
search.

Fixes: 130652619
Test: manual
Change-Id: I95ae3ca31b34a514f10993413527e987cf67d998
2019-04-22 12:28:07 -07:00
Lei Yu
cc8f78bf30 Merge "Add mms preference and controller" into qt-dev am: f3365e911d
am: 7ec9c1db1d

Change-Id: I6a18373e1567d332a8a6a74c8449fc9ec9d28698
2019-04-22 11:35:04 -07:00
Lei Yu
39cb151ead Merge "Remove feature flag for slice injection" into qt-dev am: fe393599a0
am: cbb86c71b6

Change-Id: I7c38ee5efcec236e5aabfcf3b9c81632b2b2e5ee
2019-04-22 11:20:01 -07:00
Lei Yu
7ec9c1db1d Merge "Add mms preference and controller" into qt-dev
am: f3365e911d

Change-Id: I7d564e576a0ce387f376e71af54839794a3281cd
2019-04-22 11:14:34 -07:00
Lei Yu
cbb86c71b6 Merge "Remove feature flag for slice injection" into qt-dev
am: fe393599a0

Change-Id: I8cb5753b3d809811464b8410e3b26be35e0efca6
2019-04-22 11:10:37 -07:00