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

Commit 0039292b authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 6453963 from d2f16b4a to rvc-release 

Change-Id: I011f899201694d81a58e609ca3fc295928324324
parents c1bd2e0d d2f16b4a

res/layout/notification_history.xml

+2 −0
Original line number Diff line number Diff line
@@ -53,6 +53,7 @@ 
                android:layout_marginStart="48dp"

                android:layout_marginEnd="48dp"

                android:layout_gravity="center_horizontal"

                android:gravity="center"

                android:focusable="true"

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

                android:text="@string/notification_history_off_title_extended" />
@@ -96,6 +97,7 @@ 
                android:layout_marginStart="48dp"

                android:layout_marginEnd="48dp"

                android:layout_gravity="center_horizontal"

                android:gravity="center"

                android:focusable="true"

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

                android:text="@string/history_toggled_on_title" />

src/com/android/settings/password/ConfirmLockPassword.java

+3 −0
Original line number Diff line number Diff line
@@ -159,6 +159,9 @@ public class ConfirmLockPassword extends ConfirmDeviceCredentialBaseActivity { 
                        ConfirmDeviceCredentialBaseFragment.HEADER_TEXT);

                CharSequence detailsMessage = intent.getCharSequenceExtra(

                        ConfirmDeviceCredentialBaseFragment.DETAILS_TEXT);

                if (TextUtils.isEmpty(headerMessage) && mIsManagedProfile) {

                    headerMessage = mDevicePolicyManager.getOrganizationNameForUser(mUserId);

                }

                if (TextUtils.isEmpty(headerMessage)) {

                    headerMessage = getString(getDefaultHeader());

                }

src/com/android/settings/password/ConfirmLockPattern.java

+4 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ import android.os.CountDownTimer; 
import android.os.SystemClock;

import android.os.UserManager;

import android.os.storage.StorageManager;

import android.text.TextUtils;

import android.view.LayoutInflater;

import android.view.View;

import android.view.ViewGroup;
@@ -136,6 +137,9 @@ public class ConfirmLockPattern extends ConfirmDeviceCredentialBaseActivity { 
                mDetailsText = intent.getCharSequenceExtra(

                        ConfirmDeviceCredentialBaseFragment.DETAILS_TEXT);

            }

            if (TextUtils.isEmpty(mHeaderText) && mIsManagedProfile) {

                mHeaderText = mDevicePolicyManager.getOrganizationNameForUser(mUserId);

            }



            mLockPatternView.setTactileFeedbackEnabled(

                    mLockPatternUtils.isTactileFeedbackEnabled());

src/com/android/settings/widget/UsageView.java

+11 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ package com.android.settings.widget; 


import android.content.Context;

import android.content.res.TypedArray;

import android.text.TextUtils;

import android.util.AttributeSet;

import android.util.SparseIntArray;

import android.view.Gravity;
@@ -29,6 +30,8 @@ import android.widget.TextView; 


import com.android.settingslib.R;



import java.util.Locale;



public class UsageView extends FrameLayout {



    private final UsageGraph mUsageGraph;
@@ -85,6 +88,14 @@ public class UsageView extends FrameLayout { 
        }

        mUsageGraph.setAccentColor(a.getColor(R.styleable.UsageView_android_colorAccent, 0));

        a.recycle();



        // Locale Persian & Urdu are RTL languages but request LTR graph direction layout.

        final String defaultLanguageCode = Locale.getDefault().getLanguage();

