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

Commit 984fe74b authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 7187929 from 91568eb5 to rvc-qpr3-release

Change-Id: Ifac156d29ca1a4c792f862b7ab8067e607832461
parents eb94dbd8 91568eb5
Loading
Loading
Loading
Loading
+0 −31
Original line number Diff line number Diff line
@@ -17,18 +17,14 @@
package com.android.internal.app;

import android.app.AlertDialog;
import android.compat.annotation.UnsupportedAppUsage;
import android.content.BroadcastReceiver;
import android.content.Context;
import android.content.DialogInterface;
import android.content.Intent;
import android.content.IntentFilter;
import android.location.LocationManagerInternal;
import android.os.Bundle;
import android.os.Handler;
import android.os.Message;
import android.util.Log;
import android.widget.Toast;

import com.android.internal.R;
import com.android.internal.location.GpsNetInitiatedHandler;
@@ -43,7 +39,6 @@ public class NetInitiatedActivity extends AlertActivity implements DialogInterfa
    private static final String TAG = "NetInitiatedActivity";

    private static final boolean DEBUG = true;
    private static final boolean VERBOSE = false;

    private static final int POSITIVE_BUTTON = AlertDialog.BUTTON_POSITIVE;
    private static final int NEGATIVE_BUTTON = AlertDialog.BUTTON_NEGATIVE;
@@ -55,17 +50,6 @@ public class NetInitiatedActivity extends AlertActivity implements DialogInterfa
    private int default_response = -1;
    private int default_response_timeout = 6;

    /** Used to detect when NI request is received */
    private BroadcastReceiver mNetInitiatedReceiver = new BroadcastReceiver() {
        @Override
        public void onReceive(Context context, Intent intent) {
            if (DEBUG) Log.d(TAG, "NetInitiatedReceiver onReceive: " + intent.getAction());
            if (intent.getAction() == GpsNetInitiatedHandler.ACTION_NI_VERIFY) {
                handleNIVerify(intent);
            }
        }
    };

    private final Handler mHandler = new Handler() {
        public void handleMessage(Message msg) {
            switch (msg.what) {
@@ -109,14 +93,12 @@ public class NetInitiatedActivity extends AlertActivity implements DialogInterfa
    protected void onResume() {
        super.onResume();
        if (DEBUG) Log.d(TAG, "onResume");
        registerReceiver(mNetInitiatedReceiver, new IntentFilter(GpsNetInitiatedHandler.ACTION_NI_VERIFY));
    }

    @Override
    protected void onPause() {
        super.onPause();
        if (DEBUG) Log.d(TAG, "onPause");
        unregisterReceiver(mNetInitiatedReceiver);
    }

    /**
@@ -141,17 +123,4 @@ public class NetInitiatedActivity extends AlertActivity implements DialogInterfa
        LocationManagerInternal lm = LocalServices.getService(LocationManagerInternal.class);
        lm.sendNiResponse(notificationId, response);
    }

    @UnsupportedAppUsage
    private void handleNIVerify(Intent intent) {
        int notifId = intent.getIntExtra(GpsNetInitiatedHandler.NI_INTENT_KEY_NOTIF_ID, -1);
        notificationId = notifId;

        if (DEBUG) Log.d(TAG, "handleNIVerify action: " + intent.getAction());
    }

    private void showNIError() {
        Toast.makeText(this, "NI error" /* com.android.internal.R.string.usb_storage_error_message */,
                Toast.LENGTH_LONG).show();
    }
}
+0 −3
Original line number Diff line number Diff line
@@ -51,9 +51,6 @@ public class GpsNetInitiatedHandler {

    private static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG);

    // NI verify activity for bringing up UI (not used yet)
    public static final String ACTION_NI_VERIFY = "android.intent.action.NETWORK_INITIATED_VERIFY";

    // string constants for defining data fields in NI Intent
    public static final String NI_INTENT_KEY_NOTIF_ID = "notif_id";
    public static final String NI_INTENT_KEY_TITLE = "title";
+1 −4
Original line number Diff line number Diff line
@@ -14,10 +14,7 @@
  ~ limitations under the License.
  -->

<!-- Car customizations
     Car has solid black background instead of a transparent one
-->
<LinearLayout
<com.android.car.ui.FocusArea
    xmlns:android="http://schemas.android.com/apk/res/android"
    android:id="@+id/keyguard_container"
    android:layout_width="match_parent"
+0 −2
Original line number Diff line number Diff line
@@ -66,7 +66,6 @@
        android:src="@drawable/ic_backspace"
        android:clickable="true"
        android:tint="@android:color/white"
        android:background="@drawable/ripple_drawable"
        android:contentDescription="@string/keyboardview_keycode_delete" />
    <com.android.keyguard.NumPadKey
        android:id="@+id/key0"
@@ -77,7 +76,6 @@
        style="@style/NumPadKeyButton.LastRow"
        android:src="@drawable/ic_done"
        android:tint="@android:color/white"
        android:background="@drawable/ripple_drawable"
        android:contentDescription="@string/keyboardview_keycode_enter" />
</merge>
+1 −3
Original line number Diff line number Diff line
@@ -17,10 +17,8 @@
<resources>
    <dimen name="num_pad_margin_left">112dp</dimen>
    <dimen name="num_pad_margin_right">144dp</dimen>
    <dimen name="num_pad_key_width">80dp</dimen>
    <dimen name="num_pad_key_width">120dp</dimen>
    <dimen name="num_pad_key_height">80dp</dimen>
    <dimen name="num_pad_key_margin_horizontal">@*android:dimen/car_padding_5</dimen>
    <dimen name="num_pad_key_margin_bottom">@*android:dimen/car_padding_5</dimen>
    <dimen name="pin_entry_height">@dimen/num_pad_key_height</dimen>
    <dimen name="divider_height">1dp</dimen>
    <dimen name="key_enter_margin_top">128dp</dimen>
Loading