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

Commit 6b1b6876 authored by Baligh Uddin's avatar Baligh Uddin Committed by android-build-merger
Browse files

resolve merge conflicts of aef843f9 to... 

resolve merge conflicts of aef843f9 to qt-dev-plus-aosp Test: I solemnly swear I tested this conflict resolution. BUG: 133225687 am: 0beb862b
am: 1724a20e

Change-Id: I1292fb211ba0af18fc0790d82a1ce7be77d1865f
parents 5e7ef56a 1724a20e

packages/CaptivePortalLogin/Android.bp

deleted100644 → 0
+0 −43
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.

//



java_defaults {

    name: "CaptivePortalLoginDefaults",

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

    sdk_version: "system_current",

    min_sdk_version: "28",

    static_libs: [

        "androidx.legacy_legacy-support-v4",

        "metrics-constants-protos",

        "captiveportal-lib",

    ],

    manifest: "AndroidManifest.xml",

}



android_app {

    name: "CaptivePortalLogin",

    defaults: ["CaptivePortalLoginDefaults"],

    certificate: "networkstack",

}



// Alternative CaptivePortalLogin signed with the platform cert, to use

// with InProcessNetworkStack.

android_app {

    name: "PlatformCaptivePortalLogin",

    defaults: ["CaptivePortalLoginDefaults"],

    certificate: "platform",

    overrides: ["CaptivePortalLogin"],

}

packages/CaptivePortalLogin/AndroidManifest.xml

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

<!--

/*

 * Copyright (C) 2014 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.

 */

-->

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

    package="com.android.captiveportallogin"

    android:versionCode="220000000"

    android:versionName="Q-initial">



    <uses-sdk android:minSdkVersion="28" android:targetSdkVersion="28" />

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

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

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

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

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

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

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



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

                 android:icon="@drawable/app_icon"

                 android:usesCleartextTraffic="true"

                 android:supportsRtl="true" >

        <activity

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

            android:label="@string/action_bar_label"

            android:theme="@style/AppTheme"

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

            <intent-filter>

                <action android:name="android.net.conn.CAPTIVE_PORTAL"/>

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

            </intent-filter>

        </activity>

    </application>

</manifest>

packages/CaptivePortalLogin/OWNERS

deleted100644 → 0
+0 −5
Original line number Diff line number Diff line 
set noparent



lorenzo@google.com

baligh@google.com

delphij@google.com

packages/CaptivePortalLogin/assets/quantum_ic_warning_amber_96.png

deleted100644 → 0
−682 B
Loading image diff...

packages/CaptivePortalLogin/res/drawable/app_icon.xml

deleted100644 → 0
+0 −26
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.

-->

<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">

    <background>

        <color android:color="@*android:color/accent_device_default_light" />

    </background>

    <foreground>

        <inset

            android:drawable="@drawable/maybe_wifi"

            android:inset="25%">

        </inset>

    </foreground>

</adaptive-icon>