Merge pull request #1473 from owncloud/target_marshmallow_rebased

Move to compile target Marshmallow (Android 6 - v23) - rebased without FAB

.travis.yml

@@ -2,8 +2,10 @@ sudo: false
 language: android
 android:
   components:
-    - build-tools-22.0.1
+    - build-tools-23.0.2
+    - android-23
     - android-22
+    - android-19
 before_install:
   - rm pom.xml
 script:

AndroidManifest.xml

@@ -24,14 +24,29 @@
 
     <uses-sdk
         android:minSdkVersion="14"
-        android:targetSdkVersion="22" />
-
+        android:targetSdkVersion="23" />
+
+    <!-- GET_ACCOUNTS is needed for API < 23.
+        For API >= 23 results in the addition of CONTACTS group to the list of permissions that may be
+        dynamically disabled or enabled by the user after installation; but it is not important,
+        since GET_ACCOUNTS is an special case, the permission is not really needed to access accounts
+        owned by the app, our use case.
+        See note in http://developer.android.com/intl/es/reference/android/Manifest.permission.html#GET_ACCOUNTS -->
     <uses-permission android:name="android.permission.GET_ACCOUNTS" />
+
+    <!-- USE_CREDENTIALS, MANAGE_ACCOUNTS and AUTHENTICATE_ACCOUNTS are needed for API < 23.
+        In API >= 23 the do not exist anymore -->
     <uses-permission android:name="android.permission.USE_CREDENTIALS" />
     <uses-permission android:name="android.permission.MANAGE_ACCOUNTS" />
     <uses-permission android:name="android.permission.AUTHENTICATE_ACCOUNTS" />
+
+    <!-- WRITE_EXTERNAL_STORAGE may be enabled or disabled by the user after installation in
+        API >= 23; the app needs to handle this -->
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+
+    <!-- Next permissions are always approved in installation time,
+        the apps needs to do nothing special in runtime -->
     <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.WRITE_SETTINGS" />
     <uses-permission android:name="android.permission.READ_SYNC_STATS" />
     <uses-permission android:name="android.permission.READ_SYNC_SETTINGS" />
     <uses-permission android:name="android.permission.WRITE_SYNC_SETTINGS" />
@@ -39,7 +54,6 @@
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
     <uses-permission android:name="android.permission.WAKE_LOCK" />
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
 
     <application
         android:name=".MainApp"

SETUP.md

@@ -19,7 +19,7 @@ Open a terminal and type 'android' to start the Android SDK Manager. To build th
 * Android SDK Tools and Android SDK Platform-tools (already installed); upgrade to their last versions is usually a good idea.
 * Android SDK Build-Tools; any version from 20 or later should work fine; avoid preview versions, if any available.
 * Android 4.4.2 (API 19), SDK Platform; needed for build/test ownCloud app.
-* Android 5.1.1 (API 22), SDK Platform; needed to build the Android Support Library (not neeeded if working with Android Studio or gradle) and build the owncloud app.
+* Android 6.0 (API 23), SDK Platform; needed to build the Android Support Library (not neeeded if working with Android Studio or gradle) and build the owncloud app.
 
 Install any other package you consider interesting, such as emulators.
 
@@ -61,7 +61,7 @@ To set up the project in Android Studio follow the next steps:
 
 ### 3. Working in a terminal with Gradle:
 
-[Gradle][7] is the build system used by Android Studio to manage the building operations on Android apps. You do not need to install Gradle in your system, and Google recommends not to do it, but instead trusting on the Graddle wrapper included in the project [8].
+[Gradle][7] is the build system used by Android Studio to manage the building operations on Android apps. You do not need to install Gradle in your system, and Google recommends not to do it, but instead trusting on the [Graddle wrapper][8] included in the project.
 
 * Open a terminal and go to the 'android' directory that contains the repository.
 * Complete the setup of project properties running:
@@ -82,31 +82,38 @@ The generated APK file is saved in android/build/outputs/apk as android-debug.ap
 
 * Open a terminal and go to the 'android' directory that contains the repository.
 * Resolve necessary dependencies running:
-    - Windows: ```setup_env.bat ant```
-    - Mac OS/Linux: ```./setup_env.sh ant```
+  - Windows: ```setup_env.bat ant```
+  - Mac OS/Linux: ```./setup_env.sh ant```
 * Open Eclipse and follow the menu path 'File'/'New'/'Project'
 * Choose the option 'Android'/'Android Project from Existing Code' and click 'Next'
 * Choose 'android/' folder as root
 * Choose the projects with the next names under the 'New Project Name' column:
-** owncloud-android 
-** android-support-appcompat-v7-exploded-aar
-** owncloud-android-workaround-accounts	(optional)
-** ownCloud Android Library
-** ownCloud Sample Client (optional)
-** ownCloud Android library test project (optional)
-** ownCloud Android library test cases (optional)
+  - owncloud-android 
+  - android-support-appcompat-v7-exploded-aar
+  - android-support-design-exploded-aar
+  - owncloud-android-workaround-accounts (optional)
+  - ownCloud Android Library
+  - ownCloud Sample Client (optional)
+  - ownCloud Android library test project (optional)
+  - ownCloud Android library test cases (optional)
 * Do not choose the project owncloud-android-tests; it's obsolete.
 * Do not enable 'Copy projects into workspace'.
 * Click the 'Finish' button.	
 * Wait for a while; if 'Build automatically' is enabled in Eclipse, some errors could appear during the creation of the projects, but all of them should finally disappear.
 * If any error persists, clean and build manually the next projects in order:
-** ownCloud Android Library
-** android-support-appcompat-v7-exploded-aar
-** owncloud-android
+  - ownCloud Android Library
+  - android-support-appcompat-v7-exploded-aar
+  - android-support-design-exploded-aar
+  - owncloud-android
 * If any error on those projects persists, check the project properties. In the 'Android' section, API Level should be
