Merge "[Provider Model] Internet Panel UI update"

src/com/android/settings/network/ProviderModelSlice.java

@@ -82,7 +82,7 @@ public class ProviderModelSlice extends WifiSlice {
         // Third section:  Add the Wi-Fi items which are not connected.
         // Fourth section:  If device has connection problem, this row show the message for user.
 
-        if (mHelper.isAirplaneModeEnabled()) {
+        if (mHelper.isAirplaneModeEnabled() && !mWifiManager.isWifiEnabled()) {
             log("Airplane mode is enabled.");
             // ToDo Next CL will add the Airplane mode Message.
             return mHelper.createListBuilder(getUri()).build();

src/com/android/settings/wifi/slice/WifiSlice.java

@@ -183,7 +183,7 @@ public class WifiSlice implements CustomSliceable {
 
     private IconCompat getEndIcon(WifiSliceItem wifiSliceItem) {
         if (wifiSliceItem.getConnectedState() != WifiEntry.CONNECTED_STATE_DISCONNECTED) {
-            return null;
+            return IconCompat.createWithResource(mContext, R.drawable.ic_settings_24dp);
         }
 
         if (wifiSliceItem.getSecurity() != WifiEntry.SECURITY_NONE) {