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

Commit 9b29d629 authored by Remi NGUYEN VAN's avatar Remi NGUYEN VAN Committed by android-build-merger
Browse files

Merge "Prepare CaptivePortalLogin for system_current" 

am: 74b1c862

Change-Id: I94b2c465290c36a601de89f6c9e8ebd138b2efe7
parents 1a0ac241 74b1c862

packages/CaptivePortalLogin/Android.bp

0 → 100644
+27 −0
Original line number Diff line number Diff line 
//

// Copyright (C) 2019 The Android Open Source Project

//

// Licensed under the Apache License, Version 2.0 (the "License");

// you may not use this file except in compliance with the License.

// You may obtain a copy of the License at

//

//      http://www.apache.org/licenses/LICENSE-2.0

//

// Unless required by applicable law or agreed to in writing, software

// distributed under the License is distributed on an "AS IS" BASIS,

// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

// See the License for the specific language governing permissions and

// limitations under the License.

//



android_app {

    name: "CaptivePortalLogin",

    srcs: ["src/**/*.java"],

    platform_apis: true,

    certificate: "platform",

    static_libs: [

        "android-support-v4",

        "metrics-constants-protos",

    ],

    manifest: "AndroidManifest.xml",

}

packages/CaptivePortalLogin/Android.mk

deleted100644 → 0
+0 −13
Original line number Diff line number Diff line 
LOCAL_PATH:= $(call my-dir)

include $(CLEAR_VARS)



LOCAL_MODULE_TAGS := optional

LOCAL_STATIC_JAVA_LIBRARIES := android-support-v4



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



LOCAL_PACKAGE_NAME := CaptivePortalLogin

LOCAL_PRIVATE_PLATFORM_APIS := true

LOCAL_CERTIFICATE := platform



include $(BUILD_PACKAGE)

packages/CaptivePortalLogin/AndroidManifest.xml

+2 −1
Original line number Diff line number Diff line
@@ -21,7 +21,8 @@ 


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

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

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

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

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

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

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

packages/CaptivePortalLogin/res/layout/ssl_error_msg.xml

deleted100644 → 0
+0 −28
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2018 The Android Open Source Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

     You may obtain a copy of the License at



          http://www.apache.org/licenses/LICENSE-2.0



     Unless required by applicable law or agreed to in writing, software

     distributed under the License is distributed on an "AS IS" BASIS,

     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

     See the License for the specific language governing permissions and

     limitations under the License.

-->



<TextView

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

    android:id="@+id/ssl_error_msg"

    android:layout_width="wrap_content"

    android:layout_height="wrap_content"

    android:textAppearance="?android:attr/textAppearanceSmall"

    android:layout_marginStart="20dip"

    android:layout_marginEnd="20dip"

    android:gravity="center_vertical"

    android:layout_marginBottom="4dip"

    android:layout_marginTop="4dip" />

packages/CaptivePortalLogin/res/layout/ssl_warning.xml

+11 −0
Original line number Diff line number Diff line
@@ -78,7 +78,18 @@ 
            android:id="@+id/certificate_layout"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:orientation="vertical"

            android:layout_marginBottom="16dip" >

            <TextView

                android:id="@+id/ssl_error_msg"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:textAppearance="?android:attr/textAppearanceSmall"

                android:layout_marginStart="20dip"

                android:layout_marginEnd="20dip"

                android:gravity="center_vertical"

                android:layout_marginBottom="4dip"

                android:layout_marginTop="16dip" />

        </LinearLayout>



    </ScrollView>