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

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

Snap for 7057789 from 3cbc3ed7 to sc-d1-release

Change-Id: I289c6a84a6b6a613aee383ffee00c3182d45cdad
parents 8e01714a 3cbc3ed7
Loading
Loading
Loading
Loading
+13 −0
Original line number Diff line number Diff line
@@ -194,6 +194,19 @@ public class NavigationViewManager {
    }

    private void updateToolbar() {
        if (mCollapsingBarLayout == null) {
            // Tablet mode does not use CollapsingBarLayout
            // (res/layout-sw720dp/directory_app_bar.xml or res/layout/fixed_layout.xml)
            if (shouldShowSearchBar()) {
                mToolbar.setBackgroundResource(R.drawable.search_bar_background);
                mToolbar.setOutlineProvider(mSearchBarOutlineProvider);
            } else {
                mToolbar.setBackground(mDefaultActionBarBackground);
                mToolbar.setOutlineProvider(null);
            }
            return;
        }

        CollapsingToolbarLayout.LayoutParams toolbarLayoutParams =
                (CollapsingToolbarLayout.LayoutParams) mToolbar.getLayoutParams();

+3 −1
Original line number Diff line number Diff line
@@ -223,8 +223,10 @@ final class ListDocumentHolder extends DocumentHolder {
            }

            metadataList.add(mFileTypeLookup.lookup(mDoc.mimeType));
            if (mMetadataView != null) {
                mMetadataView.setText(TextUtils.join(", ", metadataList));
            }
        }

        // mDetails view doesn't exists in layout-sw720dp-land layout
        if (mDetails != null) {
+4 −2
Original line number Diff line number Diff line
@@ -122,8 +122,10 @@ public class SearchFragment extends Fragment {
        mListView.setOnItemClickListener(this::onHistoryItemClicked);

        View toolbar = getActivity().findViewById(R.id.toolbar);
        if (toolbar != null) {
            // Align top with the bottom of search bar.
        View collapsingBarLayout = getActivity().findViewById(R.id.collapsing_toolbar);
        if (toolbar != null && collapsingBarLayout != null) {
            // If collapsingBarLayout is used (i.e. not in Tablet mode),
            // need to align top with the bottom of search bar.
            FrameLayout.LayoutParams layoutParams = new FrameLayout.LayoutParams(
                    ViewGroup.LayoutParams.MATCH_PARENT,
                    ViewGroup.LayoutParams.MATCH_PARENT);