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
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
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
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
Andrew Sapperstein
28cfb72aaa
Merge "Fix WifiDetailPreferenceControllerTest new test case failure" into qt-dev
2019-04-23 18:18:41 +00:00
Beverly
cab31cf14c
Merge "Remove "unless turned on automatically" text" into qt-dev
...
am: 87158ed0b2
Change-Id: I9fcdb16ab74587f48c30cf703715fe7942e8023f
2019-04-23 11:13:50 -07: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
TreeHugger Robot
87158ed0b2
Merge "Remove "unless turned on automatically" text" into qt-dev
2019-04-23 17:02:28 +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
Beverly
6315dc41d1
Remove "unless turned on automatically" text
...
- In Q, the title of this preference was changed from
"Duration" to "Default duration." The title change clarifies
that the preference controls the dnd default duration and not the
schedules, so we can now remove "unless turned on automatically"
text in the subtext.
Test: manual
Fixes: 130843902
Change-Id: I404acd61136e1e1aa4675e421c07ce871c1f9db9
2019-04-23 10:08:32 -04: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
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
Arc Wang
e7f2326b63
Merge "Change description string of Wi-Fi add device" into qt-dev
...
am: dd310fa892
Change-Id: I2d5ad539a8cf480a1d47b597b8f71b778aa12bb7
2019-04-22 21:47:19 -07:00
TreeHugger Robot
dd310fa892
Merge "Change description string of Wi-Fi add device" into qt-dev
2019-04-23 04:32:26 +00: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
1575a3fa40
Merge "Fix WifiDetailPreferenceControllerTest failure" into qt-dev
...
am: 2a14b7e8b5
Change-Id: If34484a29f3338bb594e47e65ae9f4c9049cfd7e
2019-04-22 20:15:35 -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
2a14b7e8b5
Merge "Fix WifiDetailPreferenceControllerTest failure" into qt-dev
2019-04-23 03:02:31 +00: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
Alex Salo
7bb8466d96
Merge "Remove todo comment" into qt-dev
...
am: 37db031aa1
Change-Id: If7ae4aab6b59ebe0b6a759cd464d9054b11be3b0
2019-04-22 18:20:57 -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
Kevin Chyn
012ba13cb3
Merge "Update enrollment footer icon" into qt-dev
...
am: c9239e11b6
Change-Id: I64f8178d7838781ddc3f1a86117e59f9ca81617a
2019-04-22 18:00:13 -07:00
Kevin Chyn
38d44c96a0
Merge "Update introduction layout spacing" into qt-dev
...
am: 89f0d5274a
Change-Id: I197d2451018bf3b6ae4d9135fd716fcaab0797b7
2019-04-22 17:55:21 -07:00
Lei Yu
787e15fbe5
Merge "Test fix: Add MmsPreferenceController to whitelist" into qt-dev
...
am: 357825d228
Change-Id: I5e64d99af01a568f2f98fbda0240ca09e85fc65c
2019-04-22 17:50:40 -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
37db031aa1
Merge "Remove todo comment" into qt-dev
2019-04-23 00:19:26 +00: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
Kevin Chyn
c9239e11b6
Merge "Update enrollment footer icon" into qt-dev
2019-04-22 23:23:16 +00:00
Kevin Chyn
89f0d5274a
Merge "Update introduction layout spacing" into qt-dev
2019-04-22 23:16:39 +00:00
Lei Yu
357825d228
Merge "Test fix: Add MmsPreferenceController to whitelist" into qt-dev
2019-04-22 22:57:24 +00:00
Lei Yu
41ad7a5bb4
Test fix: Add MmsPreferenceController to whitelist
...
Add it to grandfather_slice_controller_not_in_xml since right now
it only exists in mobile_network_settings_v2.xml, not v1.
This should be fixed automatically once we remove all old code.
Bug: 130222866
Test: RunSettingsRoboTests
Change-Id: Ib0bc976fd31818d7b39ca9f3e7427859fd7175ff
2019-04-22 15:55:16 -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
Alex Salo
eaa5d1ffa3
Remove todo comment
...
Bug: 129352433
Test: not needed
Change-Id: I7aa7840c0852c17ed05dba684fdd84cb7d5ad4ed
2019-04-22 14:55:28 -07:00
TreeHugger Robot
4b54ad9bd5
Merge "Fix CodeInspectionTest" into qt-dev
2019-04-22 21:37:29 +00:00
Kevin Chyn
338883034f
Update enrollment footer icon
...
Fixes: 131094701
Test: Builds
Change-Id: I9e1a75986ffeb35791271d55bf05a2daa9af5bad
2019-04-22 12:38:33 -07: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
Kevin Chyn
c5ae8a7bab
Update introduction layout spacing
...
Bug: 130740990
Test: builds
Change-Id: I2c10d991097fcdb7eb0775f744b5b12af2597780
2019-04-22 11:51:29 -07:00