Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9ba8ed11 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Migrated various apps under frameworks/base/packages/CaptivePortalLogin to androidx"

parents 163e3882 5e1a52f6

packages/CaptivePortalLogin/Android.mk

+3 −1
Original line number Diff line number Diff line
@@ -2,7 +2,9 @@ LOCAL_PATH:= $(call my-dir) 
include $(CLEAR_VARS)



LOCAL_MODULE_TAGS := optional

LOCAL_STATIC_JAVA_LIBRARIES := android-support-v4 services.net

LOCAL_USE_AAPT2 := true

LOCAL_STATIC_ANDROID_LIBRARIES := androidx.legacy_legacy-support-v4

LOCAL_STATIC_JAVA_LIBRARIES := services.net



LOCAL_SRC_FILES := $(call all-java-files-under, src)

packages/CaptivePortalLogin/res/layout/activity_captive_portal_login.xml

+2 −2
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ 
            android:layout_height="wrap_content" />

      </FrameLayout>



      <android.support.v4.widget.SwipeRefreshLayout

      <androidx.swiperefreshlayout.widget.SwipeRefreshLayout

            android:id="@+id/swipe_refresh"

            android:layout_width="match_parent"

            android:layout_height="match_parent">
@@ -37,7 +37,7 @@ 
              android:layout_height="match_parent"

              android:layout_alignParentBottom="false"

              android:layout_alignParentRight="false" />

      </android.support.v4.widget.SwipeRefreshLayout>

      </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>



    </LinearLayout>

</FrameLayout>

packages/CaptivePortalLogin/src/com/android/captiveportallogin/CaptivePortalLoginActivity.java

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ import android.net.wifi.WifiInfo; 
import android.os.Build;

import android.os.Bundle;

import android.provider.Settings;

import android.support.v4.widget.SwipeRefreshLayout;

import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;

import android.text.TextUtils;

import android.util.ArrayMap;

import android.util.Log;