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

Commit 36577f82 authored by Jeff Sharkey's avatar Jeff Sharkey Committed by Android Git Automerger
Browse files

am 0be65699: Light icons for DocumentsUI.

* commit '0be6569988a31e0aa879cfea0cd73b5cf7123591':
  Light icons for DocumentsUI.
parents b15fe22a a847d793
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@
            android:id="@+id/stack"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:layout_marginLeft="4dp"
            android:layout_marginStart="4dp"
            android:overlapAnchor="true" />

    </Toolbar>
@@ -45,7 +45,7 @@

        <FrameLayout
            android:id="@+id/container_roots"
            android:layout_width="250dp"
            android:layout_width="256dp"
            android:layout_height="match_parent" />

        <LinearLayout
+2 −2
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@
                android:id="@+id/stack"
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:layout_marginLeft="4dp"
                android:layout_marginStart="4dp"
                android:overlapAnchor="true" />

        </Toolbar>
@@ -58,7 +58,7 @@

    <LinearLayout
        android:id="@+id/drawer_roots"
        android:layout_width="250dp"
        android:layout_width="256dp"
        android:layout_height="match_parent"
        android:layout_gravity="start"
        android:orientation="vertical"
+2 −2
Original line number Diff line number Diff line
@@ -46,8 +46,8 @@
            android:layout_height="wrap_content"
            android:background="@drawable/grid_protect_background"
            android:orientation="vertical"
            android:paddingStart="?android:attr/listPreferredItemPaddingStart"
            android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
            android:paddingStart="16dp"
            android:paddingEnd="12dp"
            android:paddingTop="8dp"
            android:paddingBottom="8dp">

+6 −2
Original line number Diff line number Diff line
@@ -853,7 +853,11 @@ public class DirectoryFragment extends Fragment {
                // We've already had to enumerate roots before any results can
                // be shown, so this will never block.
                final RootInfo root = roots.getRootBlocking(docAuthority, docRootId);
                if (state.derivedMode == MODE_GRID) {
                    iconDrawable = root.loadLightIcon(context);
                } else {
                    iconDrawable = root.loadIcon(context);
                }

                if (summary != null) {
                    final boolean alwaysShowSummary = getResources()
@@ -880,7 +884,7 @@ public class DirectoryFragment extends Fragment {
                if (Document.MIME_TYPE_DIR.equals(docMimeType) && state.derivedMode == MODE_GRID
                        && showThumbnail) {
                    iconDrawable = context.getResources().getDrawable(
                            R.drawable.ic_root_folder_dark);
                            R.drawable.ic_root_folder_light);
                }

                if (summary != null) {
+1 −1
Original line number Diff line number Diff line
@@ -425,7 +425,7 @@ public class DocumentsActivity extends Activity {
        final RootInfo root = getCurrentRoot();
        final boolean showRootIcon = mShowAsDialog || (mState.action == ACTION_MANAGE);
        if (showRootIcon) {
            mToolbar.setNavigationIcon(root != null ? root.loadIcon(this) : null);
            mToolbar.setNavigationIcon(root != null ? root.loadLightIcon(this) : null);
            mToolbar.setNavigationOnClickListener(null);
        } else {
            mToolbar.setNavigationIcon(R.drawable.ic_hamburger);
Loading