diff options
136 files changed, 843 insertions, 241 deletions
diff --git a/core/java/android/app/BackStackRecord.java b/core/java/android/app/BackStackRecord.java index 984a18615caf..a147cc87d465 100644 --- a/core/java/android/app/BackStackRecord.java +++ b/core/java/android/app/BackStackRecord.java @@ -719,7 +719,7 @@ final class BackStackRecord extends FragmentTransaction implements Fragment f = op.fragment; int containerId = f.mContainerId; if (mManager.mAdded != null) { - for (int i = 0; i < mManager.mAdded.size(); i++) { + for (int i = mManager.mAdded.size() - 1; i >= 0; i--) { Fragment old = mManager.mAdded.get(i); if (FragmentManagerImpl.DEBUG) { Log.v(TAG, diff --git a/core/java/android/content/res/AssetManager.java b/core/java/android/content/res/AssetManager.java index ee6aec2910aa..7b0b98d4389c 100644 --- a/core/java/android/content/res/AssetManager.java +++ b/core/java/android/content/res/AssetManager.java @@ -16,6 +16,11 @@ package android.content.res; +import android.annotation.AnyRes; +import android.annotation.ArrayRes; +import android.annotation.NonNull; +import android.annotation.Nullable; +import android.annotation.StringRes; import android.os.ParcelFileDescriptor; import android.util.Log; import android.util.SparseArray; @@ -142,80 +147,95 @@ public final class AssetManager implements AutoCloseable { } /** - * Retrieve the string value associated with a particular resource - * identifier for the current configuration / skin. + * Retrieves the string value associated with a particular resource + * identifier for the current configuration. + * + * @param resId the resource identifier to load + * @return the string value, or {@code null} */ - /*package*/ final CharSequence getResourceText(int ident) { + @Nullable + final CharSequence getResourceText(@StringRes int resId) { synchronized (this) { - TypedValue tmpValue = mValue; - int block = loadResourceValue(ident, (short) 0, tmpValue, true); - if (block >= 0) { - if (tmpValue.type == TypedValue.TYPE_STRING) { - return mStringBlocks[block].get(tmpValue.data); - } - return tmpValue.coerceToString(); + final TypedValue outValue = mValue; + if (getResourceValue(resId, 0, outValue, true)) { + return outValue.coerceToString(); } + return null; } - return null; } /** - * Retrieve the string value associated with a particular resource - * identifier for the current configuration / skin. + * Retrieves the string value associated with a particular resource + * identifier for the current configuration. + * + * @param resId the resource identifier to load + * @param bagEntryId + * @return the string value, or {@code null} */ - /*package*/ final CharSequence getResourceBagText(int ident, int bagEntryId) { + @Nullable + final CharSequence getResourceBagText(@StringRes int resId, int bagEntryId) { synchronized (this) { - TypedValue tmpValue = mValue; - int block = loadResourceBagValue(ident, bagEntryId, tmpValue, true); - if (block >= 0) { - if (tmpValue.type == TypedValue.TYPE_STRING) { - return mStringBlocks[block].get(tmpValue.data); - } - return tmpValue.coerceToString(); + final TypedValue outValue = mValue; + final int block = loadResourceBagValue(resId, bagEntryId, outValue, true); + if (block < 0) { + return null; + } + if (outValue.type == TypedValue.TYPE_STRING) { + return mStringBlocks[block].get(outValue.data); } + return outValue.coerceToString(); } - return null; } /** - * Retrieve the string array associated with a particular resource - * identifier. - * @param id Resource id of the string array + * Retrieves the string array associated with a particular resource + * identifier for the current configuration. + * + * @param resId the resource identifier of the string array + * @return the string array, or {@code null} */ - /*package*/ final String[] getResourceStringArray(final int id) { - String[] retArray = getArrayStringResource(id); - return retArray; + @Nullable + final String[] getResourceStringArray(@ArrayRes int resId) { + return getArrayStringResource(resId); } - - /*package*/ final boolean getResourceValue(int ident, - int density, - TypedValue outValue, - boolean resolveRefs) - { - int block = loadResourceValue(ident, (short) density, outValue, resolveRefs); - if (block >= 0) { - if (outValue.type != TypedValue.TYPE_STRING) { - return true; - } + /** + * Populates {@code outValue} with the data associated a particular + * resource identifier for the current configuration. + * + * @param resId the resource identifier to load + * @param densityDpi the density bucket for which to load the resource + * @param outValue the typed value in which to put the data + * @param resolveRefs {@code true} to resolve references, {@code false} + * to leave them unresolved + * @return {@code true} if the data was loaded into {@code outValue}, + * {@code false} otherwise + */ + final boolean getResourceValue(@AnyRes int resId, int densityDpi, @NonNull TypedValue outValue, + boolean resolveRefs) { + final int block = loadResourceValue(resId, (short) densityDpi, outValue, resolveRefs); + if (block < 0) { + return false; + } + if (outValue.type == TypedValue.TYPE_STRING) { outValue.string = mStringBlocks[block].get(outValue.data); - return true; } - return false; + return true; } /** * Retrieve the text array associated with a particular resource * identifier. - * @param id Resource id of the string array + * + * @param resId the resource id of the string array */ - /*package*/ final CharSequence[] getResourceTextArray(final int id) { - int[] rawInfoArray = getArrayStringInfo(id); - int rawInfoArrayLen = rawInfoArray.length; + final CharSequence[] getResourceTextArray(@ArrayRes int resId) { + final int[] rawInfoArray = getArrayStringInfo(resId); + final int rawInfoArrayLen = rawInfoArray.length; final int infoArrayLen = rawInfoArrayLen / 2; int block; int index; - CharSequence[] retArray = new CharSequence[infoArrayLen]; + final CharSequence[] retArray = new CharSequence[infoArrayLen]; for (int i = 0, j = 0; i < rawInfoArrayLen; i = i + 2, j++) { block = rawInfoArray[i]; index = rawInfoArray[i + 1]; @@ -223,32 +243,45 @@ public final class AssetManager implements AutoCloseable { } return retArray; } - - /*package*/ final boolean getThemeValue(long theme, int ident, - TypedValue outValue, boolean resolveRefs) { - int block = loadThemeAttributeValue(theme, ident, outValue, resolveRefs); - if (block >= 0) { - if (outValue.type != TypedValue.TYPE_STRING) { - return true; - } - StringBlock[] blocks = mStringBlocks; - if (blocks == null) { - ensureStringBlocks(); - blocks = mStringBlocks; - } + + /** + * Populates {@code outValue} with the data associated with a particular + * resource identifier for the current configuration. Resolves theme + * attributes against the specified theme. + * + * @param theme the native pointer of the theme + * @param resId the resource identifier to load + * @param outValue the typed value in which to put the data + * @param resolveRefs {@code true} to resolve references, {@code false} + * to leave them unresolved + * @return {@code true} if the data was loaded into {@code outValue}, + * {@code false} otherwise + */ + final boolean getThemeValue(long theme, @AnyRes int resId, @NonNull TypedValue outValue, + boolean resolveRefs) { + final int block = loadThemeAttributeValue(theme, resId, outValue, resolveRefs); + if (block < 0) { + return false; + } + if (outValue.type == TypedValue.TYPE_STRING) { + final StringBlock[] blocks = ensureStringBlocks(); outValue.string = blocks[block].get(outValue.data); - return true; } - return false; + return true; } - /*package*/ final void ensureStringBlocks() { - if (mStringBlocks == null) { - synchronized (this) { - if (mStringBlocks == null) { - makeStringBlocks(sSystem.mStringBlocks); - } + /** + * Ensures the string blocks are loaded. + * + * @return the string blocks + */ + @NonNull + final StringBlock[] ensureStringBlocks() { + synchronized (this) { + if (mStringBlocks == null) { + makeStringBlocks(sSystem.mStringBlocks); } + return mStringBlocks; } } diff --git a/core/java/android/content/res/Resources.java b/core/java/android/content/res/Resources.java index b01633e641f3..7b56eebf34ac 100644 --- a/core/java/android/content/res/Resources.java +++ b/core/java/android/content/res/Resources.java @@ -151,8 +151,9 @@ public class Resources { private boolean mPreloading; + // Cyclical cache used for recently-accessed XML files. private int mLastCachedXmlBlockIndex = -1; - private final int[] mCachedXmlBlockIds = { 0, 0, 0, 0 }; + private final String[] mCachedXmlBlockFiles = new String[4]; private final XmlBlock[] mCachedXmlBlocks = new XmlBlock[4]; final AssetManager mAssets; @@ -866,6 +867,11 @@ public class Resources { try { getValueForDensity(id, density, value, true); + // If the drawable's XML lives in our current density qualifier, + // it's okay to use a scaled version from the cache. Otherwise, we + // need to actually load the drawable from XML. + final boolean useCache = value.density == mMetrics.densityDpi; + /* * Pretend the requested density is actually the display density. If * the drawable returned is not the requested density, then force it @@ -881,7 +887,7 @@ public class Resources { } } - return loadDrawable(value, id, theme); + return loadDrawable(value, id, theme, useCache); } finally { releaseTempTypedValue(value); } @@ -2365,16 +2371,17 @@ public class Resources { * tools. */ public final void flushLayoutCache() { - synchronized (mCachedXmlBlockIds) { - // First see if this block is in our cache. - final int num = mCachedXmlBlockIds.length; - for (int i=0; i<num; i++) { - mCachedXmlBlockIds[i] = -0; - XmlBlock oldBlock = mCachedXmlBlocks[i]; + final String[] cachedXmlBlockFiles = mCachedXmlBlockFiles; + final XmlBlock[] cachedXmlBlocks = mCachedXmlBlocks; + synchronized (cachedXmlBlockFiles) { + final int num = cachedXmlBlockFiles.length; + for (int i = 0; i < num; i++) { + final XmlBlock oldBlock = cachedXmlBlocks[i]; if (oldBlock != null) { oldBlock.close(); } - mCachedXmlBlocks[i] = null; + cachedXmlBlockFiles[i] = null; + cachedXmlBlocks[i] = null; } } } @@ -2451,6 +2458,12 @@ public class Resources { @Nullable Drawable loadDrawable(TypedValue value, int id, Theme theme) throws NotFoundException { + return loadDrawable(value, id, theme, true); + } + + @Nullable + Drawable loadDrawable(TypedValue value, int id, Theme theme, boolean useCache) + throws NotFoundException { try { if (TRACE_FOR_PRELOAD) { // Log only framework resources @@ -2477,16 +2490,17 @@ public class Resources { } // First, check whether we have a cached version of this drawable - // that was inflated against the specified theme. - if (!mPreloading) { + // that was inflated against the specified theme. Skip the cache if + // we're currently preloading or we're not using the cache. + if (!mPreloading && useCache) { final Drawable cachedDrawable = caches.getInstance(key, theme); if (cachedDrawable != null) { return cachedDrawable; } } - // Next, check preloaded drawables. These may contain unresolved theme - // attributes. + // Next, check preloaded drawables. Preloaded drawables may contain + // unresolved theme attributes. final ConstantState cs; if (isColorDrawable) { cs = sPreloadedColorDrawables.get(key); @@ -2514,8 +2528,9 @@ public class Resources { } // If we were able to obtain a drawable, store it in the appropriate - // cache: preload, not themed, null theme, or theme-specific. - if (dr != null) { + // cache: preload, not themed, null theme, or theme-specific. Don't + // pollute the cache with drawables loaded from a foreign density. + if (dr != null && useCache) { dr.setChangingConfigurations(value.changingConfigurations); cacheDrawable(value, isColorDrawable, caches, theme, canApplyTheme, key, dr); } @@ -2744,7 +2759,16 @@ public class Resources { return csl; } - /*package*/ XmlResourceParser loadXmlResourceParser(int id, String type) + /** + * Loads an XML parser for the specified file. + * + * @param id the resource identifier for the file + * @param type the type of resource (used for logging) + * @return a parser for the specified XML file + * @throws NotFoundException if the file could not be loaded + */ + @NonNull + XmlResourceParser loadXmlResourceParser(@AnyRes int id, @NonNull String type) throws NotFoundException { final TypedValue value = obtainTempTypedValue(id); try { @@ -2758,53 +2782,58 @@ public class Resources { releaseTempTypedValue(value); } } - - /*package*/ XmlResourceParser loadXmlResourceParser(String file, int id, - int assetCookie, String type) throws NotFoundException { + + /** + * Loads an XML parser for the specified file. + * + * @param file the path for the XML file to parse + * @param id the resource identifier for the file + * @param assetCookie the asset cookie for the file + * @param type the type of resource (used for logging) + * @return a parser for the specified XML file + * @throws NotFoundException if the file could not be loaded + */ + @NonNull + XmlResourceParser loadXmlResourceParser(@NonNull String file, @AnyRes int id, + int assetCookie, @NonNull String type) throws NotFoundException { if (id != 0) { try { - // These may be compiled... - synchronized (mCachedXmlBlockIds) { + final String[] cachedXmlBlockFiles = mCachedXmlBlockFiles; + final XmlBlock[] cachedXmlBlocks = mCachedXmlBlocks; + synchronized (cachedXmlBlockFiles) { // First see if this block is in our cache. - final int num = mCachedXmlBlockIds.length; - for (int i=0; i<num; i++) { - if (mCachedXmlBlockIds[i] == id) { - //System.out.println("**** REUSING XML BLOCK! id=" - // + id + ", index=" + i); - return mCachedXmlBlocks[i].newParser(); + final int num = cachedXmlBlockFiles.length; + for (int i = 0; i < num; i++) { + if (cachedXmlBlockFiles[i] != null + && cachedXmlBlockFiles[i].equals(file)) { + return cachedXmlBlocks[i].newParser(); } } // Not in the cache, create a new block and put it at // the next slot in the cache. - XmlBlock block = mAssets.openXmlBlockAsset( - assetCookie, file); + final XmlBlock block = mAssets.openXmlBlockAsset(assetCookie, file); if (block != null) { - int pos = mLastCachedXmlBlockIndex+1; - if (pos >= num) pos = 0; + final int pos = (mLastCachedXmlBlockIndex + 1) % num; mLastCachedXmlBlockIndex = pos; - XmlBlock oldBlock = mCachedXmlBlocks[pos]; + final XmlBlock oldBlock = cachedXmlBlocks[pos]; if (oldBlock != null) { oldBlock.close(); } - mCachedXmlBlockIds[pos] = id; - mCachedXmlBlocks[pos] = block; - //System.out.println("**** CACHING NEW XML BLOCK! id=" - // + id + ", index=" + pos); + cachedXmlBlockFiles[pos] = file; + cachedXmlBlocks[pos] = block; return block.newParser(); } } } catch (Exception e) { - NotFoundException rnf = new NotFoundException( - "File " + file + " from xml type " + type + " resource ID #0x" - + Integer.toHexString(id)); + final NotFoundException rnf = new NotFoundException("File " + file + + " from xml type " + type + " resource ID #0x" + Integer.toHexString(id)); rnf.initCause(e); throw rnf; } } - throw new NotFoundException( - "File " + file + " from xml type " + type + " resource ID #0x" + throw new NotFoundException("File " + file + " from xml type " + type + " resource ID #0x" + Integer.toHexString(id)); } diff --git a/graphics/java/android/graphics/Canvas.java b/graphics/java/android/graphics/Canvas.java index d5166ab92179..1cc53469a2f7 100644 --- a/graphics/java/android/graphics/Canvas.java +++ b/graphics/java/android/graphics/Canvas.java @@ -654,6 +654,12 @@ public class Canvas { /** * Return, in ctm, the current transformation matrix. This does not alter * the matrix in the canvas, but just returns a copy of it. + * + * @deprecated {@link #isHardwareAccelerated() Hardware accelerated} canvases may have any + * matrix when passed to a View or Drawable, as it is implementation defined where in the + * hierarchy such canvases are created. It is recommended in such cases to either draw contents + * irrespective of the current matrix, or to track relevant transform state outside of the + * canvas. */ @Deprecated public void getMatrix(@NonNull Matrix ctm) { @@ -663,6 +669,12 @@ public class Canvas { /** * Return a new matrix with a copy of the canvas' current transformation * matrix. + * + * @deprecated {@link #isHardwareAccelerated() Hardware accelerated} canvases may have any + * matrix when passed to a View or Drawable, as it is implementation defined where in the + * hierarchy such canvases are created. It is recommended in such cases to either draw contents + * irrespective of the current matrix, or to track relevant transform state outside of the + * canvas. */ @Deprecated public final @NonNull Matrix getMatrix() { @@ -812,6 +824,7 @@ public class Canvas { * @deprecated Unlike all other clip calls this API does not respect the * current matrix. Use {@link #clipRect(Rect)} as an alternative. */ + @Deprecated public boolean clipRegion(@NonNull Region region, @NonNull Region.Op op) { return native_clipRegion(mNativeCanvasWrapper, region.ni(), op.nativeInt); } @@ -829,6 +842,7 @@ public class Canvas { * @deprecated Unlike all other clip calls this API does not respect the * current matrix. Use {@link #clipRect(Rect)} as an alternative. */ + @Deprecated public boolean clipRegion(@NonNull Region region) { return clipRegion(region, Region.Op.INTERSECT); } @@ -1830,16 +1844,16 @@ public class Canvas { * Draw the text in the array, with each character's origin specified by * the pos array. * - * This method does not support glyph composition and decomposition and - * should therefore not be used to render complex scripts. It also doesn't - * handle supplementary characters (eg emoji). - * * @param text The text to be drawn * @param index The index of the first character to draw * @param count The number of characters to draw, starting from index. * @param pos Array of [x,y] positions, used to position each * character * @param paint The paint used for the text (e.g. color, size, style) + * + * @deprecated This method does not support glyph composition and decomposition and + * should therefore not be used to render complex scripts. It also doesn't + * handle supplementary characters (eg emoji). */ @Deprecated public void drawPosText(@NonNull char[] text, int index, int count, @@ -1857,13 +1871,13 @@ public class Canvas { * Draw the text in the array, with each character's origin specified by * the pos array. * - * This method does not support glyph composition and decomposition and - * should therefore not be used to render complex scripts. It also doesn't - * handle supplementary characters (eg emoji). - * * @param text The text to be drawn * @param pos Array of [x,y] positions, used to position each character * @param paint The paint used for the text (e.g. color, size, style) + * + * @deprecated This method does not support glyph composition and decomposition and + * should therefore not be used to render complex scripts. It also doesn't + * handle supplementary characters (eg emoji). */ @Deprecated public void drawPosText(@NonNull String text, @NonNull @Size(multiple=2) float[] pos, diff --git a/packages/DocumentsUI/res/drawable-hdpi/ic_doc_album_alpha.png b/packages/DocumentsUI/res/drawable-hdpi/ic_doc_album_alpha.png Binary files differdeleted file mode 100644 index 2b21c12d671d..000000000000 --- a/packages/DocumentsUI/res/drawable-hdpi/ic_doc_album_alpha.png +++ /dev/null diff --git a/packages/DocumentsUI/res/drawable-hdpi/ic_doc_apk_alpha.png b/packages/DocumentsUI/res/drawable-hdpi/ic_doc_apk_alpha.png Binary files differdeleted file mode 100644 index ed3ee454dfa2..000000000000 --- a/packages/DocumentsUI/res/drawable-hdpi/ic_doc_apk_alpha.png +++ /dev/null diff --git a/packages/DocumentsUI/res/drawable-hdpi/ic_doc_audio_alpha.png b/packages/DocumentsUI/res/drawable-hdpi/ic_doc_audio_alpha.png Binary files differdeleted file mode 100644 index 1a3ebc47fb4d..000000000000 --- a/packages/DocumentsUI/res/drawable-hdpi/ic_doc_audio_alpha.png +++ /dev/null diff --git a/packages/DocumentsUI/res/drawable-hdpi/ic_doc_certificate_alpha.png b/packages/DocumentsUI/res/drawable-hdpi/ic_doc_certificate_alpha.png Binary files differdeleted file mode 100644 index 3086a6923f2d..000000000000 --- a/packages/DocumentsUI/res/drawable-hdpi/ic_doc_certificate_alpha.png +++ /dev/null diff --git a/packages/DocumentsUI/res/drawable-hdpi/ic_doc_codes_alpha.png b/packages/DocumentsUI/res/drawable-hdpi/ic_doc_codes_alpha.png Binary files differdeleted file mode 100644 index b86f0f7322db..000000000000 --- a/packages/DocumentsUI/res/drawable-hdpi/ic_doc_codes_alpha.png +++ /dev/null diff --git a/packages/DocumentsUI/res/drawable-hdpi/ic_doc_compressed_alpha.png b/packages/DocumentsUI/res/drawable-hdpi/ic_doc_compressed_alpha.png Binary files differdeleted file mode 100644 index 9d0988da305e..000000000000 --- a/packages/DocumentsUI/res/drawable-hdpi/ic_doc_compressed_alpha.png +++ /dev/null diff --git a/packages/DocumentsUI/res/drawable-hdpi/ic_doc_contact_am_alpha.png b/packages/DocumentsUI/res/drawable-hdpi/ic_doc_contact_am_alpha.png Binary files differdeleted file mode 100644 index 6c3136030d6f..000000000000 --- a/packages/DocumentsUI/res/drawable-hdpi/ic_doc_contact_am_alpha.png +++ /dev/null diff --git a/packages/DocumentsUI/res/drawable-hdpi/ic_doc_event_am_alpha.png b/packages/DocumentsUI/res/drawable-hdpi/ic_doc_event_am_alpha.png Binary files differdeleted file mode 100644 index 1450ff03d7d7..000000000000 --- a/packages/DocumentsUI/res/drawable-hdpi/ic_doc_event_am_alpha.png +++ /dev/null diff --git a/packages/DocumentsUI/res/drawable-hdpi/ic_doc_excel_alpha.png b/packages/DocumentsUI/res/drawable-hdpi/ic_doc_excel_alpha.png Binary files differdeleted file mode 100644 index 4ad54bb63c97..000000000000 --- a/packages/DocumentsUI/res/drawable-hdpi/ic_doc_excel_alpha.png +++ /dev/null diff --git a/packages/DocumentsUI/res/drawable-hdpi/ic_doc_folder_alpha.png b/packages/DocumentsUI/res/drawable-hdpi/ic_doc_folder_alpha.png Binary files differdeleted file mode 100644 index 7f7c6361c34b..000000000000 --- a/packages/DocumentsUI/res/drawable-hdpi/ic_doc_folder_alpha.png +++ /dev/null diff --git a/packages/DocumentsUI/res/drawable-hdpi/ic_doc_font_alpha.png b/packages/DocumentsUI/res/drawable-hdpi/ic_doc_font_alpha.png Binary files differdeleted file mode 100644 index d867847e9174..000000000000 --- a/packages/DocumentsUI/res/drawable-hdpi/ic_doc_font_alpha.png +++ /dev/null diff --git a/packages/DocumentsUI/res/drawable-hdpi/ic_doc_generic_am_alpha.png b/packages/DocumentsUI/res/drawable-hdpi/ic_doc_generic_am_alpha.png Binary files differdeleted file mode 100644 index 545976765809..000000000000 --- a/packages/DocumentsUI/res/drawable-hdpi/ic_doc_generic_am_alpha.png +++ /dev/null diff --git a/packages/DocumentsUI/res/drawable-hdpi/ic_doc_image_alpha.png b/packages/DocumentsUI/res/drawable-hdpi/ic_doc_image_alpha.png Binary files differdeleted file mode 100644 index 0cbd992aaad9..000000000000 --- a/packages/DocumentsUI/res/drawable-hdpi/ic_doc_image_alpha.png +++ /dev/null diff --git a/packages/DocumentsUI/res/drawable-hdpi/ic_doc_pdf_alpha.png b/packages/DocumentsUI/res/drawable-hdpi/ic_doc_pdf_alpha.png Binary files differdeleted file mode 100644 index db4670259ff3..000000000000 --- a/packages/DocumentsUI/res/drawable-hdpi/ic_doc_pdf_alpha.png +++ /dev/null diff --git a/packages/DocumentsUI/res/drawable-hdpi/ic_doc_powerpoint_alpha.png b/packages/DocumentsUI/res/drawable-hdpi/ic_doc_powerpoint_alpha.png Binary files differdeleted file mode 100644 index b9f7af5754d5..000000000000 --- a/packages/DocumentsUI/res/drawable-hdpi/ic_doc_powerpoint_alpha.png +++ /dev/null diff --git a/packages/DocumentsUI/res/drawable-hdpi/ic_doc_presentation_alpha.png b/packages/DocumentsUI/res/drawable-hdpi/ic_doc_presentation_alpha.png Binary files differdeleted file mode 100644 index 1218c2f7b432..000000000000 --- a/packages/DocumentsUI/res/drawable-hdpi/ic_doc_presentation_alpha.png +++ /dev/null diff --git a/packages/DocumentsUI/res/drawable-hdpi/ic_doc_spreadsheet_am_alpha.png b/packages/DocumentsUI/res/drawable-hdpi/ic_doc_spreadsheet_am_alpha.png Binary files differdeleted file mode 100644 index 46d755f212ef..000000000000 --- a/packages/DocumentsUI/res/drawable-hdpi/ic_doc_spreadsheet_am_alpha.png +++ /dev/null diff --git a/packages/DocumentsUI/res/drawable-hdpi/ic_doc_text_am_alpha.png b/packages/DocumentsUI/res/drawable-hdpi/ic_doc_text_am_alpha.png Binary files differdeleted file mode 100644 index 933570bb7469..000000000000 --- a/packages/DocumentsUI/res/drawable-hdpi/ic_doc_text_am_alpha.png +++ /dev/null diff --git a/packages/DocumentsUI/res/drawable-hdpi/ic_doc_video_am_alpha.png b/packages/DocumentsUI/res/drawable-hdpi/ic_doc_video_am_alpha.png Binary files differdeleted file mode 100644 index 30cea25f1fc2..000000000000 --- a/packages/DocumentsUI/res/drawable-hdpi/ic_doc_video_am_alpha.png +++ /dev/null diff --git a/packages/DocumentsUI/res/drawable-hdpi/ic_doc_word_alpha.png b/packages/DocumentsUI/res/drawable-hdpi/ic_doc_word_alpha.png Binary files differdeleted file mode 100644 index 67b60ded5656..000000000000 --- a/packages/DocumentsUI/res/drawable-hdpi/ic_doc_word_alpha.png +++ /dev/null diff --git a/packages/DocumentsUI/res/drawable-mdpi/ic_doc_album_alpha.png b/packages/DocumentsUI/res/drawable-mdpi/ic_doc_album_alpha.png Binary files differdeleted file mode 100644 index ac27eea8de76..000000000000 --- a/packages/DocumentsUI/res/drawable-mdpi/ic_doc_album_alpha.png +++ /dev/null diff --git a/packages/DocumentsUI/res/drawable-mdpi/ic_doc_apk_alpha.png b/packages/DocumentsUI/res/drawable-mdpi/ic_doc_apk_alpha.png Binary files differdeleted file mode 100644 index a4add51490af..000000000000 --- a/packages/DocumentsUI/res/drawable-mdpi/ic_doc_apk_alpha.png +++ /dev/null diff --git a/packages/DocumentsUI/res/drawable-mdpi/ic_doc_audio_alpha.png b/packages/DocumentsUI/res/drawable-mdpi/ic_doc_audio_alpha.png Binary files differdeleted file mode 100644 index a9a7f2014284..000000000000 --- a/packages/DocumentsUI/res/drawable-mdpi/ic_doc_audio_alpha.png +++ /dev/null diff --git a/packages/DocumentsUI/res/drawable-mdpi/ic_doc_certificate_alpha.png b/packages/DocumentsUI/res/drawable-mdpi/ic_doc_certificate_alpha.png Binary files differdeleted file mode 100644 index 26beb794a792..000000000000 --- a/packages/DocumentsUI/res/drawable-mdpi/ic_doc_certificate_alpha.png +++ /dev/null diff --git a/packages/DocumentsUI/res/drawable-mdpi/ic_doc_codes_alpha.png b/packages/DocumentsUI/res/drawable-mdpi/ic_doc_codes_alpha.png Binary files differdeleted file mode 100644 index ed9cab7294de..000000000000 --- a/packages/DocumentsUI/res/drawable-mdpi/ic_doc_codes_alpha.png +++ /dev/null diff --git a/packages/DocumentsUI/res/drawable-mdpi/ic_doc_compressed_alpha.png b/packages/DocumentsUI/res/drawable-mdpi/ic_doc_compressed_alpha.png Binary files differdeleted file mode 100644 index 451d2873279e..000000000000 --- a/packages/DocumentsUI/res/drawable-mdpi/ic_doc_compressed_alpha.png +++ /dev/null diff --git a/packages/DocumentsUI/res/drawable-mdpi/ic_doc_contact_am_alpha.png b/packages/DocumentsUI/res/drawable-mdpi/ic_doc_contact_am_alpha.png Binary files differdeleted file mode 100644 index 7bc02c948618..000000000000 --- a/packages/DocumentsUI/res/drawable-mdpi/ic_doc_contact_am_alpha.png +++ /dev/null diff --git a/packages/DocumentsUI/res/drawable-mdpi/ic_doc_event_am_alpha.png b/packages/DocumentsUI/res/drawable-mdpi/ic_doc_event_am_alpha.png Binary files differdeleted file mode 100644 index de39cd461c02..000000000000 --- a/packages/DocumentsUI/res/drawable-mdpi/ic_doc_event_am_alpha.png +++ /dev/null diff --git a/packages/DocumentsUI/res/drawable-mdpi/ic_doc_excel_alpha.png b/packages/DocumentsUI/res/drawable-mdpi/ic_doc_excel_alpha.png Binary files differdeleted file mode 100644 index c3eb8456549e..000000000000 --- a/packages/DocumentsUI/res/drawable-mdpi/ic_doc_excel_alpha.png +++ /dev/null diff --git a/packages/DocumentsUI/res/drawable-mdpi/ic_doc_folder_alpha.png b/packages/DocumentsUI/res/drawable-mdpi/ic_doc_folder_alpha.png Binary files differdeleted file mode 100644 index 97f6e5071dee..000000000000 --- a/packages/DocumentsUI/res/drawable-mdpi/ic_doc_folder_alpha.png +++ /dev/null diff --git a/packages/DocumentsUI/res/drawable-mdpi/ic_doc_font_alpha.png b/packages/DocumentsUI/res/drawable-mdpi/ic_doc_font_alpha.png Binary files differdeleted file mode 100644 index b2f043f8a81d..000000000000 --- a/packages/DocumentsUI/res/drawable-mdpi/ic_doc_font_alpha.png +++ /dev/null diff --git a/packages/DocumentsUI/res/drawable-mdpi/ic_doc_generic_am_alpha.png b/packages/DocumentsUI/res/drawable-mdpi/ic_doc_generic_am_alpha.png Binary files differdeleted file mode 100644 index 483d7fb4d184..000000000000 --- a/packages/DocumentsUI/res/drawable-mdpi/ic_doc_generic_am_alpha.png +++ /dev/null diff --git a/packages/DocumentsUI/res/drawable-mdpi/ic_doc_image_alpha.png b/packages/DocumentsUI/res/drawable-mdpi/ic_doc_image_alpha.png Binary files differdeleted file mode 100644 index 2941b8a70135..000000000000 --- a/packages/DocumentsUI/res/drawable-mdpi/ic_doc_image_alpha.png +++ /dev/null diff --git a/packages/DocumentsUI/res/drawable-mdpi/ic_doc_pdf_alpha.png b/packages/DocumentsUI/res/drawable-mdpi/ic_doc_pdf_alpha.png Binary files differdeleted file mode 100644 index d3ac07264dc5..000000000000 --- a/packages/DocumentsUI/res/drawable-mdpi/ic_doc_pdf_alpha.png +++ /dev/null diff --git a/packages/DocumentsUI/res/drawable-mdpi/ic_doc_powerpoint_alpha.png b/packages/DocumentsUI/res/drawable-mdpi/ic_doc_powerpoint_alpha.png Binary files differdeleted file mode 100644 index a43f9022a4bc..000000000000 --- a/packages/DocumentsUI/res/drawable-mdpi/ic_doc_powerpoint_alpha.png +++ /dev/null diff --git a/packages/DocumentsUI/res/drawable-mdpi/ic_doc_presentation_alpha.png b/packages/DocumentsUI/res/drawable-mdpi/ic_doc_presentation_alpha.png Binary files differdeleted file mode 100644 index c572cd1cbbf2..000000000000 --- a/packages/DocumentsUI/res/drawable-mdpi/ic_doc_presentation_alpha.png +++ /dev/null diff --git a/packages/DocumentsUI/res/drawable-mdpi/ic_doc_spreadsheet_am_alpha.png b/packages/DocumentsUI/res/drawable-mdpi/ic_doc_spreadsheet_am_alpha.png Binary files differdeleted file mode 100644 index 7ae671ba1c7a..000000000000 --- a/packages/DocumentsUI/res/drawable-mdpi/ic_doc_spreadsheet_am_alpha.png +++ /dev/null diff --git a/packages/DocumentsUI/res/drawable-mdpi/ic_doc_text_am_alpha.png b/packages/DocumentsUI/res/drawable-mdpi/ic_doc_text_am_alpha.png Binary files differdeleted file mode 100644 index a5ebd513292b..000000000000 --- a/packages/DocumentsUI/res/drawable-mdpi/ic_doc_text_am_alpha.png +++ /dev/null diff --git a/packages/DocumentsUI/res/drawable-mdpi/ic_doc_video_am_alpha.png b/packages/DocumentsUI/res/drawable-mdpi/ic_doc_video_am_alpha.png Binary files differdeleted file mode 100644 index 89ac4340bcda..000000000000 --- a/packages/DocumentsUI/res/drawable-mdpi/ic_doc_video_am_alpha.png +++ /dev/null diff --git a/packages/DocumentsUI/res/drawable-mdpi/ic_doc_word_alpha.png b/packages/DocumentsUI/res/drawable-mdpi/ic_doc_word_alpha.png Binary files differdeleted file mode 100644 index 855c44b329d8..000000000000 --- a/packages/DocumentsUI/res/drawable-mdpi/ic_doc_word_alpha.png +++ /dev/null diff --git a/packages/DocumentsUI/res/drawable-xhdpi/ic_doc_album_alpha.png b/packages/DocumentsUI/res/drawable-xhdpi/ic_doc_album_alpha.png Binary files differdeleted file mode 100644 index 4203d35614c1..000000000000 --- a/packages/DocumentsUI/res/drawable-xhdpi/ic_doc_album_alpha.png +++ /dev/null diff --git a/packages/DocumentsUI/res/drawable-xhdpi/ic_doc_apk_alpha.png b/packages/DocumentsUI/res/drawable-xhdpi/ic_doc_apk_alpha.png Binary files differdeleted file mode 100644 index 41558f251fd6..000000000000 --- a/packages/DocumentsUI/res/drawable-xhdpi/ic_doc_apk_alpha.png +++ /dev/null diff --git a/packages/DocumentsUI/res/drawable-xhdpi/ic_doc_audio_alpha.png b/packages/DocumentsUI/res/drawable-xhdpi/ic_doc_audio_alpha.png Binary files differdeleted file mode 100644 index e190c4d4207e..000000000000 --- a/packages/DocumentsUI/res/drawable-xhdpi/ic_doc_audio_alpha.png +++ /dev/null diff --git a/packages/DocumentsUI/res/drawable-xhdpi/ic_doc_certificate_alpha.png b/packages/DocumentsUI/res/drawable-xhdpi/ic_doc_certificate_alpha.png Binary files differdeleted file mode 100644 index fabc8c3505e6..000000000000 --- a/packages/DocumentsUI/res/drawable-xhdpi/ic_doc_certificate_alpha.png +++ /dev/null diff --git a/packages/DocumentsUI/res/drawable-xhdpi/ic_doc_codes_alpha.png b/packages/DocumentsUI/res/drawable-xhdpi/ic_doc_codes_alpha.png Binary files differdeleted file mode 100644 index d8ba6e0be330..000000000000 --- a/packages/DocumentsUI/res/drawable-xhdpi/ic_doc_codes_alpha.png +++ /dev/null diff --git a/packages/DocumentsUI/res/drawable-xhdpi/ic_doc_compressed_alpha.png b/packages/DocumentsUI/res/drawable-xhdpi/ic_doc_compressed_alpha.png Binary files differdeleted file mode 100644 index 1b5111a577a4..000000000000 --- a/packages/DocumentsUI/res/drawable-xhdpi/ic_doc_compressed_alpha.png +++ /dev/null diff --git a/packages/DocumentsUI/res/drawable-xhdpi/ic_doc_contact_am_alpha.png b/packages/DocumentsUI/res/drawable-xhdpi/ic_doc_contact_am_alpha.png Binary files differdeleted file mode 100644 index e7b7460dd8c5..000000000000 --- a/packages/DocumentsUI/res/drawable-xhdpi/ic_doc_contact_am_alpha.png +++ /dev/null diff --git a/packages/DocumentsUI/res/drawable-xhdpi/ic_doc_event_am_alpha.png b/packages/DocumentsUI/res/drawable-xhdpi/ic_doc_event_am_alpha.png Binary files differdeleted file mode 100644 index 3183bfca62da..000000000000 --- a/packages/DocumentsUI/res/drawable-xhdpi/ic_doc_event_am_alpha.png +++ /dev/null diff --git a/packages/DocumentsUI/res/drawable-xhdpi/ic_doc_excel_alpha.png b/packages/DocumentsUI/res/drawable-xhdpi/ic_doc_excel_alpha.png Binary files differdeleted file mode 100644 index 9a4e844f5ff2..000000000000 --- a/packages/DocumentsUI/res/drawable-xhdpi/ic_doc_excel_alpha.png +++ /dev/null diff --git a/packages/DocumentsUI/res/drawable-xhdpi/ic_doc_folder_alpha.png b/packages/DocumentsUI/res/drawable-xhdpi/ic_doc_folder_alpha.png Binary files differdeleted file mode 100644 index 96d5721866c7..000000000000 --- a/packages/DocumentsUI/res/drawable-xhdpi/ic_doc_folder_alpha.png +++ /dev/null diff --git a/packages/DocumentsUI/res/drawable-xhdpi/ic_doc_font_alpha.png b/packages/DocumentsUI/res/drawable-xhdpi/ic_doc_font_alpha.png Binary files differdeleted file mode 100644 index 23a130236996..000000000000 --- a/packages/DocumentsUI/res/drawable-xhdpi/ic_doc_font_alpha.png +++ /dev/null diff --git a/packages/DocumentsUI/res/drawable-xhdpi/ic_doc_generic_am_alpha.png b/packages/DocumentsUI/res/drawable-xhdpi/ic_doc_generic_am_alpha.png Binary files differdeleted file mode 100644 index b0811f18ebbe..000000000000 --- a/packages/DocumentsUI/res/drawable-xhdpi/ic_doc_generic_am_alpha.png +++ /dev/null diff --git a/packages/DocumentsUI/res/drawable-xhdpi/ic_doc_image_alpha.png b/packages/DocumentsUI/res/drawable-xhdpi/ic_doc_image_alpha.png Binary files differdeleted file mode 100644 index 5f1f53761805..000000000000 --- a/packages/DocumentsUI/res/drawable-xhdpi/ic_doc_image_alpha.png +++ /dev/null diff --git a/packages/DocumentsUI/res/drawable-xhdpi/ic_doc_pdf_alpha.png b/packages/DocumentsUI/res/drawable-xhdpi/ic_doc_pdf_alpha.png Binary files differdeleted file mode 100644 index 8083584eb8d2..000000000000 --- a/packages/DocumentsUI/res/drawable-xhdpi/ic_doc_pdf_alpha.png +++ /dev/null diff --git a/packages/DocumentsUI/res/drawable-xhdpi/ic_doc_powerpoint_alpha.png b/packages/DocumentsUI/res/drawable-xhdpi/ic_doc_powerpoint_alpha.png Binary files differdeleted file mode 100644 index 898e26ae0092..000000000000 --- a/packages/DocumentsUI/res/drawable-xhdpi/ic_doc_powerpoint_alpha.png +++ /dev/null diff --git a/packages/DocumentsUI/res/drawable-xhdpi/ic_doc_presentation_alpha.png b/packages/DocumentsUI/res/drawable-xhdpi/ic_doc_presentation_alpha.png Binary files differdeleted file mode 100644 index 2e9c66721413..000000000000 --- a/packages/DocumentsUI/res/drawable-xhdpi/ic_doc_presentation_alpha.png +++ /dev/null diff --git a/packages/DocumentsUI/res/drawable-xhdpi/ic_doc_spreadsheet_am_alpha.png b/packages/DocumentsUI/res/drawable-xhdpi/ic_doc_spreadsheet_am_alpha.png Binary files differdeleted file mode 100644 index 56951c3cad10..000000000000 --- a/packages/DocumentsUI/res/drawable-xhdpi/ic_doc_spreadsheet_am_alpha.png +++ /dev/null diff --git a/packages/DocumentsUI/res/drawable-xhdpi/ic_doc_text_am_alpha.png b/packages/DocumentsUI/res/drawable-xhdpi/ic_doc_text_am_alpha.png Binary files differdeleted file mode 100644 index 08ed9f0888e9..000000000000 --- a/packages/DocumentsUI/res/drawable-xhdpi/ic_doc_text_am_alpha.png +++ /dev/null diff --git a/packages/DocumentsUI/res/drawable-xhdpi/ic_doc_video_am_alpha.png b/packages/DocumentsUI/res/drawable-xhdpi/ic_doc_video_am_alpha.png Binary files differdeleted file mode 100644 index cd64e56b4c42..000000000000 --- a/packages/DocumentsUI/res/drawable-xhdpi/ic_doc_video_am_alpha.png +++ /dev/null diff --git a/packages/DocumentsUI/res/drawable-xhdpi/ic_doc_word_alpha.png b/packages/DocumentsUI/res/drawable-xhdpi/ic_doc_word_alpha.png Binary files differdeleted file mode 100644 index 0bc40deb6a75..000000000000 --- a/packages/DocumentsUI/res/drawable-xhdpi/ic_doc_word_alpha.png +++ /dev/null diff --git a/packages/DocumentsUI/res/drawable-xxhdpi/ic_doc_album_alpha.png b/packages/DocumentsUI/res/drawable-xxhdpi/ic_doc_album_alpha.png Binary files differdeleted file mode 100644 index 60f59f532abd..000000000000 --- a/packages/DocumentsUI/res/drawable-xxhdpi/ic_doc_album_alpha.png +++ /dev/null diff --git a/packages/DocumentsUI/res/drawable-xxhdpi/ic_doc_apk_alpha.png b/packages/DocumentsUI/res/drawable-xxhdpi/ic_doc_apk_alpha.png Binary files differdeleted file mode 100644 index 6006b1207e3c..000000000000 --- a/packages/DocumentsUI/res/drawable-xxhdpi/ic_doc_apk_alpha.png +++ /dev/null diff --git a/packages/DocumentsUI/res/drawable-xxhdpi/ic_doc_audio_alpha.png b/packages/DocumentsUI/res/drawable-xxhdpi/ic_doc_audio_alpha.png Binary files differdeleted file mode 100644 index 7926188aa0fd..000000000000 --- a/packages/DocumentsUI/res/drawable-xxhdpi/ic_doc_audio_alpha.png +++ /dev/null diff --git a/packages/DocumentsUI/res/drawable-xxhdpi/ic_doc_certificate_alpha.png b/packages/DocumentsUI/res/drawable-xxhdpi/ic_doc_certificate_alpha.png Binary files differdeleted file mode 100644 index e65d74c2a008..000000000000 --- a/packages/DocumentsUI/res/drawable-xxhdpi/ic_doc_certificate_alpha.png +++ /dev/null diff --git a/packages/DocumentsUI/res/drawable-xxhdpi/ic_doc_codes_alpha.png b/packages/DocumentsUI/res/drawable-xxhdpi/ic_doc_codes_alpha.png Binary files differdeleted file mode 100644 index 7d32801f79d4..000000000000 --- a/packages/DocumentsUI/res/drawable-xxhdpi/ic_doc_codes_alpha.png +++ /dev/null diff --git a/packages/DocumentsUI/res/drawable-xxhdpi/ic_doc_compressed_alpha.png b/packages/DocumentsUI/res/drawable-xxhdpi/ic_doc_compressed_alpha.png Binary files differdeleted file mode 100644 index d528708242f5..000000000000 --- a/packages/DocumentsUI/res/drawable-xxhdpi/ic_doc_compressed_alpha.png +++ /dev/null diff --git a/packages/DocumentsUI/res/drawable-xxhdpi/ic_doc_contact_am_alpha.png b/packages/DocumentsUI/res/drawable-xxhdpi/ic_doc_contact_am_alpha.png Binary files differdeleted file mode 100644 index 274c52468599..000000000000 --- a/packages/DocumentsUI/res/drawable-xxhdpi/ic_doc_contact_am_alpha.png +++ /dev/null diff --git a/packages/DocumentsUI/res/drawable-xxhdpi/ic_doc_event_am_alpha.png b/packages/DocumentsUI/res/drawable-xxhdpi/ic_doc_event_am_alpha.png Binary files differdeleted file mode 100644 index 6053b0a65213..000000000000 --- a/packages/DocumentsUI/res/drawable-xxhdpi/ic_doc_event_am_alpha.png +++ /dev/null diff --git a/packages/DocumentsUI/res/drawable-xxhdpi/ic_doc_excel_alpha.png b/packages/DocumentsUI/res/drawable-xxhdpi/ic_doc_excel_alpha.png Binary files differdeleted file mode 100644 index 78ee13b3ca7e..000000000000 --- a/packages/DocumentsUI/res/drawable-xxhdpi/ic_doc_excel_alpha.png +++ /dev/null diff --git a/packages/DocumentsUI/res/drawable-xxhdpi/ic_doc_folder_alpha.png b/packages/DocumentsUI/res/drawable-xxhdpi/ic_doc_folder_alpha.png Binary files differdeleted file mode 100644 index dcf9cc265354..000000000000 --- a/packages/DocumentsUI/res/drawable-xxhdpi/ic_doc_folder_alpha.png +++ /dev/null diff --git a/packages/DocumentsUI/res/drawable-xxhdpi/ic_doc_font_alpha.png b/packages/DocumentsUI/res/drawable-xxhdpi/ic_doc_font_alpha.png Binary files differdeleted file mode 100644 index 74fbbbc5de9b..000000000000 --- a/packages/DocumentsUI/res/drawable-xxhdpi/ic_doc_font_alpha.png +++ /dev/null diff --git a/packages/DocumentsUI/res/drawable-xxhdpi/ic_doc_generic_am_alpha.png b/packages/DocumentsUI/res/drawable-xxhdpi/ic_doc_generic_am_alpha.png Binary files differdeleted file mode 100644 index 11a219afc3f6..000000000000 --- a/packages/DocumentsUI/res/drawable-xxhdpi/ic_doc_generic_am_alpha.png +++ /dev/null diff --git a/packages/DocumentsUI/res/drawable-xxhdpi/ic_doc_image_alpha.png b/packages/DocumentsUI/res/drawable-xxhdpi/ic_doc_image_alpha.png Binary files differdeleted file mode 100644 index 9a461c96f785..000000000000 --- a/packages/DocumentsUI/res/drawable-xxhdpi/ic_doc_image_alpha.png +++ /dev/null diff --git a/packages/DocumentsUI/res/drawable-xxhdpi/ic_doc_pdf_alpha.png b/packages/DocumentsUI/res/drawable-xxhdpi/ic_doc_pdf_alpha.png Binary files differdeleted file mode 100644 index 9a67956b6288..000000000000 --- a/packages/DocumentsUI/res/drawable-xxhdpi/ic_doc_pdf_alpha.png +++ /dev/null diff --git a/packages/DocumentsUI/res/drawable-xxhdpi/ic_doc_powerpoint_alpha.png b/packages/DocumentsUI/res/drawable-xxhdpi/ic_doc_powerpoint_alpha.png Binary files differdeleted file mode 100644 index 853aa8c0ccbc..000000000000 --- a/packages/DocumentsUI/res/drawable-xxhdpi/ic_doc_powerpoint_alpha.png +++ /dev/null diff --git a/packages/DocumentsUI/res/drawable-xxhdpi/ic_doc_presentation_alpha.png b/packages/DocumentsUI/res/drawable-xxhdpi/ic_doc_presentation_alpha.png Binary files differdeleted file mode 100644 index 84ae9aef1760..000000000000 --- a/packages/DocumentsUI/res/drawable-xxhdpi/ic_doc_presentation_alpha.png +++ /dev/null diff --git a/packages/DocumentsUI/res/drawable-xxhdpi/ic_doc_spreadsheet_am_alpha.png b/packages/DocumentsUI/res/drawable-xxhdpi/ic_doc_spreadsheet_am_alpha.png Binary files differdeleted file mode 100644 index 111439e86b03..000000000000 --- a/packages/DocumentsUI/res/drawable-xxhdpi/ic_doc_spreadsheet_am_alpha.png +++ /dev/null diff --git a/packages/DocumentsUI/res/drawable-xxhdpi/ic_doc_text_am_alpha.png b/packages/DocumentsUI/res/drawable-xxhdpi/ic_doc_text_am_alpha.png Binary files differdeleted file mode 100644 index b876f86d7f3c..000000000000 --- a/packages/DocumentsUI/res/drawable-xxhdpi/ic_doc_text_am_alpha.png +++ /dev/null diff --git a/packages/DocumentsUI/res/drawable-xxhdpi/ic_doc_video_am_alpha.png b/packages/DocumentsUI/res/drawable-xxhdpi/ic_doc_video_am_alpha.png Binary files differdeleted file mode 100644 index 7cf656a5bf0b..000000000000 --- a/packages/DocumentsUI/res/drawable-xxhdpi/ic_doc_video_am_alpha.png +++ /dev/null diff --git a/packages/DocumentsUI/res/drawable-xxhdpi/ic_doc_word_alpha.png b/packages/DocumentsUI/res/drawable-xxhdpi/ic_doc_word_alpha.png Binary files differdeleted file mode 100644 index acc3d7b29af0..000000000000 --- a/packages/DocumentsUI/res/drawable-xxhdpi/ic_doc_word_alpha.png +++ /dev/null diff --git a/packages/DocumentsUI/res/drawable-xxxhdpi/ic_doc_album_alpha.png b/packages/DocumentsUI/res/drawable-xxxhdpi/ic_doc_album_alpha.png Binary files differdeleted file mode 100644 index d2dd494d2718..000000000000 --- a/packages/DocumentsUI/res/drawable-xxxhdpi/ic_doc_album_alpha.png +++ /dev/null diff --git a/packages/DocumentsUI/res/drawable-xxxhdpi/ic_doc_apk_alpha.png b/packages/DocumentsUI/res/drawable-xxxhdpi/ic_doc_apk_alpha.png Binary files differdeleted file mode 100644 index 4f935bf59b26..000000000000 --- a/packages/DocumentsUI/res/drawable-xxxhdpi/ic_doc_apk_alpha.png +++ /dev/null diff --git a/packages/DocumentsUI/res/drawable-xxxhdpi/ic_doc_audio_alpha.png b/packages/DocumentsUI/res/drawable-xxxhdpi/ic_doc_audio_alpha.png Binary files differdeleted file mode 100644 index 7499cbc6d24e..000000000000 --- a/packages/DocumentsUI/res/drawable-xxxhdpi/ic_doc_audio_alpha.png +++ /dev/null diff --git a/packages/DocumentsUI/res/drawable-xxxhdpi/ic_doc_certificate_alpha.png b/packages/DocumentsUI/res/drawable-xxxhdpi/ic_doc_certificate_alpha.png Binary files differdeleted file mode 100644 index ca129289f408..000000000000 --- a/packages/DocumentsUI/res/drawable-xxxhdpi/ic_doc_certificate_alpha.png +++ /dev/null diff --git a/packages/DocumentsUI/res/drawable-xxxhdpi/ic_doc_codes_alpha.png b/packages/DocumentsUI/res/drawable-xxxhdpi/ic_doc_codes_alpha.png Binary files differdeleted file mode 100644 index c4afa37bc362..000000000000 --- a/packages/DocumentsUI/res/drawable-xxxhdpi/ic_doc_codes_alpha.png +++ /dev/null diff --git a/packages/DocumentsUI/res/drawable-xxxhdpi/ic_doc_compressed_alpha.png b/packages/DocumentsUI/res/drawable-xxxhdpi/ic_doc_compressed_alpha.png Binary files differdeleted file mode 100644 index 0b0aa040736c..000000000000 --- a/packages/DocumentsUI/res/drawable-xxxhdpi/ic_doc_compressed_alpha.png +++ /dev/null diff --git a/packages/DocumentsUI/res/drawable-xxxhdpi/ic_doc_contact_am_alpha.png b/packages/DocumentsUI/res/drawable-xxxhdpi/ic_doc_contact_am_alpha.png Binary files differdeleted file mode 100644 index ebd0535a884d..000000000000 --- a/packages/DocumentsUI/res/drawable-xxxhdpi/ic_doc_contact_am_alpha.png +++ /dev/null diff --git a/packages/DocumentsUI/res/drawable-xxxhdpi/ic_doc_event_am_alpha.png b/packages/DocumentsUI/res/drawable-xxxhdpi/ic_doc_event_am_alpha.png Binary files differdeleted file mode 100644 index 29cdbb7ad7df..000000000000 --- a/packages/DocumentsUI/res/drawable-xxxhdpi/ic_doc_event_am_alpha.png +++ /dev/null diff --git a/packages/DocumentsUI/res/drawable-xxxhdpi/ic_doc_excel_alpha.png b/packages/DocumentsUI/res/drawable-xxxhdpi/ic_doc_excel_alpha.png Binary files differdeleted file mode 100644 index ca349b659fe5..000000000000 --- a/packages/DocumentsUI/res/drawable-xxxhdpi/ic_doc_excel_alpha.png +++ /dev/null diff --git a/packages/DocumentsUI/res/drawable-xxxhdpi/ic_doc_folder_alpha.png b/packages/DocumentsUI/res/drawable-xxxhdpi/ic_doc_folder_alpha.png Binary files differdeleted file mode 100644 index 02249d2058da..000000000000 --- a/packages/DocumentsUI/res/drawable-xxxhdpi/ic_doc_folder_alpha.png +++ /dev/null diff --git a/packages/DocumentsUI/res/drawable-xxxhdpi/ic_doc_font_alpha.png b/packages/DocumentsUI/res/drawable-xxxhdpi/ic_doc_font_alpha.png Binary files differdeleted file mode 100644 index 469b911bc1ee..000000000000 --- a/packages/DocumentsUI/res/drawable-xxxhdpi/ic_doc_font_alpha.png +++ /dev/null diff --git a/packages/DocumentsUI/res/drawable-xxxhdpi/ic_doc_generic_am_alpha.png b/packages/DocumentsUI/res/drawable-xxxhdpi/ic_doc_generic_am_alpha.png Binary files differdeleted file mode 100644 index ef479c3c897e..000000000000 --- a/packages/DocumentsUI/res/drawable-xxxhdpi/ic_doc_generic_am_alpha.png +++ /dev/null diff --git a/packages/DocumentsUI/res/drawable-xxxhdpi/ic_doc_image_alpha.png b/packages/DocumentsUI/res/drawable-xxxhdpi/ic_doc_image_alpha.png Binary files differdeleted file mode 100644 index 3168d6f78e95..000000000000 --- a/packages/DocumentsUI/res/drawable-xxxhdpi/ic_doc_image_alpha.png +++ /dev/null diff --git a/packages/DocumentsUI/res/drawable-xxxhdpi/ic_doc_pdf_alpha.png b/packages/DocumentsUI/res/drawable-xxxhdpi/ic_doc_pdf_alpha.png Binary files differdeleted file mode 100644 index 9bb4d66d9493..000000000000 --- a/packages/DocumentsUI/res/drawable-xxxhdpi/ic_doc_pdf_alpha.png +++ /dev/null diff --git a/packages/DocumentsUI/res/drawable-xxxhdpi/ic_doc_powerpoint_alpha.png b/packages/DocumentsUI/res/drawable-xxxhdpi/ic_doc_powerpoint_alpha.png Binary files differdeleted file mode 100644 index 88ba9ad5daff..000000000000 --- a/packages/DocumentsUI/res/drawable-xxxhdpi/ic_doc_powerpoint_alpha.png +++ /dev/null diff --git a/packages/DocumentsUI/res/drawable-xxxhdpi/ic_doc_presentation_alpha.png b/packages/DocumentsUI/res/drawable-xxxhdpi/ic_doc_presentation_alpha.png Binary files differdeleted file mode 100644 index 5fe18da00879..000000000000 --- a/packages/DocumentsUI/res/drawable-xxxhdpi/ic_doc_presentation_alpha.png +++ /dev/null diff --git a/packages/DocumentsUI/res/drawable-xxxhdpi/ic_doc_spreadsheet_am_alpha.png b/packages/DocumentsUI/res/drawable-xxxhdpi/ic_doc_spreadsheet_am_alpha.png Binary files differdeleted file mode 100644 index 1d05f6f58ad0..000000000000 --- a/packages/DocumentsUI/res/drawable-xxxhdpi/ic_doc_spreadsheet_am_alpha.png +++ /dev/null diff --git a/packages/DocumentsUI/res/drawable-xxxhdpi/ic_doc_text_am_alpha.png b/packages/DocumentsUI/res/drawable-xxxhdpi/ic_doc_text_am_alpha.png Binary files differdeleted file mode 100644 index c2308fe0253f..000000000000 --- a/packages/DocumentsUI/res/drawable-xxxhdpi/ic_doc_text_am_alpha.png +++ /dev/null diff --git a/packages/DocumentsUI/res/drawable-xxxhdpi/ic_doc_video_am_alpha.png b/packages/DocumentsUI/res/drawable-xxxhdpi/ic_doc_video_am_alpha.png Binary files differdeleted file mode 100644 index 9a173bef611d..000000000000 --- a/packages/DocumentsUI/res/drawable-xxxhdpi/ic_doc_video_am_alpha.png +++ /dev/null diff --git a/packages/DocumentsUI/res/drawable-xxxhdpi/ic_doc_word_alpha.png b/packages/DocumentsUI/res/drawable-xxxhdpi/ic_doc_word_alpha.png Binary files differdeleted file mode 100644 index a564f5a76db0..000000000000 --- a/packages/DocumentsUI/res/drawable-xxxhdpi/ic_doc_word_alpha.png +++ /dev/null diff --git a/packages/DocumentsUI/res/drawable/ic_doc_album.xml b/packages/DocumentsUI/res/drawable/ic_doc_album.xml index e7965e621b05..1ce3f023dfb7 100644 --- a/packages/DocumentsUI/res/drawable/ic_doc_album.xml +++ b/packages/DocumentsUI/res/drawable/ic_doc_album.xml @@ -1,4 +1,24 @@ -<?xml version="1.0" encoding="utf-8"?> -<bitmap xmlns:android="http://schemas.android.com/apk/res/android" - android:src="@drawable/ic_doc_album_alpha" - android:tint="?android:attr/colorControlNormal" /> +<!-- +Copyright (C) 2015 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. +--> +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="24dp" + android:height="24dp" + android:viewportWidth="24.0" + android:viewportHeight="24.0"> + <path + android:fillColor="#FF737373" + android:pathData="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10,-4.48 10,-10S17.52 2 12 2zm0 14.5c-2.49 0,-4.5,-2.01,-4.5,-4.5S9.51 7.5 12 7.5s4.5 2.01 4.5 4.5,-2.01 4.5,-4.5 4.5zm0,-5.5c-.55 0,-1 .45,-1 1s.45 1 1 1 1,-.45 1,-1,-.45,-1,-1,-1z"/> +</vector> diff --git a/packages/DocumentsUI/res/drawable/ic_doc_apk.xml b/packages/DocumentsUI/res/drawable/ic_doc_apk.xml index 4f8f06e86bb7..197445ef598d 100644 --- a/packages/DocumentsUI/res/drawable/ic_doc_apk.xml +++ b/packages/DocumentsUI/res/drawable/ic_doc_apk.xml @@ -1,4 +1,24 @@ -<?xml version="1.0" encoding="utf-8"?> -<bitmap xmlns:android="http://schemas.android.com/apk/res/android" - android:src="@drawable/ic_doc_apk_alpha" - android:tint="?android:attr/colorControlNormal" /> +<!-- +Copyright (C) 2015 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. +--> +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="24dp" + android:height="24dp" + android:viewportWidth="24.0" + android:viewportHeight="24.0"> + <path + android:fillColor="#FF737373" + android:pathData="M6 18c0 .55.45 1 1 1h1v3.5c0 .83.67 1.5 1.5 1.5s1.5,-.67 1.5,-1.5V19h2v3.5c0 .83.67 1.5 1.5 1.5s1.5,-.67 1.5,-1.5V19h1c.55 0 1,-.45 1,-1V8H6v10zM3.5 8C2.67 8 2 8.67 2 9.5v7c0 .83.67 1.5 1.5 1.5S5 17.33 5 16.5v-7C5 8.67 4.33 8 3.5 8zm17 0c-.83 0,-1.5.67,-1.5 1.5v7c0 .83.67 1.5 1.5 1.5s1.5,-.67 1.5,-1.5v-7c0,-.83,-.67,-1.5,-1.5,-1.5zm-4.97,-5.84l1.3,-1.3c.2,-.2.2,-.51 0,-.71,-.2,-.2,-.51,-.2,-.71 0l-1.48 1.48C13.85 1.23 12.95 1 12 1c-.96 0,-1.86.23,-2.66.63L7.85.15c-.2,-.2,-.51,-.2,-.71 0,-.2.2,-.2.51 0 .71l1.31 1.31C6.97 3.26 6 5.01 6 7h12c0,-1.99,-.97,-3.75,-2.47,-4.84zM10 5H9V4h1v1zm5 0h-1V4h1v1z"/> +</vector> diff --git a/packages/DocumentsUI/res/drawable/ic_doc_audio.xml b/packages/DocumentsUI/res/drawable/ic_doc_audio.xml index cf18b4f0e2f6..454eea3bbad9 100644 --- a/packages/DocumentsUI/res/drawable/ic_doc_audio.xml +++ b/packages/DocumentsUI/res/drawable/ic_doc_audio.xml @@ -1,4 +1,24 @@ -<?xml version="1.0" encoding="utf-8"?> -<bitmap xmlns:android="http://schemas.android.com/apk/res/android" - android:src="@drawable/ic_doc_audio_alpha" - android:tint="?android:attr/colorControlNormal" /> +<!-- +Copyright (C) 2015 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. +--> +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="24dp" + android:height="24dp" + android:viewportWidth="24.0" + android:viewportHeight="24.0"> + <path + android:fillColor="#FFDB4437" + android:pathData="M19 3H5c-1.1 0,-2 .9,-2 2v14c0 1.1.9 2 2 2h14c1.1 0 2,-.9 2,-2V5c0,-1.1,-.9,-2,-2,-2zM7.2 18c-.66 0,-1.2,-.54,-1.2,-1.2V12c0,-3.31 2.69,-6 6,-6s6 2.69 6 6v4.8c0 .66,-.54 1.2,-1.2 1.2H14v-4h2v-2c0,-2.21,-1.79,-4,-4,-4s-4 1.79,-4 4v2h2v4H7.2z"/> +</vector> diff --git a/packages/DocumentsUI/res/drawable/ic_doc_certificate.xml b/packages/DocumentsUI/res/drawable/ic_doc_certificate.xml index c28ed4fe44df..b99baf6f4cd3 100644 --- a/packages/DocumentsUI/res/drawable/ic_doc_certificate.xml +++ b/packages/DocumentsUI/res/drawable/ic_doc_certificate.xml @@ -1,4 +1,24 @@ -<?xml version="1.0" encoding="utf-8"?> -<bitmap xmlns:android="http://schemas.android.com/apk/res/android" - android:src="@drawable/ic_doc_certificate_alpha" - android:tint="?android:attr/colorControlNormal" /> +<!-- +Copyright (C) 2015 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. +--> +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="24dp" + android:height="24dp" + android:viewportWidth="24.0" + android:viewportHeight="24.0"> + <path + android:fillColor="#FF737373" + android:pathData="M17.81 4.47c-.08 0,-.16,-.02,-.23,-.06C15.66 3.42 14 3 12.01 3c-1.98 0,-3.86.47,-5.57 1.41,-.24.13,-.54.04,-.68,-.2,-.13,-.24,-.04,-.55.2,-.68C7.82 2.52 9.86 2 12.01 2c2.13 0 3.99.47 6.03 1.52.25.13.34.43.21.67,-.09.18,-.26.28,-.44.28zM3.5 9.72c-.1 0,-.2,-.03,-.29,-.09,-.23,-.16,-.28,-.47,-.12,-.7.99,-1.4 2.25,-2.5 3.75,-3.27C9.98 4.04 14 4.03 17.15 5.65c1.5.77 2.76 1.86 3.75 3.25.16.22.11.54,-.12.7,-.23.16,-.54.11,-.7,-.12,-.9,-1.26,-2.04,-2.25,-3.39,-2.94,-2.87,-1.47,-6.54,-1.47,-9.4.01,-1.36.7,-2.5 1.7,-3.4 2.96,-.08.14,-.23.21,-.39.21zm6.25 12.07c-.13 0,-.26,-.05,-.35,-.15,-.87,-.87,-1.34,-1.43,-2.01,-2.64,-.69,-1.23,-1.05,-2.73,-1.05,-4.34 0,-2.97 2.54,-5.39 5.66,-5.39s5.66 2.42 5.66 5.39c0 .28,-.22.5,-.5.5s-.5,-.22,-.5,-.5c0,-2.42,-2.09,-4.39,-4.66,-4.39,-2.57 0,-4.66 1.97,-4.66 4.39 0 1.44.32 2.77.93 3.85.64 1.15 1.08 1.64 1.85 2.42.19.2.19.51 0 .71,-.11.1,-.24.15,-.37.15zm7.17,-1.85c-1.19 0,-2.24,-.3,-3.1,-.89,-1.49,-1.01,-2.38,-2.65,-2.38,-4.39 0,-.28.22,-.5.5,-.5s.5.22.5.5c0 1.41.72 2.74 1.94 3.56.71.48 1.54.71 2.54.71.24 0 .64,-.03 1.04,-.1.27,-.05.53.13.58.41.05.27,-.13.53,-.41.58,-.57.11,-1.07.12,-1.21.12zM14.91 22c-.04 0,-.09,-.01,-.13,-.02,-1.59,-.44,-2.63,-1.03,-3.72,-2.1,-1.4,-1.39,-2.17,-3.24,-2.17,-5.22 0,-1.62 1.38,-2.94 3.08,-2.94 1.7 0 3.08 1.32 3.08 2.94 0 1.07.93 1.94 2.08 1.94s2.08,-.87 2.08,-1.94c0,-3.77,-3.25,-6.83,-7.25,-6.83,-2.84 0,-5.44 1.58,-6.61 4.03,-.39.81,-.59 1.76,-.59 2.8 0 .78.07 2.01.67 3.61.1.26,-.03.55,-.29.64,-.26.1,-.55,-.04,-.64,-.29,-.49,-1.31,-.73,-2.61,-.73,-3.96 0,-1.2.23,-2.29.68,-3.24 1.33,-2.79 4.28,-4.6 7.51,-4.6 4.55 0 8.25 3.51 8.25 7.83 0 1.62,-1.38 2.94,-3.08 2.94s-3.08,-1.32,-3.08,-2.94c0,-1.07,-.93,-1.94,-2.08,-1.94s-2.08.87,-2.08 1.94c0 1.71.66 3.31 1.87 4.51.95.94 1.86 1.46 3.27 1.85.27.07.42.35.35.61,-.05.23,-.26.38,-.47.38z"/> +</vector> diff --git a/packages/DocumentsUI/res/drawable/ic_doc_codes.xml b/packages/DocumentsUI/res/drawable/ic_doc_codes.xml index 0de721a90002..ea1c464890e7 100644 --- a/packages/DocumentsUI/res/drawable/ic_doc_codes.xml +++ b/packages/DocumentsUI/res/drawable/ic_doc_codes.xml @@ -1,4 +1,24 @@ -<?xml version="1.0" encoding="utf-8"?> -<bitmap xmlns:android="http://schemas.android.com/apk/res/android" - android:src="@drawable/ic_doc_codes_alpha" - android:tint="?android:attr/colorControlNormal" /> +<!-- +Copyright (C) 2015 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. +--> +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="24dp" + android:height="24dp" + android:viewportWidth="24.0" + android:viewportHeight="24.0"> + <path + android:fillColor="#FF737373" + android:pathData="M9.4 16.6L4.8 12l4.6,-4.6L8 6l-6 6 6 6 1.4,-1.4zm5.2 0l4.6,-4.6,-4.6,-4.6L16 6l6 6,-6 6,-1.4,-1.4z"/> +</vector> diff --git a/packages/DocumentsUI/res/drawable/ic_doc_compressed.xml b/packages/DocumentsUI/res/drawable/ic_doc_compressed.xml index a49cfa42438c..e0eb669af33a 100644 --- a/packages/DocumentsUI/res/drawable/ic_doc_compressed.xml +++ b/packages/DocumentsUI/res/drawable/ic_doc_compressed.xml @@ -1,4 +1,24 @@ -<?xml version="1.0" encoding="utf-8"?> -<bitmap xmlns:android="http://schemas.android.com/apk/res/android" - android:src="@drawable/ic_doc_compressed_alpha" - android:tint="?android:attr/colorControlNormal" /> +<!-- +Copyright (C) 2015 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. +--> +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="24dp" + android:height="24dp" + android:viewportWidth="24.0" + android:viewportHeight="24.0"> + <path + android:fillColor="#FF737373" + android:pathData="M19 3H5c-1.1 0,-2 .9,-2 2v14c0 1.1.9 2 2 2h14c1.1 0 2,-.9 2,-2V5c0,-1.1,-.9,-2,-2,-2zm-5 6h-2v2h2v2h-2v-2h-2V9h2V7h-2V5h2v2h2v2zm0 8h-2v-2h-2v-2h2v2h2v2z"/> +</vector> diff --git a/packages/DocumentsUI/res/drawable/ic_doc_contact.xml b/packages/DocumentsUI/res/drawable/ic_doc_contact.xml index bf550cbf0780..a77cb6ba1152 100644 --- a/packages/DocumentsUI/res/drawable/ic_doc_contact.xml +++ b/packages/DocumentsUI/res/drawable/ic_doc_contact.xml @@ -1,5 +1,24 @@ -<?xml version="1.0" encoding="utf-8"?> -<bitmap xmlns:android="http://schemas.android.com/apk/res/android" - android:src="@drawable/ic_doc_contact_am_alpha" - android:tint="?android:attr/colorControlNormal" - android:autoMirrored="true" /> +<!-- +Copyright (C) 2015 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. +--> +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="24dp" + android:height="24dp" + android:viewportWidth="24.0" + android:viewportHeight="24.0"> + <path + android:fillColor="#FF737373" + android:pathData="M19 3H5c-1.11 0,-2 .89,-2 2v14c0 1.1.89 2 2 2h14c1.1 0 2,-.9 2,-2V5c0,-1.11,-.9,-2,-2,-2zm-7 3c1.65 0 3 1.35 3 3 0 1.66,-1.35 3,-3 3s-3,-1.34,-3,-3c0,-1.65 1.35,-3 3,-3zm6 12H6v-1c0,-2 4,-3.1 6,-3.1s6 1.1 6 3.1v1z"/> +</vector> diff --git a/packages/DocumentsUI/res/drawable/ic_doc_document.xml b/packages/DocumentsUI/res/drawable/ic_doc_document.xml new file mode 100644 index 000000000000..29251ad799f0 --- /dev/null +++ b/packages/DocumentsUI/res/drawable/ic_doc_document.xml @@ -0,0 +1,24 @@ +<!-- +Copyright (C) 2015 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. +--> +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="24dp" + android:height="24dp" + android:viewportWidth="24.0" + android:viewportHeight="24.0"> + <path + android:fillColor="#FF4883F3" + android:pathData="M19 3H5c-1.1 0,-2 .9,-2 2v14c0 1.1.9 2 2 2h14c1.1 0 2,-.9 2,-2V5c0,-1.1,-.9,-2,-2,-2zm-1.99 6H7V7h10.01v2zm0 4H7v-2h10.01v2zm-3 4H7v-2h7.01v2z"/> +</vector> diff --git a/packages/DocumentsUI/res/drawable/ic_doc_event.xml b/packages/DocumentsUI/res/drawable/ic_doc_event.xml index 25cf0f35c7f9..113f079c8670 100644 --- a/packages/DocumentsUI/res/drawable/ic_doc_event.xml +++ b/packages/DocumentsUI/res/drawable/ic_doc_event.xml @@ -1,5 +1,24 @@ -<?xml version="1.0" encoding="utf-8"?> -<bitmap xmlns:android="http://schemas.android.com/apk/res/android" - android:src="@drawable/ic_doc_event_am_alpha" - android:tint="?android:attr/colorControlNormal" - android:autoMirrored="true" /> +<!-- +Copyright (C) 2015 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. +--> +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="24dp" + android:height="24dp" + android:viewportWidth="24.0" + android:viewportHeight="24.0"> + <path + android:fillColor="#FF737373" + android:pathData="M17 12h-5v5h5v-5zM16 1v2H8V1H6v2H5c-1.11 0,-1.99.9,-1.99 2L3 19c0 1.1.89 2 2 2h14c1.1 0 2,-.9 2,-2V5c0,-1.1,-.9,-2,-2,-2h-1V1h-2zm3 18H5V8h14v11z"/> +</vector> diff --git a/packages/DocumentsUI/res/drawable/ic_doc_excel.xml b/packages/DocumentsUI/res/drawable/ic_doc_excel.xml index 33547250e755..3ed27e1f7f62 100644 --- a/packages/DocumentsUI/res/drawable/ic_doc_excel.xml +++ b/packages/DocumentsUI/res/drawable/ic_doc_excel.xml @@ -1,4 +1,24 @@ -<?xml version="1.0" encoding="utf-8"?> -<bitmap xmlns:android="http://schemas.android.com/apk/res/android" - android:src="@drawable/ic_doc_excel_alpha" - android:tint="?android:attr/colorControlNormal" /> +<!-- +Copyright (C) 2015 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. +--> +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="24dp" + android:height="24dp" + android:viewportWidth="24.0" + android:viewportHeight="24.0"> + <path + android:fillColor="#FF16A765" + android:pathData="M19 3H5c-1.1 0,-2 .9,-2 2v14c0 1.1.9 2 2 2h14c1.1 0 2,-.9 2,-2V5c0,-1.1,-.9,-2,-2,-2zm-2.8 14h-2L12 13.2 9.8 17h-2l3.2,-5,-3.2,-5h2l2.2 3.8L14.2 7h2L13 12l3.2 5z"/> +</vector> diff --git a/packages/DocumentsUI/res/drawable/ic_doc_folder.xml b/packages/DocumentsUI/res/drawable/ic_doc_folder.xml index 73de60e99ade..dcbce010810e 100644 --- a/packages/DocumentsUI/res/drawable/ic_doc_folder.xml +++ b/packages/DocumentsUI/res/drawable/ic_doc_folder.xml @@ -1,4 +1,24 @@ -<?xml version="1.0" encoding="utf-8"?> -<bitmap xmlns:android="http://schemas.android.com/apk/res/android" - android:src="@drawable/ic_doc_folder_alpha" - android:tint="?android:attr/colorControlNormal" /> +<!-- +Copyright (C) 2015 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. +--> +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="24dp" + android:height="24dp" + android:viewportWidth="24.0" + android:viewportHeight="24.0"> + <path + android:fillColor="#FF737373" + android:pathData="M10 4H4c-1.1 0,-1.99.9,-1.99 2L2 18c0 1.1.9 2 2 2h16c1.1 0 2,-.9 2,-2V8c0,-1.1,-.9,-2,-2,-2h-8l-2,-2z"/> +</vector> diff --git a/packages/DocumentsUI/res/drawable/ic_doc_font.xml b/packages/DocumentsUI/res/drawable/ic_doc_font.xml index c74cb9ca07e6..4c13d71e47d0 100644 --- a/packages/DocumentsUI/res/drawable/ic_doc_font.xml +++ b/packages/DocumentsUI/res/drawable/ic_doc_font.xml @@ -1,4 +1,24 @@ -<?xml version="1.0" encoding="utf-8"?> -<bitmap xmlns:android="http://schemas.android.com/apk/res/android" - android:src="@drawable/ic_doc_font_alpha" - android:tint="?android:attr/colorControlNormal" /> +<!-- +Copyright (C) 2015 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. +--> +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="24dp" + android:height="24dp" + android:viewportWidth="24.0" + android:viewportHeight="24.0"> + <path + android:fillColor="#FF737373" + android:pathData="M9.93 13.5h4.14L12 7.98zM20 2H4c-1.1 0,-2 .9,-2 2v16c0 1.1.9 2 2 2h16c1.1 0 2,-.9 2,-2V4c0,-1.1,-.9,-2,-2,-2zm-4.05 16.5l-1.14,-3H9.17l-1.12 3H5.96l5.11,-13h1.86l5.11 13h-2.09z"/> +</vector> diff --git a/packages/DocumentsUI/res/drawable/ic_doc_generic.xml b/packages/DocumentsUI/res/drawable/ic_doc_generic.xml index a4ee29d6db5b..006dfba4a3bb 100644 --- a/packages/DocumentsUI/res/drawable/ic_doc_generic.xml +++ b/packages/DocumentsUI/res/drawable/ic_doc_generic.xml @@ -1,5 +1,24 @@ -<?xml version="1.0" encoding="utf-8"?> -<bitmap xmlns:android="http://schemas.android.com/apk/res/android" - android:src="@drawable/ic_doc_generic_am_alpha" - android:tint="?android:attr/colorControlNormal" - android:autoMirrored="true" /> +<!-- +Copyright (C) 2015 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. +--> +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="24dp" + android:height="24dp" + android:viewportWidth="24.0" + android:viewportHeight="24.0"> + <path + android:fillColor="#FF737373" + android:pathData="M6 2c-1.1 0,-1.99.9,-1.99 2L4 20c0 1.1.89 2 1.99 2H18c1.1 0 2,-.9 2,-2V8l-6,-6H6zm7 7V3.5L18.5 9H13z"/> +</vector> diff --git a/packages/DocumentsUI/res/drawable/ic_doc_image.xml b/packages/DocumentsUI/res/drawable/ic_doc_image.xml index 9d4c3591a2b7..23953f71fd5e 100644 --- a/packages/DocumentsUI/res/drawable/ic_doc_image.xml +++ b/packages/DocumentsUI/res/drawable/ic_doc_image.xml @@ -1,4 +1,24 @@ -<?xml version="1.0" encoding="utf-8"?> -<bitmap xmlns:android="http://schemas.android.com/apk/res/android" - android:src="@drawable/ic_doc_image_alpha" - android:tint="?android:attr/colorControlNormal" /> +<!-- +Copyright (C) 2015 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. +--> +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="24dp" + android:height="24dp" + android:viewportWidth="24.0" + android:viewportHeight="24.0"> + <path + android:fillColor="#FFDB4437" + android:pathData="M21 19V5c0,-1.1,-.9,-2,-2,-2H5c-1.1 0,-2 .9,-2 2v14c0 1.1.9 2 2 2h14c1.1 0 2,-.9 2,-2zM8.5 13.5l2.5 3.01L14.5 12l4.5 6H5l3.5,-4.5z"/> +</vector> diff --git a/packages/DocumentsUI/res/drawable/ic_doc_pdf.xml b/packages/DocumentsUI/res/drawable/ic_doc_pdf.xml index 5c3749892833..b2d01938c480 100644 --- a/packages/DocumentsUI/res/drawable/ic_doc_pdf.xml +++ b/packages/DocumentsUI/res/drawable/ic_doc_pdf.xml @@ -1,4 +1,24 @@ -<?xml version="1.0" encoding="utf-8"?> -<bitmap xmlns:android="http://schemas.android.com/apk/res/android" - android:src="@drawable/ic_doc_pdf_alpha" - android:tint="?android:attr/colorControlNormal" /> +<!-- +Copyright (C) 2015 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. +--> +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="24dp" + android:height="24dp" + android:viewportWidth="24.0" + android:viewportHeight="24.0"> + <path + android:fillColor="#FFDB4437" + android:pathData="M7 11.5h1v-1H7v1zM19 3H5c-1.1 0,-2 .9,-2 2v14c0 1.1.9 2 2 2h14c1.1 0 2,-.9 2,-2V5c0,-1.1,-.9,-2,-2,-2zm-9.5 8.5c0 .83,-.67 1.5,-1.5 1.5H7v2H5.5V9H8c.83 0 1.5.67 1.5 1.5v1zm10,-1H17v1h1.5V13H17v2h-1.5V9h4v1.5zm-5 3c0 .83,-.67 1.5,-1.5 1.5h-2.5V9H13c.83 0 1.5.67 1.5 1.5v3zm-2.5 0h1v-3h-1v3z"/> +</vector> diff --git a/packages/DocumentsUI/res/drawable/ic_doc_powerpoint.xml b/packages/DocumentsUI/res/drawable/ic_doc_powerpoint.xml index f0a6c3935eec..aa5bfc818692 100644 --- a/packages/DocumentsUI/res/drawable/ic_doc_powerpoint.xml +++ b/packages/DocumentsUI/res/drawable/ic_doc_powerpoint.xml @@ -1,4 +1,24 @@ -<?xml version="1.0" encoding="utf-8"?> -<bitmap xmlns:android="http://schemas.android.com/apk/res/android" - android:src="@drawable/ic_doc_powerpoint_alpha" - android:tint="?android:attr/colorControlNormal" /> +<!-- +Copyright (C) 2015 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. +--> +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="24dp" + android:height="24dp" + android:viewportWidth="24.0" + android:viewportHeight="24.0"> + <path + android:fillColor="#FFFF7537" + android:pathData="M19 3H5c-1.1 0,-2 .9,-2 2v14c0 1.1.9 2 2 2h14c1.1 0 2,-.9 2,-2V5c0,-1.1,-.9,-2,-2,-2zM9.8 13.4V17H8V7h4.3c1.53 0 2.15.3 2.8.89.65.59.9 1.37.9 2.34 0 1.02,-.26 1.8,-.9 2.35s-1.3.82,-2.8.82H9.8zm0,-1.4V8.4h2.3c.66 0 1.17.25 1.5.6.33.35.5.72.5 1.25 0 .55,-.18.95,-.5 1.25,-.32.31,-.7.5,-1.38.5H9.8z"/> +</vector> diff --git a/packages/DocumentsUI/res/drawable/ic_doc_presentation.xml b/packages/DocumentsUI/res/drawable/ic_doc_presentation.xml index a14f86601753..7937bc12aa3b 100644 --- a/packages/DocumentsUI/res/drawable/ic_doc_presentation.xml +++ b/packages/DocumentsUI/res/drawable/ic_doc_presentation.xml @@ -1,4 +1,24 @@ -<?xml version="1.0" encoding="utf-8"?> -<bitmap xmlns:android="http://schemas.android.com/apk/res/android" - android:src="@drawable/ic_doc_presentation_alpha" - android:tint="?android:attr/colorControlNormal" /> +<!-- +Copyright (C) 2015 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. +--> +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="24dp" + android:height="24dp" + android:viewportWidth="24.0" + android:viewportHeight="24.0"> + <path + android:fillColor="#FFF4B400" + android:pathData="M19 3H5c-1.1 0,-1.99.9,-1.99 2v14c0 1.1.89 2 1.99 2h14c1.1 0 2,-.9 2,-2V5c0,-1.1,-.9,-2,-2,-2zm0 13H5V8h14v8z"/> +</vector> diff --git a/packages/DocumentsUI/res/drawable/ic_doc_spreadsheet.xml b/packages/DocumentsUI/res/drawable/ic_doc_spreadsheet.xml index 40f25152af6b..1663c0a1ae1b 100644 --- a/packages/DocumentsUI/res/drawable/ic_doc_spreadsheet.xml +++ b/packages/DocumentsUI/res/drawable/ic_doc_spreadsheet.xml @@ -1,5 +1,24 @@ -<?xml version="1.0" encoding="utf-8"?> -<bitmap xmlns:android="http://schemas.android.com/apk/res/android" - android:src="@drawable/ic_doc_spreadsheet_am_alpha" - android:tint="?android:attr/colorControlNormal" - android:autoMirrored="true" /> +<!-- +Copyright (C) 2015 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. +--> +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="24dp" + android:height="24dp" + android:viewportWidth="24.0" + android:viewportHeight="24.0"> + <path + android:fillColor="#FF16A765" + android:pathData="M19 3H5c-1.1 0,-1.99.9,-1.99 2L3 8v11c0 1.1.9 2 2 2h14c1.1 0 2,-.9 2,-2V5c0,-1.1,-.9,-2,-2,-2zm0 8h-8v8H9v-8H5V9h4V5h2v4h8v2z"/> +</vector> diff --git a/packages/DocumentsUI/res/drawable/ic_doc_text.xml b/packages/DocumentsUI/res/drawable/ic_doc_text.xml index ffa9e70b16e9..7fc04e811b1c 100644 --- a/packages/DocumentsUI/res/drawable/ic_doc_text.xml +++ b/packages/DocumentsUI/res/drawable/ic_doc_text.xml @@ -1,5 +1,24 @@ -<?xml version="1.0" encoding="utf-8"?> -<bitmap xmlns:android="http://schemas.android.com/apk/res/android" - android:src="@drawable/ic_doc_text_am_alpha" - android:tint="?android:attr/colorControlNormal" - android:autoMirrored="true" /> +<!-- +Copyright (C) 2015 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. +--> +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="24dp" + android:height="24dp" + android:viewportWidth="24.0" + android:viewportHeight="24.0"> + <path + android:fillColor="#FF737373" + android:pathData="M14 2H6c-1.1 0,-1.99.9,-1.99 2L4 20c0 1.1.89 2 1.99 2H18c1.1 0 2,-.9 2,-2V8l-6,-6zm2 16H8v-2h8v2zm0,-4H8v-2h8v2zm-3,-5V3.5L18.5 9H13z"/> +</vector> diff --git a/packages/DocumentsUI/res/drawable/ic_doc_video.xml b/packages/DocumentsUI/res/drawable/ic_doc_video.xml index 2d048c2ffb93..ad4dae89ccdc 100644 --- a/packages/DocumentsUI/res/drawable/ic_doc_video.xml +++ b/packages/DocumentsUI/res/drawable/ic_doc_video.xml @@ -1,5 +1,24 @@ -<?xml version="1.0" encoding="utf-8"?> -<bitmap xmlns:android="http://schemas.android.com/apk/res/android" - android:src="@drawable/ic_doc_video_am_alpha" - android:tint="?android:attr/colorControlNormal" - android:autoMirrored="true" /> +<!-- +Copyright (C) 2015 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. +--> +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="24dp" + android:height="24dp" + android:viewportWidth="24.0" + android:viewportHeight="24.0"> + <path + android:fillColor="#FFDB4437" + android:pathData="M18 4l2 4h-3l-2,-4h-2l2 4h-3l-2,-4H8l2 4H7L5 4H4c-1.1 0,-1.99.9,-1.99 2L2 18c0 1.1.9 2 2 2h16c1.1 0 2,-.9 2,-2V4h-4z"/> +</vector> diff --git a/packages/DocumentsUI/res/drawable/ic_doc_word.xml b/packages/DocumentsUI/res/drawable/ic_doc_word.xml index afcc533ecf55..7a3a0ec9b5e0 100644 --- a/packages/DocumentsUI/res/drawable/ic_doc_word.xml +++ b/packages/DocumentsUI/res/drawable/ic_doc_word.xml @@ -1,4 +1,24 @@ -<?xml version="1.0" encoding="utf-8"?> -<bitmap xmlns:android="http://schemas.android.com/apk/res/android" - android:src="@drawable/ic_doc_word_alpha" - android:tint="?android:attr/colorControlNormal" /> +<!-- +Copyright (C) 2015 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. +--> +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="24dp" + android:height="24dp" + android:viewportWidth="24.0" + android:viewportHeight="24.0"> + <path + android:fillColor="#FF4883F3" + android:pathData="M19 3H5c-1.1 0,-2 .9,-2 2v14c0 1.1.9 2 2 2h14c1.1 0 2,-.9 2,-2V5c0,-1.1,-.9,-2,-2,-2zm-3.5 14H14l-2,-7.5,-2 7.5H8.5L6.1 7h1.7l1.54 7.51L11.3 7h1.4l1.97 7.51L16.2 7h1.7l-2.4 10z"/> +</vector> diff --git a/packages/DocumentsUI/res/layout/item_doc_grid.xml b/packages/DocumentsUI/res/layout/item_doc_grid.xml index c0fc2c37ef3f..3c796bd6e776 100644 --- a/packages/DocumentsUI/res/layout/item_doc_grid.xml +++ b/packages/DocumentsUI/res/layout/item_doc_grid.xml @@ -40,9 +40,10 @@ <com.android.documentsui.GridItemThumbnail android:id="@+id/icon_mime" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:scaleType="centerInside" + android:layout_width="@dimen/icon_size" + android:layout_height="@dimen/icon_size" + android:layout_gravity="center" + android:scaleType="fitCenter" android:contentDescription="@null" /> </FrameLayout> diff --git a/packages/DocumentsUI/src/com/android/documentsui/IconUtils.java b/packages/DocumentsUI/src/com/android/documentsui/IconUtils.java index a1213d210b50..c28fae85cb8b 100644 --- a/packages/DocumentsUI/src/com/android/documentsui/IconUtils.java +++ b/packages/DocumentsUI/src/com/android/documentsui/IconUtils.java @@ -159,8 +159,8 @@ public class IconUtils { add("application/vnd.sun.xml.calc.template", icon); add("application/x-kspread", icon); - // Text - icon = R.drawable.ic_doc_text; + // Document + icon = R.drawable.ic_doc_document; add("application/vnd.oasis.opendocument.text", icon); add("application/vnd.oasis.opendocument.text-master", icon); add("application/vnd.oasis.opendocument.text-template", icon); diff --git a/packages/DocumentsUI/src/com/android/documentsui/dirlist/GridDocumentHolder.java b/packages/DocumentsUI/src/com/android/documentsui/dirlist/GridDocumentHolder.java index 63c667be0be3..5f34ac3c037a 100644 --- a/packages/DocumentsUI/src/com/android/documentsui/dirlist/GridDocumentHolder.java +++ b/packages/DocumentsUI/src/com/android/documentsui/dirlist/GridDocumentHolder.java @@ -32,6 +32,7 @@ import android.view.ViewGroup; import android.widget.ImageView; import android.widget.TextView; +import com.android.documentsui.IconUtils; import com.android.documentsui.R; import com.android.documentsui.RootCursorWrapper; import com.android.documentsui.Shared; @@ -43,18 +44,21 @@ final class GridDocumentHolder extends DocumentHolder { final TextView mTitle; final TextView mDate; final TextView mSize; - final ImageView mIconMime; + final ImageView mIconMimeLg; + final ImageView mIconMimeSm; final ImageView mIconThumb; final IconHelper mIconHelper; + public GridDocumentHolder(Context context, ViewGroup parent, IconHelper iconHelper) { super(context, parent, R.layout.item_doc_grid); mTitle = (TextView) itemView.findViewById(android.R.id.title); mDate = (TextView) itemView.findViewById(R.id.date); mSize = (TextView) itemView.findViewById(R.id.size); - mIconMime = (ImageView) itemView.findViewById(R.id.icon_mime); + mIconMimeLg = (ImageView) itemView.findViewById(R.id.icon_mime); mIconThumb = (ImageView) itemView.findViewById(R.id.icon_thumb); + mIconMimeSm = (ImageView) itemView.findViewById(android.R.id.icon1); mIconHelper = iconHelper; } @@ -80,13 +84,15 @@ final class GridDocumentHolder extends DocumentHolder { mIconHelper.stopLoading(mIconThumb); - mIconMime.animate().cancel(); - mIconMime.setAlpha(1f); + mIconMimeLg.animate().cancel(); + mIconMimeLg.setAlpha(1f); mIconThumb.animate().cancel(); mIconThumb.setAlpha(0f); + mIconMimeSm.setImageDrawable(IconUtils.loadMimeIcon(mContext, docMimeType)); + final Uri uri = DocumentsContract.buildDocumentUri(docAuthority, docId); - mIconHelper.loadThumbnail(uri, docMimeType, docFlags, docIcon, mIconThumb, mIconMime); + mIconHelper.loadThumbnail(uri, docMimeType, docFlags, docIcon, mIconThumb, mIconMimeLg); if (mHideTitles) { mTitle.setVisibility(View.GONE); diff --git a/packages/Shell/src/com/android/shell/BugreportProgressService.java b/packages/Shell/src/com/android/shell/BugreportProgressService.java index d31088ce308c..f7a2d75a216f 100644 --- a/packages/Shell/src/com/android/shell/BugreportProgressService.java +++ b/packages/Shell/src/com/android/shell/BugreportProgressService.java @@ -449,6 +449,11 @@ public class BugreportProgressService extends Service { .addAction(cancelAction) .build(); + if (info.finished) { + Log.w(TAG, "Not sending progress notification because bugreport has finished already (" + + info + ")"); + return; + } NotificationManager.from(mContext).notify(TAG, info.pid, notification); } @@ -628,7 +633,12 @@ public class BugreportProgressService extends Service { synchronized (BugreportProgressService.this) { mTakingScreenshot = flag; for (int i = 0; i < mProcesses.size(); i++) { - updateProgress(mProcesses.valueAt(i)); + final BugreportInfo info = mProcesses.valueAt(i); + if (info.finished) { + Log.d(TAG, "Not updating progress because share notification was already sent"); + continue; + } + updateProgress(info); } } } diff --git a/packages/Shell/tests/src/com/android/shell/BugreportReceiverTest.java b/packages/Shell/tests/src/com/android/shell/BugreportReceiverTest.java index 6bee767e4706..8e8924ae6bf3 100644 --- a/packages/Shell/tests/src/com/android/shell/BugreportReceiverTest.java +++ b/packages/Shell/tests/src/com/android/shell/BugreportReceiverTest.java @@ -142,6 +142,7 @@ public class BugreportReceiverTest extends InstrumentationTestCase { public void testProgress() throws Exception { resetProperties(); sendBugreportStarted(1000); + waitForScreenshotButtonEnabled(true); assertProgressNotification(NAME, "0.00%"); @@ -157,7 +158,7 @@ public class BugreportReceiverTest extends InstrumentationTestCase { Bundle extras = sendBugreportFinishedAndGetSharedIntent(PID, mPlainTextPath, mScreenshotPath); assertActionSendMultiple(extras, BUGREPORT_FILE, BUGREPORT_CONTENT, PID, NAME, ZIP_FILE, - null, 1); + null, 1, true); assertServiceNotRunning(); } @@ -174,7 +175,7 @@ public class BugreportReceiverTest extends InstrumentationTestCase { Bundle extras = sendBugreportFinishedAndGetSharedIntent(PID, mPlainTextPath, mScreenshotPath); assertActionSendMultiple(extras, BUGREPORT_FILE, BUGREPORT_CONTENT, PID, NAME, ZIP_FILE, - null, 2); + null, 2, true); assertServiceNotRunning(); } @@ -182,6 +183,7 @@ public class BugreportReceiverTest extends InstrumentationTestCase { public void testProgress_changeDetails() throws Exception { resetProperties(); sendBugreportStarted(1000); + waitForScreenshotButtonEnabled(true); DetailsUi detailsUi = new DetailsUi(mUiBot); @@ -218,14 +220,33 @@ public class BugreportReceiverTest extends InstrumentationTestCase { Bundle extras = sendBugreportFinishedAndGetSharedIntent(PID, mPlainTextPath, mScreenshotPath); assertActionSendMultiple(extras, BUGREPORT_FILE, BUGREPORT_CONTENT, PID, NEW_NAME, TITLE, - mDescription, 1); + mDescription, 1, true); assertServiceNotRunning(); } + /** + * Tests the scenario where the initial screenshot and dumpstate are finished while the user + * is changing the info in the details screen. + */ + public void testProgress_bugreportAndScreenshotFinishedWhileChangingDetails() throws Exception { + bugreportFinishedWhileChangingDetailsTest(false); + } + + /** + * Tests the scenario where dumpstate is finished while the user is changing the info in the + * details screen, but the initial screenshot finishes afterwards. + */ public void testProgress_bugreportFinishedWhileChangingDetails() throws Exception { + bugreportFinishedWhileChangingDetailsTest(true); + } + + private void bugreportFinishedWhileChangingDetailsTest(boolean waitScreenshot) throws Exception { resetProperties(); sendBugreportStarted(1000); + if (waitScreenshot) { + waitForScreenshotButtonEnabled(true); + } DetailsUi detailsUi = new DetailsUi(mUiBot); @@ -233,7 +254,7 @@ public class BugreportReceiverTest extends InstrumentationTestCase { detailsUi.nameField.setText(NEW_NAME); sendBugreportFinished(PID, mPlainTextPath, mScreenshotPath); - // Wait until the share notifcation is received... + // Wait until the share notification is received... mUiBot.getNotification(mContext.getString(R.string.bugreport_finished_title)); // ...then close notification bar. mContext.sendBroadcast(new Intent(Intent.ACTION_CLOSE_SYSTEM_DIALOGS)); @@ -250,7 +271,7 @@ public class BugreportReceiverTest extends InstrumentationTestCase { // Finally, share bugreport. Bundle extras = acceptBugreportAndGetSharedIntent(); assertActionSendMultiple(extras, BUGREPORT_FILE, BUGREPORT_CONTENT, PID, NAME, TITLE, - mDescription, 1); + mDescription, 1, waitScreenshot); assertServiceNotRunning(); } @@ -406,7 +427,7 @@ public class BugreportReceiverTest extends InstrumentationTestCase { private void assertActionSendMultiple(Bundle extras, String bugreportContent, String screenshotContent) throws IOException { assertActionSendMultiple(extras, bugreportContent, screenshotContent, PID, null, ZIP_FILE, - null, 0); + null, 0, false); } /** @@ -420,10 +441,11 @@ public class BugreportReceiverTest extends InstrumentationTestCase { * @param title bugreport name as provided by the user (or received by dumpstate) * @param description bugreport description as provided by the user * @param numberScreenshots expected number of screenshots taken by Shell. + * @param renamedScreenshots whether the screenshots are expected to be renamed */ private void assertActionSendMultiple(Bundle extras, String bugreportContent, String screenshotContent, int pid, String name, String title, String description, - int numberScreenshots) throws IOException { + int numberScreenshots, boolean renamedScreenshots) throws IOException { String body = extras.getString(Intent.EXTRA_TEXT); assertContainsRegex("missing build info", SystemProperties.get("ro.build.description"), body); @@ -480,7 +502,7 @@ public class BugreportReceiverTest extends InstrumentationTestCase { // Check internal screenshots. SortedSet<String> expectedNames = new TreeSet<>(); for (int i = 1 ; i <= numberScreenshots; i++) { - String prefix = name != null ? name : Integer.toString(pid); + String prefix = renamedScreenshots ? name : Integer.toString(pid); String expectedName = "screenshot-" + prefix + "-" + i + ".png"; expectedNames.add(expectedName); } @@ -592,7 +614,7 @@ public class BugreportReceiverTest extends InstrumentationTestCase { private UiObject waitForScreenshotButtonEnabled(boolean expectedEnabled) throws Exception { UiObject screenshotButton = getScreenshotButton(); - int maxAttempts = SCREENSHOT_DELAY_SECONDS + 2; + int maxAttempts = SCREENSHOT_DELAY_SECONDS + 5; int i = 0; do { boolean enabled = screenshotButton.isEnabled(); diff --git a/services/core/java/com/android/server/am/ActivityStackSupervisor.java b/services/core/java/com/android/server/am/ActivityStackSupervisor.java index 80a75ce74312..4672023a220e 100644 --- a/services/core/java/com/android/server/am/ActivityStackSupervisor.java +++ b/services/core/java/com/android/server/am/ActivityStackSupervisor.java @@ -1958,10 +1958,10 @@ public final class ActivityStackSupervisor implements DisplayListener { || tempOtherTaskInsetBounds != null); } - void resizeTaskLocked(TaskRecord task, Rect bounds, int resizeMode, boolean preserveWindow) { + boolean resizeTaskLocked(TaskRecord task, Rect bounds, int resizeMode, boolean preserveWindow) { if (!task.mResizeable) { Slog.w(TAG, "resizeTask: task " + task + " not resizeable."); - return; + return true; } adjustForMinimalTaskDimensions(task, bounds); @@ -1971,7 +1971,7 @@ public final class ActivityStackSupervisor implements DisplayListener { final boolean forced = (resizeMode & RESIZE_MODE_FORCED) != 0; if (task.mBounds != null && task.mBounds.equals(bounds) && !forced) { // Nothing to do here... - return; + return true; } if (!mWindowManager.isValidTaskId(task.taskId)) { @@ -1983,7 +1983,7 @@ public final class ActivityStackSupervisor implements DisplayListener { // re-restore the task so it can have the proper stack association. restoreRecentTaskLocked(task, FREEFORM_WORKSPACE_STACK_ID); } - return; + return true; } // Do not move the task to another stack here. @@ -2012,6 +2012,7 @@ public final class ActivityStackSupervisor implements DisplayListener { mWindowManager.resizeTask(task.taskId, bounds, task.mOverrideConfig, kept, forced); Trace.traceEnd(TRACE_TAG_ACTIVITY_MANAGER); + return kept; } private void adjustForMinimalTaskDimensions(TaskRecord task, Rect bounds) { @@ -2169,13 +2170,17 @@ public final class ActivityStackSupervisor implements DisplayListener { } final ActivityRecord topActivity = task.getTopActivity(); - if (StackId.preserveWindowOnTaskMove(stackId) && topActivity != null) { + final boolean mightReplaceWindow = + StackId.preserveWindowOnTaskMove(stackId) && topActivity != null; + if (mightReplaceWindow) { // We are about to relaunch the activity because its configuration changed due to // being maximized, i.e. size change. The activity will first remove the old window // and then add a new one. This call will tell window manager about this, so it can // preserve the old window until the new one is drawn. This prevents having a gap // between the removal and addition, in which no window is visible. We also want the // entrance of the new window to be properly animated. + // Note here we always set the replacing window first, as the flags might be needed + // during the relaunch. If we end up not doing any relaunch, we clear the flags later. mWindowManager.setReplacingWindow(topActivity.appToken, animate); } final ActivityStack stack = moveTaskToStackUncheckedLocked( @@ -2185,15 +2190,23 @@ public final class ActivityStackSupervisor implements DisplayListener { stack.mNoAnimActivities.add(topActivity); } + boolean kept = true; // Make sure the task has the appropriate bounds/size for the stack it is in. if (stackId == FULLSCREEN_WORKSPACE_STACK_ID && task.mBounds != null) { - resizeTaskLocked(task, stack.mBounds, RESIZE_MODE_SYSTEM, !PRESERVE_WINDOWS); + kept = resizeTaskLocked(task, stack.mBounds, RESIZE_MODE_SYSTEM, !PRESERVE_WINDOWS); } else if (stackId == FREEFORM_WORKSPACE_STACK_ID && task.mBounds == null && task.mLastNonFullscreenBounds != null) { - resizeTaskLocked(task, task.mLastNonFullscreenBounds, + kept = resizeTaskLocked(task, task.mLastNonFullscreenBounds, RESIZE_MODE_SYSTEM, !PRESERVE_WINDOWS); } else if (stackId == DOCKED_STACK_ID || stackId == PINNED_STACK_ID) { - resizeTaskLocked(task, stack.mBounds, RESIZE_MODE_SYSTEM, !PRESERVE_WINDOWS); + kept = resizeTaskLocked(task, stack.mBounds, RESIZE_MODE_SYSTEM, !PRESERVE_WINDOWS); + } + + if (mightReplaceWindow) { + // If we didn't actual do a relaunch (indicated by kept==true meaning we kept the old + // window), we need to clear the replace window settings. Otherwise, we schedule a + // timeout to remove the old window if the replacing window is not coming in time. + mWindowManager.scheduleClearReplacingWindowIfNeeded(topActivity.appToken, !kept); } // The task might have already been running and its visibility needs to be synchronized with diff --git a/services/core/java/com/android/server/pm/UserManagerService.java b/services/core/java/com/android/server/pm/UserManagerService.java index 13f48263b69e..3d614a35c13b 100644 --- a/services/core/java/com/android/server/pm/UserManagerService.java +++ b/services/core/java/com/android/server/pm/UserManagerService.java @@ -69,6 +69,7 @@ import android.util.Xml; import com.android.internal.annotations.GuardedBy; import com.android.internal.annotations.VisibleForTesting; import com.android.internal.app.IAppOpsService; +import com.android.internal.logging.MetricsLogger; import com.android.internal.util.FastXmlSerializer; import com.android.internal.util.Preconditions; import com.android.internal.util.XmlUtils; @@ -166,6 +167,10 @@ public class UserManagerService extends IUserManager.Stub { private static final String XATTR_SERIAL = "user.serial"; + // Tron counters + private static final String TRON_GUEST_CREATED = "users_guest_created"; + private static final String TRON_USER_CREATED = "users_user_created"; + private final Context mContext; private final PackageManagerService mPm; private final Object mPackagesLock; @@ -1830,6 +1835,7 @@ public class UserManagerService extends IUserManager.Stub { addedIntent.putExtra(Intent.EXTRA_USER_HANDLE, userId); mContext.sendBroadcastAsUser(addedIntent, UserHandle.ALL, android.Manifest.permission.MANAGE_USERS); + MetricsLogger.count(mContext, isGuest ? TRON_GUEST_CREATED : TRON_USER_CREATED, 1); } finally { Binder.restoreCallingIdentity(ident); } diff --git a/services/core/java/com/android/server/wm/AppWindowToken.java b/services/core/java/com/android/server/wm/AppWindowToken.java index 573aaec034cf..751f8715a1e1 100644 --- a/services/core/java/com/android/server/wm/AppWindowToken.java +++ b/services/core/java/com/android/server/wm/AppWindowToken.java @@ -25,6 +25,7 @@ import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_VISIBILITY; import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_WINDOW_MOVEMENT; import static com.android.server.wm.WindowManagerDebugConfig.TAG_WITH_CLASS_NAME; import static com.android.server.wm.WindowManagerDebugConfig.TAG_WM; +import static com.android.server.wm.WindowManagerService.WINDOW_REPLACEMENT_TIMEOUT_DURATION; import com.android.server.input.InputApplicationHandle; import com.android.server.wm.WindowManagerService.H; @@ -403,12 +404,28 @@ class AppWindowToken extends WindowToken { } } + void resetReplacingWindows() { + if (DEBUG_ADD_REMOVE) Slog.d(TAG_WM, "Resetting app token " + appWindowToken + + " of replacing window marks."); + + for (int i = allAppWindows.size() - 1; i >= 0; i--) { + final WindowState w = allAppWindows.get(i); + w.resetReplacing(); + } + } + void addWindow(WindowState w) { for (int i = allAppWindows.size() - 1; i >= 0; i--) { WindowState candidate = allAppWindows.get(i); if (candidate.mWillReplaceWindow && candidate.mReplacingWindow == null && candidate.getWindowTag().equals(w.getWindowTag().toString())) { candidate.mReplacingWindow = w; + + // if we got a replacement window, reset the timeout to give drawing more time + service.mH.removeMessages(H.WINDOW_REPLACEMENT_TIMEOUT); + service.mH.sendMessageDelayed( + service.mH.obtainMessage(H.WINDOW_REPLACEMENT_TIMEOUT, this), + WINDOW_REPLACEMENT_TIMEOUT_DURATION); } } allAppWindows.add(w); @@ -424,7 +441,7 @@ class AppWindowToken extends WindowToken { return false; } - void clearTimedoutReplaceesLocked() { + void clearTimedoutReplacesLocked() { for (int i = allAppWindows.size() - 1; i >= 0; // removeWindowLocked at bottom of loop may remove multiple entries from // allAppWindows if the window to be removed has child windows. It also may @@ -437,7 +454,11 @@ class AppWindowToken extends WindowToken { continue; } candidate.mWillReplaceWindow = false; - service.removeWindowLocked(candidate); + // Since the window already timed out, remove it immediately now. + // Use removeWindowInnerLocked() instead of removeWindowLocked(), as the latter + // delays removal on certain conditions, which will leave the stale window in the + // stack and marked mWillReplaceWindow=false, so the window will never be removed. + service.removeWindowInnerLocked(candidate); } } diff --git a/services/core/java/com/android/server/wm/WindowManagerDebugConfig.java b/services/core/java/com/android/server/wm/WindowManagerDebugConfig.java index 845100d14eec..4c3a422731b3 100644 --- a/services/core/java/com/android/server/wm/WindowManagerDebugConfig.java +++ b/services/core/java/com/android/server/wm/WindowManagerDebugConfig.java @@ -35,7 +35,7 @@ public class WindowManagerDebugConfig { static final boolean DEBUG_RESIZE = false; static final boolean DEBUG = false; - static final boolean DEBUG_ADD_REMOVE = false; + static final boolean DEBUG_ADD_REMOVE = true; static final boolean DEBUG_FOCUS = true; static final boolean DEBUG_FOCUS_LIGHT = DEBUG_FOCUS || false; static final boolean DEBUG_ANIM = false; @@ -50,8 +50,8 @@ public class WindowManagerDebugConfig { static final boolean DEBUG_ORIENTATION = false; static final boolean DEBUG_APP_ORIENTATION = false; static final boolean DEBUG_CONFIGURATION = false; - static final boolean DEBUG_APP_TRANSITIONS = false; - static final boolean DEBUG_STARTING_WINDOW = false; + static final boolean DEBUG_APP_TRANSITIONS = true; + static final boolean DEBUG_STARTING_WINDOW = true; static final boolean DEBUG_WALLPAPER = false; static final boolean DEBUG_WALLPAPER_LIGHT = false || DEBUG_WALLPAPER; static final boolean DEBUG_DRAG = false; diff --git a/services/core/java/com/android/server/wm/WindowManagerService.java b/services/core/java/com/android/server/wm/WindowManagerService.java index d722ec7a4803..213f14b8c679 100644 --- a/services/core/java/com/android/server/wm/WindowManagerService.java +++ b/services/core/java/com/android/server/wm/WindowManagerService.java @@ -8106,7 +8106,7 @@ public class WindowManagerService extends IWindowManager.Stub case WINDOW_REPLACEMENT_TIMEOUT: { final AppWindowToken token = (AppWindowToken) msg.obj; synchronized (mWindowMap) { - token.clearTimedoutReplaceesLocked(); + token.clearTimedoutReplacesLocked(); } } break; @@ -10192,11 +10192,34 @@ public class WindowManagerService extends IWindowManager.Stub } appWindowToken.setReplacingWindows(animate); } + } - if (appWindowToken != null) { - mH.removeMessages(H.WINDOW_REPLACEMENT_TIMEOUT); - mH.sendMessageDelayed(mH.obtainMessage(H.WINDOW_REPLACEMENT_TIMEOUT, appWindowToken), - WINDOW_REPLACEMENT_TIMEOUT_DURATION); + /** + * If we're replacing the window, schedule a timer to clear the replaced window + * after a timeout, in case the replacing window is not coming. + * + * If we're not replacing the window, clear the replace window settings of the app. + * + * @param token Application token for the activity whose window might be replaced. + * @param replacing Whether the window is being replaced or not. + */ + public void scheduleClearReplacingWindowIfNeeded(IBinder token, boolean replacing) { + AppWindowToken appWindowToken = null; + synchronized (mWindowMap) { + appWindowToken = findAppWindowToken(token); + if (appWindowToken == null) { + Slog.w(TAG_WM, "Attempted to reset replacing window on non-existing app token " + + token); + return; + } + if (replacing) { + mH.removeMessages(H.WINDOW_REPLACEMENT_TIMEOUT); + mH.sendMessageDelayed( + mH.obtainMessage(H.WINDOW_REPLACEMENT_TIMEOUT, appWindowToken), + WINDOW_REPLACEMENT_TIMEOUT_DURATION); + } else { + appWindowToken.resetReplacingWindows(); + } } } diff --git a/services/core/java/com/android/server/wm/WindowState.java b/services/core/java/com/android/server/wm/WindowState.java index 6e4e01f38212..b7fd60f1c201 100644 --- a/services/core/java/com/android/server/wm/WindowState.java +++ b/services/core/java/com/android/server/wm/WindowState.java @@ -2363,4 +2363,10 @@ final class WindowState implements WindowManagerPolicy.WindowState { mReplacingWindow = null; mAnimateReplacingWindow = animate; } + + void resetReplacing() { + mWillReplaceWindow = false; + mReplacingWindow = null; + mAnimateReplacingWindow = false; + } } |
