summaryrefslogtreecommitdiffstats
path: root/packages
diff options
context:
space:
mode:
authorJeff Sharkey <jsharkey@android.com>2013-09-11 20:16:59 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-09-11 20:16:59 +0000
commitceccceccffbd2668b98e21487f2323f80d2c7b98 (patch)
treeaba1d4902c557287350a10325a7b334351f663c4 /packages
parentd292f790be5074998c1adc5feb4fea031d0d3d09 (diff)
parentaca405cd592679af4a4b31b01dfed6fd59c4a168 (diff)
downloadframeworks_base-ceccceccffbd2668b98e21487f2323f80d2c7b98.zip
frameworks_base-ceccceccffbd2668b98e21487f2323f80d2c7b98.tar.gz
frameworks_base-ceccceccffbd2668b98e21487f2323f80d2c7b98.tar.bz2
Merge changes Ib1274847,I2eb2a1bf into klp-dev
* changes: Fix SDK build. Request all tethering interfaces, fix corruption.
Diffstat (limited to 'packages')
-rw-r--r--packages/DocumentsUI/res/layout/fragment_directory.xml8
1 files changed, 0 insertions, 8 deletions
diff --git a/packages/DocumentsUI/res/layout/fragment_directory.xml b/packages/DocumentsUI/res/layout/fragment_directory.xml
index f0ab0d1..b4138a5 100644
--- a/packages/DocumentsUI/res/layout/fragment_directory.xml
+++ b/packages/DocumentsUI/res/layout/fragment_directory.xml
@@ -40,12 +40,4 @@
android:listSelector="@android:color/transparent"
android:visibility="gone" />
- <Button
- android:id="@+id/more"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_gravity="bottom"
- android:text="@string/more"
- android:visibility="gone" />
-
</FrameLayout>