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
Cating Lin
84e6a47895
The icon of suggestion_fingerprint should be blue.
...
Bug: b/131117150
Test: Manual Test
Change-Id: If7a07bf1caeb21f820e141f5412d91178007f7bc
2019-04-24 09:26:49 +08: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
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
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
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
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
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
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
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
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
Beverly
3af410c9fa
Merge "Remove "unless turned on automatically" text" into qt-dev am: 87158ed0b2
...
am: cab31cf14c
Change-Id: I653f40988ee3074aaa6406fb457d10672dc0059d
2019-04-23 14:23:35 -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
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
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
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
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
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
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
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
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
104acaf3d4
Merge "Change description string of Wi-Fi add device" into qt-dev am: dd310fa892
...
am: e7f2326b63
Change-Id: I32fd0bf6d2906bc3c5bc31c7a2662542c20346c7
2019-04-22 21:51:15 -07: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