-** ownCloud Android Library	-> API level 19
-** android-support-appcompat-v7-exploded-aa -> API level 22
-** owncloud-android	-> API level 22 ; in this project, two library projects should appear referred in the bottom of the dialog: libs\android-support-appcompat-v7-exploded-aar and owncloud-android-library. Add them if needed.
+  - ownCloud Android Library	-> API level 19
+  - android-support-appcompat-v7-exploded-aa -> API level 23
+  - android-support-design-exploded-aa -> API level 23
+  - owncloud-android	-> API level 23 ; in this project, three library projects should appear referred in the bottom of the dialog: 
+    - libs\android-support-appcompat-v7-exploded-aar, 
+    - libs\android-support-design-exploded-aar, 
+    - owncloud-android-library. 
+    - Add them if needed.
 * After those actions you should be good to go. HAVE FUN!
 
 
@@ -133,13 +140,13 @@ NOTE: You must have mvn (version >= 3.1.1) in your environment path. Current And
 Download/install Android plugin for Maven, then build ownCloud with mvn:
 
 * Resolve necessary dependencies running:
-    - Windows: "setup_env.bat maven"
-    - Mac OS/Linux: "./setup_env.sh maven"
-	
+  - Windows: "setup_env.bat maven"
+  - Mac OS/Linux: "./setup_env.sh maven"
 * cd ..
 * git clone https://github.com/mosabua/maven-android-sdk-deployer.git
 * cd maven-android-sdk-deployer
 * mvn -pl com.simpligility.android.sdk-deployer:android-22 -am install
+* mvn -pl com.simpligility.android.sdk-deployer:android-23 -am install
 * cd ../android/owncloud-android-library
 * mvn install
 * cd ..

build.gradle

@@ -3,7 +3,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.2.3'
+        classpath 'com.android.tools.build:gradle:1.5.0'
     }
 }
 
