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

Commit 916aef7e authored by Chen Xu's avatar Chen Xu Committed by android-build-merger
Browse files

Merge "integrate portal webview to the default app" am: e3ece71f 

am: dd7ff358

Change-Id: I929abe090a0e9632e75004a026af3e93c2898cb8
parents 081d93d1 dd7ff358

packages/CarrierDefaultApp/AndroidManifest.xml

+9 −4
Original line number Original line Diff line number Diff line
@@ -25,7 +25,6 @@ 
    <uses-permission android:name="android.permission.MODIFY_PHONE_STATE" />

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

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

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

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

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

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

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

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





    <application android:label="@string/app_name" >

    <application android:label="@string/app_name" >
@@ -34,10 +33,16 @@ 
                <action android:name="com.android.internal.telephony.CARRIER_SIGNAL_REDIRECTED" />

                <action android:name="com.android.internal.telephony.CARRIER_SIGNAL_REDIRECTED" />

            </intent-filter>

            </intent-filter>

        </receiver>

        </receiver>

        <activity android:name="com.android.carrierdefaultapp.CaptivePortalLaunchActivity"

            android:theme="@android:style/Theme.Translucent.NoTitleBar"

            android:excludeFromRecents="true"/>

        <service android:name="com.android.carrierdefaultapp.ProvisionObserver"

        <service android:name="com.android.carrierdefaultapp.ProvisionObserver"

                 android:permission="android.permission.BIND_JOB_SERVICE"/>

                 android:permission="android.permission.BIND_JOB_SERVICE"/>

        <activity

            android:name="com.android.carrierdefaultapp.CaptivePortalLoginActivity"

            android:label="@string/action_bar_label"

            android:theme="@style/AppTheme"

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

            <intent-filter>

                <category android:name="android.intent.category.DEFAULT"/>

            </intent-filter>

        </activity>

    </application>

    </application>

</manifest>
 
</manifest>

packages/CarrierDefaultApp/assets/quantum_ic_warning_amber_96.png

0 → 100644
+682 B
Loading image diff...

packages/CarrierDefaultApp/res/layout/activity_captive_portal_login.xml

0 → 100644
+34 −0
Original line number Original line Diff line number Diff line 
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:tools="http://schemas.android.com/tools"

    android:id="@+id/container"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    tools:context="com.android.carrierdefaultapp.CaptivePortalLoginActivity"

    tools:ignore="MergeRootFrame">

    <LinearLayout

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:orientation="vertical" >



    <TextView

        android:id="@+id/url_bar"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:textSize="20sp"

        android:singleLine="true" />



    <ProgressBar

        android:id="@+id/progress_bar"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        style="?android:attr/progressBarStyleHorizontal" />



    <WebView

        android:id="@+id/webview"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:layout_alignParentBottom="false"

        android:layout_alignParentRight="false" />



</LinearLayout>

</FrameLayout>

packages/CarrierDefaultApp/res/values/dimens.xml

+3 −0
Original line number Original line Diff line number Diff line 
<resources>

<resources>

    <dimen name="glif_icon_size">32dp</dimen>

    <dimen name="glif_icon_size">32dp</dimen>

    <!-- Default screen margins, per the Android Design guidelines. -->

    <dimen name="activity_horizontal_margin">16dp</dimen>

    <dimen name="activity_vertical_margin">16dp</dimen>

</resources>
 
</resources>

packages/CarrierDefaultApp/res/values/strings.xml

+4 −5
Original line number Original line Diff line number Diff line
@@ -6,9 +6,8 @@ 
    <string name="no_data_notification_id">Your mobile data has been deactivated</string>

    <string name="no_data_notification_id">Your mobile data has been deactivated</string>

    <string name="portal_notification_detail">Tap to visit the %s website</string>

    <string name="portal_notification_detail">Tap to visit the %s website</string>

    <string name="no_data_notification_detail">Please contact your service provider %s</string>

    <string name="no_data_notification_detail">Please contact your service provider %s</string>

    <string name="progress_dialogue_network_connection">Connecting to captive portal...</string>

    <string name="action_bar_label">Sign in to mobile network</string>

    <string name="alert_dialogue_network_timeout">Network timeout, would you like to retry?</string>

    <string name="ssl_error_warning">The network you&#8217;re trying to join has security issues.</string>

    <string name="alert_dialogue_network_timeout_title">Network unavailable</string>

    <string name="ssl_error_example">For example, the login page may not belong to the organization shown.</string>

    <string name="quit">Quit</string>

    <string name="ssl_error_continue">Continue anyway via browser</string>

    <string name="wait">Wait</string>

</resources>
 
</resources>