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

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

Snap for 6570104 from 01464a1b to rvc-release 

Change-Id: I32ec8c413a71708bcdcc2c6378daec5811a875db
parents c5e073a3 01464a1b

res/layout/settings_homepage_container.xml

+4 −3
Original line number Original line Diff line number Diff line
@@ -33,8 +33,7 @@ 
            android:id="@+id/homepage_container"

            android:id="@+id/homepage_container"

            android:layout_width="match_parent"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:layout_height="wrap_content"

            android:orientation="vertical"

            android:orientation="vertical">

            android:descendantFocusability="blocksDescendants">





            <FrameLayout

            <FrameLayout

                android:id="@+id/contextual_cards_content"

                android:id="@+id/contextual_cards_content"
@@ -55,7 +54,9 @@ 




    <com.google.android.material.appbar.AppBarLayout

    <com.google.android.material.appbar.AppBarLayout

        android:layout_width="match_parent"

        android:layout_width="match_parent"

        android:layout_height="wrap_content">

        android:layout_height="wrap_content"

        android:touchscreenBlocksFocus="false"

        android:keyboardNavigationCluster="false">

        <include layout="@layout/search_bar"/>

        <include layout="@layout/search_bar"/>

    </com.google.android.material.appbar.AppBarLayout>

    </com.google.android.material.appbar.AppBarLayout>

</androidx.coordinatorlayout.widget.CoordinatorLayout>
 
</androidx.coordinatorlayout.widget.CoordinatorLayout>

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

+4 −0
Original line number Original line Diff line number Diff line
@@ -37,6 +37,8 @@ import androidx.appcompat.app.AlertDialog; 
import com.android.settings.R;

import com.android.settings.R;

import com.android.settingslib.bluetooth.BluetoothDiscoverableTimeoutReceiver;

import com.android.settingslib.bluetooth.BluetoothDiscoverableTimeoutReceiver;





import static android.view.WindowManager.LayoutParams.SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS;



/**

/**

 * RequestPermissionActivity asks the user whether to enable discovery. This is

 * RequestPermissionActivity asks the user whether to enable discovery. This is

 * usually started by an application wanted to start bluetooth and or discovery

 * usually started by an application wanted to start bluetooth and or discovery
@@ -72,6 +74,8 @@ public class RequestPermissionActivity extends Activity implements 
    protected void onCreate(Bundle savedInstanceState) {

    protected void onCreate(Bundle savedInstanceState) {

        super.onCreate(savedInstanceState);

        super.onCreate(savedInstanceState);





        getWindow().addSystemFlags(SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS);



        setResult(Activity.RESULT_CANCELED);

        setResult(Activity.RESULT_CANCELED);





        // Note: initializes mBluetoothAdapter and returns true on error

        // Note: initializes mBluetoothAdapter and returns true on error

src/com/android/settings/homepage/SettingsHomepageActivity.java

+5 −1
Original line number Original line Diff line number Diff line
@@ -90,5 +90,9 @@ public class SettingsHomepageActivity extends FragmentActivity { 
        // The top padding is the height of action bar(48dp) + top/bottom margins(16dp)

        // The top padding is the height of action bar(48dp) + top/bottom margins(16dp)

        final int paddingTop = searchBarHeight + searchBarMargin * 2;

        final int paddingTop = searchBarHeight + searchBarMargin * 2;

        view.setPadding(0 /* left */, paddingTop, 0 /* right */, 0 /* bottom */);

        view.setPadding(0 /* left */, paddingTop, 0 /* right */, 0 /* bottom */);



        // Prevent inner RecyclerView gets focus and invokes scrolling.

        view.setFocusableInTouchMode(true);

        view.requestFocus();

    }

    }

}
 
}

src/com/android/settings/notification/NotificationBackend.java

+4 −1
Original line number Original line Diff line number Diff line
@@ -17,8 +17,10 @@ package com.android.settings.notification; 




import static android.app.NotificationManager.IMPORTANCE_NONE;

import static android.app.NotificationManager.IMPORTANCE_NONE;

import static android.app.NotificationManager.IMPORTANCE_UNSPECIFIED;

import static android.app.NotificationManager.IMPORTANCE_UNSPECIFIED;

import static android.content.pm.LauncherApps.ShortcutQuery.FLAG_MATCH_CACHED;

import static android.content.pm.LauncherApps.ShortcutQuery.FLAG_MATCH_DYNAMIC;

import static android.content.pm.LauncherApps.ShortcutQuery.FLAG_MATCH_DYNAMIC;

import static android.content.pm.LauncherApps.ShortcutQuery.FLAG_MATCH_PINNED;

import static android.content.pm.LauncherApps.ShortcutQuery.FLAG_MATCH_PINNED;

import static android.content.pm.LauncherApps.ShortcutQuery.FLAG_MATCH_PINNED_BY_ANY_LAUNCHER;





import android.app.INotificationManager;

import android.app.INotificationManager;

import android.app.NotificationChannel;

import android.app.NotificationChannel;
@@ -544,7 +546,8 @@ public class NotificationBackend { 




        LauncherApps.ShortcutQuery query = new LauncherApps.ShortcutQuery()

        LauncherApps.ShortcutQuery query = new LauncherApps.ShortcutQuery()

                .setPackage(pkg)

                .setPackage(pkg)

                .setQueryFlags(FLAG_MATCH_DYNAMIC | FLAG_MATCH_PINNED)

                .setQueryFlags(FLAG_MATCH_DYNAMIC

                        | FLAG_MATCH_PINNED_BY_ANY_LAUNCHER | FLAG_MATCH_CACHED)

                .setShortcutIds(Arrays.asList(id));

                .setShortcutIds(Arrays.asList(id));

        List<ShortcutInfo> shortcuts = la.getShortcuts(

        List<ShortcutInfo> shortcuts = la.getShortcuts(

                query, UserHandle.of(UserHandle.getUserId(uid)));

                query, UserHandle.of(UserHandle.getUserId(uid)));