Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
David Su
2020-02-19 19:07:40 +00:00
committed by Android (Google) Code Review
parent 5263c11a4c 121cfa79db
commit f0e76331da
3 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/OsuLogin/AndroidManifest.xml
View File

@@ -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">

2
packages/OsuLogin/res/layout/osu_web_view.xml
View File

@@ -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"

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

@@ -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;
@@ -194,7 +192,7 @@ public class OsuLoginActivity extends Activity {
// Check if the key event was the Back button.
if ((keyCode == KeyEvent.KEYCODE_BACK)) {
// If there is a history to move back
if (mWebView.canGoBack()){
if (mWebView.canGoBack()) {
mWebView.goBack();
return true;
}
@@ -278,6 +276,6 @@ public class OsuLoginActivity extends Activity {
mPageError = true;
Log.e(TAG, "onReceived Error for MainFrame: " + error.getErrorCode());
}
}
}
}
}