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

Commit f0e76331 authored by David Su's avatar David Su Committed by Android (Google) Code Review
Browse files

Merge "Rename OsuLogin package to com.android.hotspot2.osulogin"

parents 5263c11a 121cfa79

packages/OsuLogin/AndroidManifest.xml

+2 −2
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
 */

-->

<manifest xmlns:android="http://schemas.android.com/apk/res/android"

          package="com.android.hotspot2">

          package="com.android.hotspot2.osulogin">

    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>

    <uses-permission android:name="android.permission.CHANGE_WIFI_STATE"/>

    <uses-permission android:name="android.permission.INTERNET"/>
@@ -28,7 +28,7 @@ 
        android:label="@string/app_name"

        android:configChanges="keyboardHidden|orientation|screenSize"

        android:supportsRtl="true">

        <activity android:name="com.android.hotspot2.osu.OsuLoginActivity"

        <activity android:name="com.android.hotspot2.osulogin.OsuLoginActivity"

                  android:label="@string/action_bar_label"

                  android:theme="@style/AppTheme"

                  android:configChanges="keyboardHidden|orientation|screenSize">

packages/OsuLogin/res/layout/osu_web_view.xml

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
             android:id="@+id/container"

             android:layout_width="match_parent"

             android:layout_height="match_parent"

             tools:context="com.android.hotspot2.osu.OsuLoginActivity">

             tools:context="com.android.hotspot2.osulogin.OsuLoginActivity">

    <LinearLayout

        android:layout_width="match_parent"

        android:layout_height="match_parent"

packages/OsuLogin/src/com/android/hotspot2/osu/OsuLoginActivity.java→packages/OsuLogin/src/com/android/hotspot2/osulogin/OsuLoginActivity.java

+3 −5
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



package com.android.hotspot2.osu;

package com.android.hotspot2.osulogin;



import static android.net.NetworkCapabilities.NET_CAPABILITY_TRUSTED;
@@ -42,8 +42,6 @@ import android.widget.Toast; 


import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;



import com.android.hotspot2.R;



import java.net.MalformedURLException;

import java.net.URL;