Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Made breadcrumb drop down match mocks" into nyc-dev

Browse Source
This commit is contained in:
Aga Wronska
2016-03-04 22:37:39 +00:00
committed by Android (Google) Code Review
parent e27a4376ab b6db022312
commit e5a3bb76b8
5 changed files with 3 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
packages/DocumentsUI/res/layout/drawer_layout.xml
View File

@@ -46,6 +46,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="4dp" android:layout_marginStart="4dp"
android:popupTheme="?actionBarPopupTheme"
android:overlapAnchor="true" /> android:overlapAnchor="true" />
</com.android.documentsui.DocumentsToolbar> </com.android.documentsui.DocumentsToolbar>

1
packages/DocumentsUI/res/layout/fixed_layout.xml
View File

@@ -44,6 +44,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="4dp" android:layout_marginStart="4dp"
android:popupTheme="?actionBarPopupTheme"
android:overlapAnchor="true" /> android:overlapAnchor="true" />
</com.android.documentsui.DocumentsToolbar> </com.android.documentsui.DocumentsToolbar>

10
packages/DocumentsUI/res/layout/item_subdir.xml
View File

@@ -24,16 +24,6 @@
android:orientation="horizontal" android:orientation="horizontal"
android:baselineAligned="false"> android:baselineAligned="false">
<ImageView
android:id="@+id/subdir"
android:layout_width="24dp"
android:layout_height="24dp"
android:paddingEnd="8dp"
android:scaleType="centerInside"
android:visibility="gone"
android:src="@drawable/ic_subdirectory_arrow"
android:contentDescription="@null" />
<TextView <TextView
android:id="@android:id/title" android:id="@android:id/title"
android:layout_width="0dp" android:layout_width="0dp"

1
packages/DocumentsUI/res/layout/single_pane_layout.xml
View File

@@ -43,6 +43,7 @@
android:id="@+id/stack" android:id="@+id/stack"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:popupTheme="?actionBarPopupTheme"
android:layout_marginStart="4dp" android:layout_marginStart="4dp"
android:overlapAnchor="true" /> android:overlapAnchor="true" />

3
packages/DocumentsUI/src/com/android/documentsui/NavigationView.java
View File

@@ -220,17 +220,14 @@ class NavigationView {
.inflate(R.layout.item_subdir, parent, false); .inflate(R.layout.item_subdir, parent, false);
} }
final ImageView subdir = (ImageView) convertView.findViewById(R.id.subdir);
final TextView title = (TextView) convertView.findViewById(android.R.id.title); final TextView title = (TextView) convertView.findViewById(android.R.id.title);
final DocumentInfo doc = getItem(position); final DocumentInfo doc = getItem(position);
if (position == 0) { if (position == 0) {
final RootInfo root = mEnv.getCurrentRoot(); final RootInfo root = mEnv.getCurrentRoot();
title.setText(root.title); title.setText(root.title);
subdir.setVisibility(View.GONE);
} else { } else {
title.setText(doc.displayName); title.setText(doc.displayName);
subdir.setVisibility(View.VISIBLE);
} }
return convertView; return convertView;