diff options
| author | Jeff Sharkey <jsharkey@android.com> | 2013-09-06 14:00:34 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-09-06 14:00:34 -0700 |
| commit | c91be7119e817f76f175da46ac26468fcb29b632 (patch) | |
| tree | 15aed3af05bd7236c56c069f23042c846b6a73d6 /packages/ExternalStorageProvider/res | |
| parent | c268c442a154800c0a2fd3199fa4798b3dbb284c (diff) | |
| parent | e6bbcaf0bc010563c1c65f51ff4610a7bde26609 (diff) | |
| download | frameworks_base-c91be7119e817f76f175da46ac26468fcb29b632.zip frameworks_base-c91be7119e817f76f175da46ac26468fcb29b632.tar.gz frameworks_base-c91be7119e817f76f175da46ac26468fcb29b632.tar.bz2 | |
am e6bbcaf0: Merge "Another asset drop, provider icons, tests." into klp-dev
* commit 'e6bbcaf0bc010563c1c65f51ff4610a7bde26609':
Another asset drop, provider icons, tests.
Diffstat (limited to 'packages/ExternalStorageProvider/res')
| -rw-r--r-- | packages/ExternalStorageProvider/res/drawable-hdpi/ic_pdf.png | bin | 1326 -> 0 bytes | |||
| -rw-r--r-- | packages/ExternalStorageProvider/res/xml/document_provider.xml | 22 |
2 files changed, 0 insertions, 22 deletions
diff --git a/packages/ExternalStorageProvider/res/drawable-hdpi/ic_pdf.png b/packages/ExternalStorageProvider/res/drawable-hdpi/ic_pdf.png Binary files differdeleted file mode 100644 index 961a9bb..0000000 --- a/packages/ExternalStorageProvider/res/drawable-hdpi/ic_pdf.png +++ /dev/null diff --git a/packages/ExternalStorageProvider/res/xml/document_provider.xml b/packages/ExternalStorageProvider/res/xml/document_provider.xml deleted file mode 100644 index 929a273..0000000 --- a/packages/ExternalStorageProvider/res/xml/document_provider.xml +++ /dev/null @@ -1,22 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2013 The Android Open Source Project - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. ---> - -<documents-provider xmlns:android="http://schemas.android.com/apk/res/android" - android:customRoots="true"> - - <icon android:mimeType="application/pdf" android:icon="@drawable/ic_pdf" /> - <icon android:mimeType="text/*" android:icon="@drawable/ic_pdf" /> -</documents-provider> |