@@ -21,14 +21,16 @@ repositories {
 dependencies {
     compile name: 'touch-image-view'
     compile project(':owncloud-android-library')
-    compile 'com.android.support:support-v4:22.2.1'
+    compile 'com.android.support:support-v4:23.1.1'
+    compile 'com.android.support:design:23.1.1'
     compile 'com.jakewharton:disklrucache:2.0.2'
-    compile 'com.android.support:appcompat-v7:22.2.1'
+    compile 'com.android.support:appcompat-v7:23.1.1'
 }
 
 android {
-    compileSdkVersion 22
-    buildToolsVersion "22.0.1"
+    compileSdkVersion 23
+    buildToolsVersion "23.0.2"
+
     sourceSets {
         main {
             manifest.srcFile 'AndroidManifest.xml'
@@ -62,9 +64,6 @@ android {
         abortOnError false
     }
 
-    productFlavors {
-    }
-
     packagingOptions {
         exclude 'META-INF/LICENSE.txt'
     }

libs/android-support-appcompat-v7-exploded-aar/.classpath

@@ -3,7 +3,6 @@
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="src" path="gen"/>
 	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
-	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
-	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
+	<classpathentry kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
 	<classpathentry kind="output" path="bin/classes"/>
 </classpath>

libs/android-support-appcompat-v7-exploded-aar/project.properties

@@ -11,5 +11,5 @@
 #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
 
 # Project target.
-target=android-22
+target=android-23
 android.library=true

libs/android-support-appcompat-v7-exploded-aar/res/anim/abc_fade_in.xml

@@ -17,4 +17,4 @@
 <alpha xmlns:android="http://schemas.android.com/apk/res/android"
        android:interpolator="@android:anim/decelerate_interpolator"
        android:fromAlpha="0.0" android:toAlpha="1.0"
-       android:duration="@android:integer/config_mediumAnimTime" />
+       android:duration="@android:integer/config_mediumAnimTime" /><!-- From: file:/usr/local/google/buildbot/src/googleplex-android/mnc-supportlib-release/frameworks/support/v7/appcompat/res/anim/abc_fade_in.xml -->

libs/android-support-appcompat-v7-exploded-aar/res/anim/abc_fade_out.xml

@@ -17,4 +17,4 @@
 <alpha xmlns:android="http://schemas.android.com/apk/res/android"
        android:interpolator="@android:anim/decelerate_interpolator"
        android:fromAlpha="1.0" android:toAlpha="0.0"
-       android:duration="@android:integer/config_mediumAnimTime" />
+       android:duration="@android:integer/config_mediumAnimTime" /><!-- From: file:/usr/local/google/buildbot/src/googleplex-android/mnc-supportlib-release/frameworks/support/v7/appcompat/res/anim/abc_fade_out.xml -->

libs/android-support-appcompat-v7-exploded-aar/res/anim/abc_grow_fade_in_from_bottom.xml

@@ -27,4 +27,4 @@
     <alpha 	android:interpolator="@android:anim/decelerate_interpolator"
               android:fromAlpha="0.0" android:toAlpha="1.0"
               android:duration="@integer/abc_config_activityShortDur" />
-</set>
+</set><!-- From: file:/usr/local/google/buildbot/src/googleplex-android/mnc-supportlib-release/frameworks/support/v7/appcompat/res/anim/abc_grow_fade_in_from_bottom.xml -->

libs/android-support-appcompat-v7-exploded-aar/res/anim/abc_popup_enter.xml

@@ -18,4 +18,4 @@
     <alpha android:fromAlpha="0.0" android:toAlpha="1.0"
            android:interpolator="@android:anim/decelerate_interpolator"
            android:duration="@integer/abc_config_activityShortDur" />
-</set>
+</set><!-- From: file:/usr/local/google/buildbot/src/googleplex-android/mnc-supportlib-release/frameworks/support/v7/appcompat/res/anim/abc_popup_enter.xml -->

libs/android-support-appcompat-v7-exploded-aar/res/anim/abc_popup_exit.xml

@@ -18,4 +18,4 @@
     <alpha android:fromAlpha="1.0" android:toAlpha="0.0"
            android:interpolator="@android:anim/decelerate_interpolator"
            android:duration="@integer/abc_config_activityShortDur" />
-</set>
+</set><!-- From: file:/usr/local/google/buildbot/src/googleplex-android/mnc-supportlib-release/frameworks/support/v7/appcompat/res/anim/abc_popup_exit.xml -->

libs/android-support-appcompat-v7-exploded-aar/res/anim/abc_shrink_fade_out_from_bottom.xml

@@ -24,4 +24,4 @@
     <alpha 	android:interpolator="@android:anim/decelerate_interpolator"
               android:fromAlpha="1.0" android:toAlpha="0.0"
               android:duration="@integer/abc_config_activityShortDur" />
-</set>
+</set><!-- From: file:/usr/local/google/buildbot/src/googleplex-android/mnc-supportlib-release/frameworks/support/v7/appcompat/res/anim/abc_shrink_fade_out_from_bottom.xml -->

libs/android-support-appcompat-v7-exploded-aar/res/anim/abc_slide_in_bottom.xml

@@ -17,3 +17,4 @@
            android:interpolator="@android:anim/decelerate_interpolator"
            android:fromYDelta="50%p" android:toYDelta="0"
            android:duration="@android:integer/config_mediumAnimTime"/>
+<!-- From: file:/usr/local/google/buildbot/src/googleplex-android/mnc-supportlib-release/frameworks/support/v7/appcompat/res/anim/abc_slide_in_bottom.xml -->

libs/android-support-appcompat-v7-exploded-aar/res/anim/abc_slide_in_top.xml

@@ -16,4 +16,4 @@
 <translate xmlns:android="http://schemas.android.com/apk/res/android"
            android:interpolator="@android:anim/decelerate_interpolator"
            android:fromYDelta="-50%p" android:toYDelta="0"
-           android:duration="@android:integer/config_mediumAnimTime"/>
+           android:duration="@android:integer/config_mediumAnimTime"/><!-- From: file:/usr/local/google/buildbot/src/googleplex-android/mnc-supportlib-release/frameworks/support/v7/appcompat/res/anim/abc_slide_in_top.xml -->

libs/android-support-appcompat-v7-exploded-aar/res/anim/abc_slide_out_bottom.xml

@@ -16,4 +16,4 @@
 <translate xmlns:android="http://schemas.android.com/apk/res/android"
            android:interpolator="@android:anim/accelerate_interpolator"
            android:fromYDelta="0" android:toYDelta="50%p"
-           android:duration="@android:integer/config_mediumAnimTime"/>
+           android:duration="@android:integer/config_mediumAnimTime"/><!-- From: file:/usr/local/google/buildbot/src/googleplex-android/mnc-supportlib-release/frameworks/support/v7/appcompat/res/anim/abc_slide_out_bottom.xml -->

libs/android-support-appcompat-v7-exploded-aar/res/anim/abc_slide_out_top.xml

@@ -16,4 +16,4 @@
 <translate xmlns:android="http://schemas.android.com/apk/res/android"
            android:interpolator="@android:anim/accelerate_interpolator"
            android:fromYDelta="0" android:toYDelta="-50%p"
-           android:duration="@android:integer/config_mediumAnimTime"/>
+           android:duration="@android:integer/config_mediumAnimTime"/><!-- From: file:/usr/local/google/buildbot/src/googleplex-android/mnc-supportlib-release/frameworks/support/v7/appcompat/res/anim/abc_slide_out_top.xml -->

libs/android-support-appcompat-v7-exploded-aar/res/color-v11/abc_background_cache_hint_selector_material_dark.xml

@@ -18,3 +18,4 @@
     <item android:state_accelerated="false" android:color="@color/background_material_dark" />
     <item android:color="@android:color/transparent" />
 </selector>
+<!-- From: file:/usr/local/google/buildbot/src/googleplex-android/mnc-supportlib-release/frameworks/support/v7/appcompat/res/color-v11/abc_background_cache_hint_selector_material_dark.xml -->

libs/android-support-appcompat-v7-exploded-aar/res/color-v11/abc_background_cache_hint_selector_material_light.xml

@@ -18,3 +18,4 @@
     <item android:state_accelerated="false" android:color="@color/background_material_light" />
     <item android:color="@android:color/transparent" />
 </selector>
+<!-- From: file:/usr/local/google/buildbot/src/googleplex-android/mnc-supportlib-release/frameworks/support/v7/appcompat/res/color-v11/abc_background_cache_hint_selector_material_light.xml -->

libs/android-support-appcompat-v7-exploded-aar/res/values-port/bools.xml → libs/android-support-appcompat-v7-exploded-aar/res/color-v23/abc_color_highlight_material.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2014 The Android Open Source Project
+<!-- 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.
@@ -14,8 +14,10 @@
      limitations under the License.
 -->
 
-<resources>
-
-    <bool name="abc_action_bar_embed_tabs">false</bool>
-
-</resources>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_checked="true"
+          android:state_enabled="true"
+          android:alpha="@dimen/highlight_alpha_material_colored"
+          android:color="?android:attr/colorControlActivated" />
+    <item android:color="?android:attr/colorControlHighlight" />
+</selector><!-- From: file:/usr/local/google/buildbot/src/googleplex-android/mnc-supportlib-release/frameworks/support/v7/appcompat/res/color-v23/abc_color_highlight_material.xml -->

libs/android-support-appcompat-v7-exploded-aar/res/color/abc_background_cache_hint_selector_material_dark.xml

@@ -17,3 +17,4 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:color="@color/background_material_dark" />
 </selector>
+<!-- From: file:/usr/local/google/buildbot/src/googleplex-android/mnc-supportlib-release/frameworks/support/v7/appcompat/res/color/abc_background_cache_hint_selector_material_dark.xml -->

libs/android-support-appcompat-v7-exploded-aar/res/color/abc_background_cache_hint_selector_material_light.xml

@@ -17,3 +17,4 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:color="@color/background_material_light" />
 </selector>
+<!-- From: file:/usr/local/google/buildbot/src/googleplex-android/mnc-supportlib-release/frameworks/support/v7/appcompat/res/color/abc_background_cache_hint_selector_material_light.xml -->

libs/android-support-appcompat-v7-exploded-aar/res/color/abc_primary_text_disable_only_material_dark.xml

@@ -18,3 +18,4 @@
     <item android:state_enabled="false" android:color="@color/bright_foreground_disabled_material_dark"/>
     <item android:color="@color/bright_foreground_material_dark"/>
 </selector>
+<!-- From: file:/usr/local/google/buildbot/src/googleplex-android/mnc-supportlib-release/frameworks/support/v7/appcompat/res/color/abc_primary_text_disable_only_material_dark.xml -->

libs/android-support-appcompat-v7-exploded-aar/res/color/abc_primary_text_disable_only_material_light.xml

@@ -18,3 +18,4 @@
     <item android:state_enabled="false" android:color="@color/bright_foreground_disabled_material_light"/>
     <item android:color="@color/bright_foreground_material_light"/>
 </selector>
+<!-- From: file:/usr/local/google/buildbot/src/googleplex-android/mnc-supportlib-release/frameworks/support/v7/appcompat/res/color/abc_primary_text_disable_only_material_light.xml -->

libs/android-support-appcompat-v7-exploded-aar/res/color/abc_primary_text_material_dark.xml

@@ -18,3 +18,4 @@
     <item android:state_enabled="false" android:color="@color/primary_text_disabled_material_dark"/>
     <item android:color="@color/primary_text_default_material_dark"/>
 </selector>
+<!-- From: file:/usr/local/google/buildbot/src/googleplex-android/mnc-supportlib-release/frameworks/support/v7/appcompat/res/color/abc_primary_text_material_dark.xml -->

libs/android-support-appcompat-v7-exploded-aar/res/color/abc_primary_text_material_light.xml

@@ -18,3 +18,4 @@
     <item android:state_enabled="false" android:color="@color/primary_text_disabled_material_light"/>
     <item android:color="@color/primary_text_default_material_light"/>
 </selector>
+<!-- From: file:/usr/local/google/buildbot/src/googleplex-android/mnc-supportlib-release/frameworks/support/v7/appcompat/res/color/abc_primary_text_material_light.xml -->

libs/android-support-appcompat-v7-exploded-aar/res/color/abc_search_url_text.xml

@@ -18,4 +18,4 @@
     <item android:state_pressed="true" android:color="@color/abc_search_url_text_pressed"/>
     <item android:state_selected="true" android:color="@color/abc_search_url_text_selected"/>
     <item android:color="@color/abc_search_url_text_normal"/>
-</selector>
+</selector><!-- From: file:/usr/local/google/buildbot/src/googleplex-android/mnc-supportlib-release/frameworks/support/v7/appcompat/res/color/abc_search_url_text.xml -->

libs/android-support-appcompat-v7-exploded-aar/res/color/abc_secondary_text_material_dark.xml

@@ -18,3 +18,4 @@
     <item android:state_enabled="false" android:color="@color/secondary_text_disabled_material_dark"/>
     <item android:color="@color/secondary_text_default_material_dark"/>
 </selector>
+<!-- From: file:/usr/local/google/buildbot/src/googleplex-android/mnc-supportlib-release/frameworks/support/v7/appcompat/res/color/abc_secondary_text_material_dark.xml -->

libs/android-support-appcompat-v7-exploded-aar/res/color/abc_secondary_text_material_light.xml

@@ -18,3 +18,4 @@
     <item android:state_enabled="false" android:color="@color/secondary_text_disabled_material_light"/>
     <item android:color="@color/secondary_text_default_material_light"/>
 </selector>
+<!-- From: file:/usr/local/google/buildbot/src/googleplex-android/mnc-supportlib-release/frameworks/support/v7/appcompat/res/color/abc_secondary_text_material_light.xml -->

libs/android-support-appcompat-v7-exploded-aar/res/color/switch_thumb_material_dark.xml

@@ -17,4 +17,4 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_enabled="false" android:color="@color/switch_thumb_disabled_material_dark"/>
     <item android:color="@color/switch_thumb_normal_material_dark"/>
-</selector>
+</selector><!-- From: file:/usr/local/google/buildbot/src/googleplex-android/mnc-supportlib-release/frameworks/support/v7/appcompat/res/color/switch_thumb_material_dark.xml -->

libs/android-support-appcompat-v7-exploded-aar/res/color/switch_thumb_material_light.xml

@@ -17,4 +17,4 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_enabled="false" android:color="@color/switch_thumb_disabled_material_light"/>
     <item android:color="@color/switch_thumb_normal_material_light"/>
-</selector>
+</selector><!-- From: file:/usr/local/google/buildbot/src/googleplex-android/mnc-supportlib-release/frameworks/support/v7/appcompat/res/color/switch_thumb_material_light.xml -->

libs/android-support-appcompat-v7-exploded-aar/res/values-land/dimens.xml → libs/android-support-appcompat-v7-exploded-aar/res/drawable-v21/abc_action_bar_item_background_material.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2012 The Android Open Source Project
+<!-- 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.
@@ -14,8 +14,5 @@
      limitations under the License.
 -->
 
-<resources>
-    <!-- Size of the indeterminate Progress Bar -->
-    <dimen name="abc_action_bar_progress_bar_size">32dp</dimen>
-
-</resources>
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+        android:color="?android:attr/colorControlHighlight"/><!-- From: file:/usr/local/google/buildbot/src/googleplex-android/mnc-supportlib-release/frameworks/support/v7/appcompat/res/drawable-v21/abc_action_bar_item_background_material.xml -->

libs/android-support-appcompat-v7-exploded-aar/res/drawable-v21/abc_btn_colored_material.xml

@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 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.
+-->
+
+<inset xmlns:android="http://schemas.android.com/apk/res/android"
+       android:insetLeft="@dimen/abc_button_inset_horizontal_material"
+       android:insetTop="@dimen/abc_button_inset_vertical_material"
+       android:insetRight="@dimen/abc_button_inset_horizontal_material"
+       android:insetBottom="@dimen/abc_button_inset_vertical_material">
+    <ripple android:color="?android:attr/colorControlHighlight">
+        <item>
+            <!-- As we can't use themed ColorStateLists in L, we'll use a Drawable selector which
+                 changes the shape's fill color. -->
+            <selector>
+                <item android:state_enabled="false">
+                    <shape android:shape="rectangle">
+                        <corners android:radius="@dimen/abc_control_corner_material"/>
+                        <solid android:color="?android:attr/colorButtonNormal"/>
+                        <padding android:left="@dimen/abc_button_padding_horizontal_material"
+                                 android:top="@dimen/abc_button_padding_vertical_material"
+                                 android:right="@dimen/abc_button_padding_horizontal_material"
+                                 android:bottom="@dimen/abc_button_padding_vertical_material"/>
+                    </shape>
+                </item>
+                <item>
+                    <shape android:shape="rectangle">
+                        <corners android:radius="@dimen/abc_control_corner_material"/>
+                        <solid android:color="?android:attr/colorAccent"/>
+                        <padding android:left="@dimen/abc_button_padding_horizontal_material"
+                                 android:top="@dimen/abc_button_padding_vertical_material"
+                                 android:right="@dimen/abc_button_padding_horizontal_material"
+                                 android:bottom="@dimen/abc_button_padding_vertical_material"/>
+                    </shape>
+                </item>
+            </selector>
+        </item>
+    </ripple>
+</inset><!-- From: file:/usr/local/google/buildbot/src/googleplex-android/mnc-supportlib-release/frameworks/support/v7/appcompat/res/drawable-v21/abc_btn_colored_material.xml -->

libs/android-support-appcompat-v7-exploded-aar/res/values-hdpi/styles_base.xml → libs/android-support-appcompat-v7-exploded-aar/res/drawable-v23/abc_control_background_material.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2014 The Android Open Source Project
+<!-- 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.
@@ -14,10 +14,6 @@
      limitations under the License.
 -->
 
-<resources>
-     <style name="Base.Widget.AppCompat.DrawerArrowToggle" parent="Base.Widget.AppCompat.DrawerArrowToggle.Common">
-          <item name="barSize">18.66dp</item>
-          <item name="gapBetweenBars">3.33dp</item>
-          <item name="drawableSize">24dp</item>
-     </style>
-</resources>
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+        android:color="@color/abc_color_highlight_material"
+        android:radius="20dp" /><!-- From: file:/usr/local/google/buildbot/src/googleplex-android/mnc-supportlib-release/frameworks/support/v7/appcompat/res/drawable-v23/abc_control_background_material.xml -->

libs/android-support-appcompat-v7-exploded-aar/res/drawable/abc_btn_borderless_material.xml

@@ -20,3 +20,4 @@
     <item android:drawable="@android:color/transparent"/>
 </selector>
 
+<!-- From: file:/usr/local/google/buildbot/src/googleplex-android/mnc-supportlib-release/frameworks/support/v7/appcompat/res/drawable/abc_btn_borderless_material.xml -->

libs/android-support-appcompat-v7-exploded-aar/res/drawable/abc_btn_check_material.xml

@@ -17,4 +17,4 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_checked="true" android:drawable="@drawable/abc_btn_check_to_on_mtrl_015" />
     <item android:drawable="@drawable/abc_btn_check_to_on_mtrl_000" />
-</selector>
+</selector><!-- From: file:/usr/local/google/buildbot/src/googleplex-android/mnc-supportlib-release/frameworks/support/v7/appcompat/res/drawable/abc_btn_check_material.xml -->

libs/android-support-appcompat-v7-exploded-aar/res/values-v18/dimens.xml → libs/android-support-appcompat-v7-exploded-aar/res/drawable/abc_btn_colored_material.xml

@@ -14,9 +14,9 @@
      limitations under the License.
 -->
 
-<resources>
+<!-- Used as the canonical button shape. -->
 
-    <!-- Since SwitchCompat can use optical insets on v18+, reset the manual padding -->
-    <dimen name="abc_switch_padding">0px</dimen>
-
-</resources>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/abc_btn_default_mtrl_shape" />
+</layer-list>
+<!-- From: file:/usr/local/google/buildbot/src/googleplex-android/mnc-supportlib-release/frameworks/support/v7/appcompat/res/drawable/abc_btn_colored_material.xml -->

libs/android-support-appcompat-v7-exploded-aar/res/drawable/abc_btn_default_mtrl_shape.xml

@@ -30,3 +30,4 @@
                  android:bottom="@dimen/abc_button_padding_vertical_material" />
     </shape>
 </inset>
+<!-- From: file:/usr/local/google/buildbot/src/googleplex-android/mnc-supportlib-release/frameworks/support/v7/appcompat/res/drawable/abc_btn_default_mtrl_shape.xml -->

libs/android-support-appcompat-v7-exploded-aar/res/drawable/abc_btn_radio_material.xml

@@ -17,4 +17,4 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_checked="true" android:drawable="@drawable/abc_btn_radio_to_on_mtrl_015" />
     <item android:drawable="@drawable/abc_btn_radio_to_on_mtrl_000" />
-</selector>
+</selector><!-- From: file:/usr/local/google/buildbot/src/googleplex-android/mnc-supportlib-release/frameworks/support/v7/appcompat/res/drawable/abc_btn_radio_material.xml -->

libs/android-support-appcompat-v7-exploded-aar/res/drawable/abc_cab_background_internal_bg.xml

@@ -20,4 +20,4 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
        android:shape="rectangle">
     <solid android:color="@android:color/white" />
-</shape>
+</shape><!-- From: file:/usr/local/google/buildbot/src/googleplex-android/mnc-supportlib-release/frameworks/support/v7/appcompat/res/drawable/abc_cab_background_internal_bg.xml -->

libs/android-support-appcompat-v7-exploded-aar/res/drawable/abc_cab_background_top_material.xml

@@ -18,3 +18,4 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
     <solid android:color="@android:color/white"/>
 </shape>
+<!-- From: file:/usr/local/google/buildbot/src/googleplex-android/mnc-supportlib-release/frameworks/support/v7/appcompat/res/drawable/abc_cab_background_top_material.xml -->

libs/android-support-appcompat-v7-exploded-aar/res/drawable/abc_dialog_material_background_dark.xml

@@ -23,4 +23,4 @@
         <corners android:radius="2dp" />
         <solid android:color="@color/background_floating_material_dark" />
     </shape>
-</inset>
+</inset><!-- From: file:/usr/local/google/buildbot/src/googleplex-android/mnc-supportlib-release/frameworks/support/v7/appcompat/res/drawable/abc_dialog_material_background_dark.xml -->

libs/android-support-appcompat-v7-exploded-aar/res/drawable/abc_dialog_material_background_light.xml

@@ -23,4 +23,4 @@
         <corners android:radius="2dp" />
         <solid android:color="@color/background_floating_material_light" />
     </shape>
-</inset>
+</inset><!-- From: file:/usr/local/google/buildbot/src/googleplex-android/mnc-supportlib-release/frameworks/support/v7/appcompat/res/drawable/abc_dialog_material_background_light.xml -->

libs/android-support-appcompat-v7-exploded-aar/res/drawable/abc_edit_text_material.xml

@@ -27,3 +27,4 @@
     </selector>
 
 </inset>
+<!-- From: file:/usr/local/google/buildbot/src/googleplex-android/mnc-supportlib-release/frameworks/support/v7/appcompat/res/drawable/abc_edit_text_material.xml -->

libs/android-support-appcompat-v7-exploded-aar/res/drawable/abc_item_background_holo_dark.xml

@@ -24,3 +24,4 @@
     <item android:state_focused="true"                                                             android:drawable="@drawable/abc_list_focused_holo" />
     <item                                                                                          android:drawable="@android:color/transparent" />
 </selector>
+<!-- From: file:/usr/local/google/buildbot/src/googleplex-android/mnc-supportlib-release/frameworks/support/v7/appcompat/res/drawable/abc_item_background_holo_dark.xml -->

libs/android-support-appcompat-v7-exploded-aar/res/drawable/abc_item_background_holo_light.xml

@@ -24,3 +24,4 @@
     <item android:state_focused="true"                                                             android:drawable="@drawable/abc_list_focused_holo" />
     <item                                                                                          android:drawable="@android:color/transparent" />
 </selector>
+<!-- From: file:/usr/local/google/buildbot/src/googleplex-android/mnc-supportlib-release/frameworks/support/v7/appcompat/res/drawable/abc_item_background_holo_light.xml -->

libs/android-support-appcompat-v7-exploded-aar/res/drawable/abc_list_selector_background_transition_holo_dark.xml

@@ -18,3 +18,4 @@
     <item android:drawable="@drawable/abc_list_pressed_holo_dark"  />
     <item android:drawable="@drawable/abc_list_longpressed_holo"  />
 </transition>
+<!-- From: file:/usr/local/google/buildbot/src/googleplex-android/mnc-supportlib-release/frameworks/support/v7/appcompat/res/drawable/abc_list_selector_background_transition_holo_dark.xml -->

libs/android-support-appcompat-v7-exploded-aar/res/drawable/abc_list_selector_background_transition_holo_light.xml

@@ -18,3 +18,4 @@
     <item android:drawable="@drawable/abc_list_pressed_holo_light"  />
     <item android:drawable="@drawable/abc_list_longpressed_holo"  />
 </transition>
+<!-- From: file:/usr/local/google/buildbot/src/googleplex-android/mnc-supportlib-release/frameworks/support/v7/appcompat/res/drawable/abc_list_selector_background_transition_holo_light.xml -->

libs/android-support-appcompat-v7-exploded-aar/res/drawable/abc_list_selector_holo_dark.xml

@@ -25,3 +25,4 @@
     <item android:state_focused="false"                               android:state_pressed="true" android:drawable="@drawable/abc_list_selector_background_transition_holo_dark" />
     <item android:state_focused="true"                                                             android:drawable="@drawable/abc_list_focused_holo" />
 </selector>
+<!-- From: file:/usr/local/google/buildbot/src/googleplex-android/mnc-supportlib-release/frameworks/support/v7/appcompat/res/drawable/abc_list_selector_holo_dark.xml -->

libs/android-support-appcompat-v7-exploded-aar/res/drawable/abc_list_selector_holo_light.xml

@@ -26,3 +26,4 @@
     <item android:state_focused="true"                                                             android:drawable="@drawable/abc_list_focused_holo" />
 
 </selector>
+<!-- From: file:/usr/local/google/buildbot/src/googleplex-android/mnc-supportlib-release/frameworks/support/v7/appcompat/res/drawable/abc_list_selector_holo_light.xml -->

libs/android-support-appcompat-v7-exploded-aar/res/drawable/abc_ratingbar_full_material.xml

@@ -22,3 +22,4 @@
     <item android:id="@android:id/progress"
         android:drawable="@drawable/abc_btn_rating_star_on_mtrl_alpha" />
 </layer-list>
+<!-- From: file:/usr/local/google/buildbot/src/googleplex-android/mnc-supportlib-release/frameworks/support/v7/appcompat/res/drawable/abc_ratingbar_full_material.xml -->

libs/android-support-appcompat-v7-exploded-aar/res/drawable/abc_seekbar_thumb_material.xml

@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 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.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android"
+          android:constantSize="true">
+    <item android:state_enabled="false" android:state_pressed="true">
+        <bitmap android:src="@drawable/abc_scrubber_control_off_mtrl_alpha"
+                android:gravity="center"/>
+    </item>
+    <item android:state_enabled="false">
+        <bitmap android:src="@drawable/abc_scrubber_control_off_mtrl_alpha"
+                android:gravity="center"/>
+    </item>
+    <item android:state_pressed="true">
+        <bitmap android:src="@drawable/abc_scrubber_control_to_pressed_mtrl_005"
+                android:gravity="center"/>
+    </item>
+    <item>
+        <bitmap android:src="@drawable/abc_scrubber_control_to_pressed_mtrl_000"
+                android:gravity="center"/>
+    </item>
+</selector><!-- From: file:/usr/local/google/buildbot/src/googleplex-android/mnc-supportlib-release/frameworks/support/v7/appcompat/res/drawable/abc_seekbar_thumb_material.xml -->

libs/android-support-appcompat-v7-exploded-aar/res/drawable/abc_seekbar_track_material.xml

@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2014 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.
+-->
+
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:id="@android:id/background"
+          android:drawable="@drawable/abc_scrubber_track_mtrl_alpha"/>
+    <item android:id="@android:id/secondaryProgress">
+        <scale android:scaleWidth="100%">
+            <selector>
+                <item android:state_enabled="false">
+                    <color android:color="@android:color/transparent"/>
+                </item>
+                <item android:drawable="@drawable/abc_scrubber_primary_mtrl_alpha"/>
+            </selector>
+        </scale>
+    </item>
+    <item android:id="@android:id/progress">
+        <scale android:scaleWidth="100%">
+            <selector>
+                <item android:state_enabled="false">
+                    <color android:color="@android:color/transparent"/>
+                </item>
+                <item android:drawable="@drawable/abc_scrubber_primary_mtrl_alpha"/>
+            </selector>
+        </scale>
+    </item>
+</layer-list><!-- From: file:/usr/local/google/buildbot/src/googleplex-android/mnc-supportlib-release/frameworks/support/v7/appcompat/res/drawable/abc_seekbar_track_material.xml -->

libs/android-support-appcompat-v7-exploded-aar/res/drawable/abc_spinner_textfield_background_material.xml

@@ -33,4 +33,4 @@
             </layer-list>
         </item>
     </selector>
-</inset>
+</inset><!-- From: file:/usr/local/google/buildbot/src/googleplex-android/mnc-supportlib-release/frameworks/support/v7/appcompat/res/drawable/abc_spinner_textfield_background_material.xml -->

libs/android-support-appcompat-v7-exploded-aar/res/drawable/abc_switch_thumb_material.xml

@@ -17,4 +17,4 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_checked="true" android:drawable="@drawable/abc_btn_switch_to_on_mtrl_00012" />
     <item android:drawable="@drawable/abc_btn_switch_to_on_mtrl_00001" />
-</selector>
+</selector><!-- From: file:/usr/local/google/buildbot/src/googleplex-android/mnc-supportlib-release/frameworks/support/v7/appcompat/res/drawable/abc_switch_thumb_material.xml -->

libs/android-support-appcompat-v7-exploded-aar/res/drawable/abc_tab_indicator_material.xml

@@ -18,3 +18,4 @@
     <item android:state_selected="true" android:drawable="@drawable/abc_tab_indicator_mtrl_alpha" />
     <item android:drawable="@android:color/transparent" />
 </selector>
+<!-- From: file:/usr/local/google/buildbot/src/googleplex-android/mnc-supportlib-release/frameworks/support/v7/appcompat/res/drawable/abc_tab_indicator_material.xml -->

libs/android-support-appcompat-v7-exploded-aar/res/drawable/abc_text_cursor_material.xml

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ 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.
+-->
+
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+       android:shape="rectangle">
+    <size android:height="2dp"
+          android:width="2dp"/>
+    <solid android:color="@android:color/white"/>
+</shape><!-- From: file:/usr/local/google/buildbot/src/googleplex-android/mnc-supportlib-release/frameworks/support/v7/appcompat/res/drawable/abc_text_cursor_material.xml -->

libs/android-support-appcompat-v7-exploded-aar/res/drawable/abc_textfield_search_material.xml

@@ -20,3 +20,4 @@
     <item android:state_enabled="true" android:drawable="@drawable/abc_textfield_search_default_mtrl_alpha"/>
     <item android:drawable="@drawable/abc_textfield_search_default_mtrl_alpha"/>
 </selector>
+<!-- From: file:/usr/local/google/buildbot/src/googleplex-android/mnc-supportlib-release/frameworks/support/v7/appcompat/res/drawable/abc_textfield_search_material.xml -->

libs/android-support-appcompat-v7-exploded-aar/res/layout/abc_action_bar_title_item.xml

@@ -32,3 +32,4 @@
               android:ellipsize="end"
               android:visibility="gone" />
 </LinearLayout>
+<!-- From: file:/usr/local/google/buildbot/src/googleplex-android/mnc-supportlib-release/frameworks/support/v7/appcompat/res/layout/abc_action_bar_title_item.xml -->

libs/android-support-appcompat-v7-exploded-aar/res/layout/abc_action_bar_up_container.xml

@@ -21,3 +21,4 @@
               android:gravity="center_vertical"
               android:enabled="false">
 </LinearLayout>
+<!-- From: file:/usr/local/google/buildbot/src/googleplex-android/mnc-supportlib-release/frameworks/support/v7/appcompat/res/layout/abc_action_bar_up_container.xml -->

libs/android-support-appcompat-v7-exploded-aar/res/layout/abc_action_bar_view_list_nav_layout.xml

@@ -20,4 +20,4 @@
               android:layout_width="fill_parent"
               android:layout_height="fill_parent"
               style="?attr/actionBarTabBarStyle">
-</LinearLayout>
+</LinearLayout><!-- From: file:/usr/local/google/buildbot/src/googleplex-android/mnc-supportlib-release/frameworks/support/v7/appcompat/res/layout/abc_action_bar_view_list_nav_layout.xml -->

libs/android-support-appcompat-v7-exploded-aar/res/layout/abc_action_menu_item_layout.xml

@@ -14,7 +14,7 @@
      limitations under the License.
 -->
 
-<android.support.v7.internal.view.menu.ActionMenuItemView
+<android.support.v7.view.menu.ActionMenuItemView
         xmlns:android="http://schemas.android.com/apk/res/android"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -28,3 +28,4 @@
         android:textAppearance="?attr/actionMenuTextAppearance"
         android:textColor="?attr/actionMenuTextColor"
         style="?attr/actionButtonStyle"/>
+<!-- From: file:/usr/local/google/buildbot/src/googleplex-android/mnc-supportlib-release/frameworks/support/v7/appcompat/res/layout/abc_action_menu_item_layout.xml -->

libs/android-support-appcompat-v7-exploded-aar/res/layout/abc_action_menu_layout.xml

@@ -22,3 +22,4 @@
         app:divider="?attr/actionBarDivider"
         app:dividerPadding="12dip"
         android:gravity="center_vertical"/>
+<!-- From: file:/usr/local/google/buildbot/src/googleplex-android/mnc-supportlib-release/frameworks/support/v7/appcompat/res/layout/abc_action_menu_layout.xml -->

libs/android-support-appcompat-v7-exploded-aar/res/layout/abc_action_mode_bar.xml

@@ -16,10 +16,11 @@
 ** limitations under the License.
 */
 -->
-<android.support.v7.internal.widget.ActionBarContextView
+<android.support.v7.widget.ActionBarContextView
         xmlns:android="http://schemas.android.com/apk/res/android"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:visibility="gone"
         android:theme="?attr/actionBarTheme"
         style="?attr/actionModeStyle"/>
+<!-- From: file:/usr/local/google/buildbot/src/googleplex-android/mnc-supportlib-release/frameworks/support/v7/appcompat/res/layout/abc_action_mode_bar.xml -->

libs/android-support-appcompat-v7-exploded-aar/res/layout/abc_action_mode_close_item_material.xml

@@ -14,13 +14,13 @@
      limitations under the License.
 -->
 
-<android.support.v7.internal.widget.TintImageView
-             xmlns:android="http://schemas.android.com/apk/res/android"
-             android:id="@+id/action_mode_close_button"
-             android:contentDescription="@string/abc_action_mode_done"
-             android:focusable="true"
-             android:clickable="true"
-             android:src="?attr/actionModeCloseDrawable"
-             style="?attr/actionModeCloseButtonStyle"
-             android:layout_width="wrap_content"
-             android:layout_height="match_parent" />
+<ImageView
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/action_mode_close_button"
+        android:contentDescription="@string/abc_action_mode_done"
+        android:focusable="true"
+        android:clickable="true"
+        android:src="?attr/actionModeCloseDrawable"
+        style="?attr/actionModeCloseButtonStyle"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"/><!-- From: file:/usr/local/google/buildbot/src/googleplex-android/mnc-supportlib-release/frameworks/support/v7/appcompat/res/layout/abc_action_mode_close_item_material.xml -->

libs/android-support-appcompat-v7-exploded-aar/res/layout/abc_activity_chooser_view.xml

@@ -17,7 +17,7 @@
 */
 -->
 <view xmlns:android="http://schemas.android.com/apk/res/android"
-    class="android.support.v7.internal.widget.ActivityChooserView$InnerLayout"
+    class="android.support.v7.widget.ActivityChooserView$InnerLayout"
     android:id="@+id/activity_chooser_view_content"
     android:layout_width="wrap_content"
     android:layout_height="match_parent"
@@ -69,3 +69,4 @@
     </FrameLayout>
 
 </view>
+<!-- From: file:/usr/local/google/buildbot/src/googleplex-android/mnc-supportlib-release/frameworks/support/v7/appcompat/res/layout/abc_activity_chooser_view.xml -->

libs/android-support-appcompat-v7-exploded-aar/res/layout/abc_activity_chooser_view_list_item.xml

@@ -49,4 +49,4 @@
 
     </LinearLayout>
 
-</LinearLayout>
+</LinearLayout><!-- From: file:/usr/local/google/buildbot/src/googleplex-android/mnc-supportlib-release/frameworks/support/v7/appcompat/res/layout/abc_activity_chooser_view_list_item.xml -->