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

Commit c8443ac2 authored by /e/ robot's avatar /e/ robot
Browse files

Merge remote-tracking branch 'origin/lineage-22.2' into a15

parents e3ba809f 63fe7e22

AndroidManifest.xml

+2 −1
Original line number Diff line number Diff line
@@ -828,7 +828,8 @@ 
                android:label="@string/device_picker"

                android:configChanges="orientation|keyboardHidden|screenSize"

                android:exported="true"

                android:clearTaskOnLaunch="true">

                android:clearTaskOnLaunch="true"

                android:theme="@style/Theme.SubSettingsBase">

            <intent-filter>

                <action android:name="android.bluetooth.devicepicker.action.LAUNCH" />

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

src/com/android/settings/bluetooth/DevicePickerActivity.java

+2 −3
Original line number Diff line number Diff line
@@ -20,15 +20,14 @@ import static android.view.WindowManager.LayoutParams.SYSTEM_FLAG_HIDE_NON_SYSTE 


import android.os.Bundle;



import androidx.fragment.app.FragmentActivity;



import com.android.settings.R;

import com.android.settingslib.collapsingtoolbar.CollapsingToolbarBaseActivity;



/**

 * Activity for Bluetooth device picker dialog. The device picker logic

 * is implemented in the {@link BluetoothPairingDetail} fragment.

 */

public final class DevicePickerActivity extends FragmentActivity {

public final class DevicePickerActivity extends CollapsingToolbarBaseActivity {



    @Override

    protected void onCreate(Bundle savedInstanceState) {

src/com/android/settings/deviceinfo/PhoneNumberPreferenceController.java

+1 −1
Original line number Diff line number Diff line
@@ -91,7 +91,7 @@ public class PhoneNumberPreferenceController extends BasePreferenceController { 
        for (int simSlotNumber = 1; simSlotNumber < mTelephonyManager.getPhoneCount();

                simSlotNumber++) {

            final Preference multiSimPreference = createNewPreference(screen.getContext());

            multiSimPreference.setSelectable(false);

            multiSimPreference.setSelectable(true);

            multiSimPreference.setCopyingEnabled(true);

            multiSimPreference.setOrder(phonePreferenceOrder + simSlotNumber);

            multiSimPreference.setKey(KEY_PHONE_NUMBER + simSlotNumber);

src/com/android/settings/display/QRCodeScannerPreferenceController.java

+1 −1
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ public class QRCodeScannerPreferenceController extends TogglePreferenceControlle 
    @OnLifecycleEvent(ON_START)

    public void onStart() {

        mContentResolver.registerContentObserver(

                Settings.Global.getUriFor(SHOW_QR_CODE_SCANNER_SETTING), false,

                Settings.Secure.getUriFor(SHOW_QR_CODE_SCANNER_SETTING), false,

                mSettingsObserver);

    }

src/com/android/settings/slices/SlicesDatabaseHelper.java

+1 −1
Original line number Diff line number Diff line
@@ -246,6 +246,6 @@ public class SlicesDatabaseHelper extends SQLiteOpenHelper { 


    @VisibleForTesting

    String getBuildTag() {

        return Build.FINGERPRINT;

        return Build.VERSION.INCREMENTAL;

    }

}
 
 No newline at end of file