        if (TextUtils.equals(defaultLanguageCode, new Locale("fa").getLanguage())

                || TextUtils.equals(defaultLanguageCode, new Locale("ur").getLanguage())) {

            findViewById(R.id.graph_label_group).setLayoutDirection(View.LAYOUT_DIRECTION_LTR);

            findViewById(R.id.bottom_label_group).setLayoutDirection(View.LAYOUT_DIRECTION_LTR);

        }

    }



    public void clearPaths() {

src/com/android/settings/wifi/p2p/WifiP2pSettings.java

+21 −17
Original line number Diff line number Diff line
@@ -70,35 +70,35 @@ public class WifiP2pSettings extends DashboardFragment 


    private static final String TAG = "WifiP2pSettings";

    private static final boolean DBG = false;

    private static final int MENU_ID_SEARCH = Menu.FIRST;

    private static final int MENU_ID_RENAME = Menu.FIRST + 1;

    @VisibleForTesting static final int MENU_ID_SEARCH = Menu.FIRST;

    @VisibleForTesting static final int MENU_ID_RENAME = Menu.FIRST + 1;



    private final IntentFilter mIntentFilter = new IntentFilter();

    private WifiP2pManager mWifiP2pManager;

    @VisibleForTesting WifiP2pManager mWifiP2pManager;

    private WifiP2pManager.Channel mChannel;

    private OnClickListener mRenameListener;

    private OnClickListener mDisconnectListener;

    private OnClickListener mCancelConnectListener;

    private OnClickListener mDeleteGroupListener;

    @VisibleForTesting OnClickListener mRenameListener;

    @VisibleForTesting OnClickListener mDisconnectListener;

    @VisibleForTesting OnClickListener mCancelConnectListener;

    @VisibleForTesting OnClickListener mDeleteGroupListener;

    @VisibleForTesting WifiP2pPeer mSelectedWifiPeer;

    private WifiP2pPersistentGroup mSelectedGroup;

    @VisibleForTesting WifiP2pPersistentGroup mSelectedGroup;

    @VisibleForTesting String mSelectedGroupName;

    private EditText mDeviceNameText;



    private boolean mWifiP2pEnabled;

    private boolean mWifiP2pSearching;

    private int mConnectedDevices;

    private boolean mLastGroupFormed = false;

    @VisibleForTesting boolean mWifiP2pSearching;

    @VisibleForTesting int mConnectedDevices;

    @VisibleForTesting boolean mLastGroupFormed = false;

    private boolean mIsIgnoreInitConnectionInfoCallback = false;



    private P2pPeerCategoryPreferenceController mPeerCategoryController;

    private P2pPersistentCategoryPreferenceController mPersistentCategoryController;

    private P2pThisDevicePreferenceController mThisDevicePreferenceController;



    private static final int DIALOG_DISCONNECT  = 1;

    private static final int DIALOG_CANCEL_CONNECT = 2;

    private static final int DIALOG_RENAME = 3;

    private static final int DIALOG_DELETE_GROUP = 4;

    @VisibleForTesting static final int DIALOG_DISCONNECT  = 1;

    @VisibleForTesting static final int DIALOG_CANCEL_CONNECT = 2;

    @VisibleForTesting static final int DIALOG_RENAME = 3;

    @VisibleForTesting static final int DIALOG_DELETE_GROUP = 4;



    private static final String SAVE_DIALOG_PEER = "PEER_STATE";

    @VisibleForTesting static final String SAVE_DEVICE_NAME = "DEV_NAME";
@@ -109,7 +109,8 @@ public class WifiP2pSettings extends DashboardFragment 


    @VisibleForTesting String mSavedDeviceName;



    private final BroadcastReceiver mReceiver = new BroadcastReceiver() {

    @VisibleForTesting

    final BroadcastReceiver mReceiver = new BroadcastReceiver() {

        @Override

        public void onReceive(Context context, Intent intent) {

            String action = intent.getAction();
@@ -198,7 +199,10 @@ public class WifiP2pSettings extends DashboardFragment 
    @Override

    public void onActivityCreated(Bundle savedInstanceState) {

        final Activity activity = getActivity();

        if (mWifiP2pManager == null) {

            mWifiP2pManager = (WifiP2pManager) getSystemService(Context.WIFI_P2P_SERVICE);

        }



        if (mWifiP2pManager != null) {

            mChannel = mWifiP2pManager.initialize(activity.getApplicationContext(),

                    getActivity().getMainLooper(), null);