Merge branch 'master' into gliden64-integration

AndroidManifest.xml

@@ -32,7 +32,7 @@
        <activity
            android:name="paulscode.android.mupen64plusae.SplashActivity"
            android:label="@string/SplashActivity_title"
            android:theme="@style/appTheme.Black" >
            android:theme="@style/Theme.AppCompat.Black" >
            <intent-filter>
                <action android:name="android.intent.action.MAIN" />
                <category android:name="android.intent.category.LEANBACK_LAUNCHER" />
@@ -96,7 +96,8 @@
        <activity
            android:name="paulscode.android.mupen64plusae.profile.ControllerProfileActivity"
            android:exported="false"
            android:label="@string/ControllerProfileActivity_title" >
            android:label="@string/ControllerProfileActivity_title"
            android:theme="@style/Theme.AppCompat" >
            <intent-filter>
                <action android:name=".profile.ControllerProfileActivity" />

@@ -136,8 +137,9 @@
        <activity
            android:name="paulscode.android.mupen64plusae.profile.TouchscreenProfileActivity"
            android:exported="false"
            android:label="@string/TouchscreenProfileActivity_title" >
            <intent-filter>
            android:label="@string/TouchscreenProfileActivity_title"
            android:theme="@style/Theme.AppCompat.Black.OverlayActionBar" >
           <intent-filter>
                <action android:name=".profile.TouchscreenProfileActivity" />

                <category android:name="android.intent.category.DEFAULT" />
@@ -146,7 +148,8 @@
        <activity
            android:name="paulscode.android.mupen64plusae.input.DiagnosticActivity"
            android:exported="false"
            android:label="@string/DiagnosticActivity_title" >
            android:label="@string/DiagnosticActivity_title"
            android:theme="@style/Theme.AppCompat" >
            <intent-filter>
                <action android:name=".input.DiagnosticActivity" />

libs/extras/android/support/v7/appcompat/res/anim/abc_grow_fade_in_from_bottom.xml

@@ -0,0 +1,30 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
/* //device/apps/common/res/anim/fade_in.xml
**
** Copyright 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.
*/
-->

<set xmlns:android="http://schemas.android.com/apk/res/android" android:shareInterpolator="false">
    <scale 	android:interpolator="@android:anim/decelerate_interpolator"
              android:fromXScale="0.9" android:toXScale="1.0"
              android:fromYScale="0.9" android:toYScale="1.0"
              android:pivotX="50%" android:pivotY="100%"
              android:duration="@integer/abc_config_activityDefaultDur" />
    <alpha 	android:interpolator="@android:anim/decelerate_interpolator"
              android:fromAlpha="0.0" android:toAlpha="1.0"
              android:duration="@integer/abc_config_activityShortDur" />
</set>

libs/extras/android/support/v7/appcompat/res/anim/abc_popup_enter.xml

@@ -0,0 +1,21 @@
<?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.
-->
<set xmlns:android="http://schemas.android.com/apk/res/android"
     android:shareInterpolator="false" >
    <alpha android:fromAlpha="0.0" android:toAlpha="1.0"
           android:interpolator="@android:anim/decelerate_interpolator"
           android:duration="@integer/abc_config_activityShortDur" />
</set>

libs/extras/android/support/v7/appcompat/res/anim/abc_popup_exit.xml

@@ -0,0 +1,21 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2013 The Android Open Source Project

     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
     You may obtain a copy of the License at

          http://www.apache.org/licenses/LICENSE-2.0

     Unless required by applicable law or agreed to in writing, software
     distributed under the License is distributed on an "AS IS" BASIS,
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
     See the License for the specific language governing permissions and
     limitations under the License.
-->
<set xmlns:android="http://schemas.android.com/apk/res/android"
     android:shareInterpolator="false" >
    <alpha android:fromAlpha="1.0" android:toAlpha="0.0"
           android:interpolator="@android:anim/decelerate_interpolator"
           android:duration="@integer/abc_config_activityShortDur" />
</set>

libs/extras/android/support/v7/appcompat/res/anim/abc_shrink_fade_out_from_bottom.xml

@@ -0,0 +1,27 @@
<?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.
  -->

<set xmlns:android="http://schemas.android.com/apk/res/android" android:shareInterpolator="false">
    <scale 	android:interpolator="@android:anim/decelerate_interpolator"
              android:fromXScale="1.0" android:toXScale="0.9"
              android:fromYScale="1.0" android:toYScale="0.9"
              android:pivotX="50%" android:pivotY="100%"
              android:duration="@integer/abc_config_activityDefaultDur" />
    <alpha 	android:interpolator="@android:anim/decelerate_interpolator"
              android:fromAlpha="1.0" android:toAlpha="0.0"
              android:duration="@integer/abc_config_activityShortDur" />
</set>

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

@@ -0,0 +1,20 @@
<?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.
-->

<selector xmlns:android="http://schemas.android.com/apk/res/android">
    <item android:state_accelerated="false" android:color="@color/background_material_dark" />
    <item android:color="@android:color/transparent" />
</selector>

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

@@ -0,0 +1,20 @@
<?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.
-->

<selector xmlns:android="http://schemas.android.com/apk/res/android">
    <item android:state_accelerated="false" android:color="@color/background_material_light" />
    <item android:color="@android:color/transparent" />
</selector>

libs/extras/android/support/v7/appcompat/res/color/abc_background_cache_hint_selector_material_dark.xml

@@ -15,6 +15,5 @@
-->

<selector xmlns:android="http://schemas.android.com/apk/res/android">
    <item android:state_accelerated="false" android:color="@color/background_material_dark" />
    <item android:color="@android:color/transparent" />
    <item android:color="@color/background_material_dark" />
</selector>

libs/extras/android/support/v7/appcompat/res/color/abc_background_cache_hint_selector_material_light.xml

@@ -15,6 +15,5 @@
-->

<selector xmlns:android="http://schemas.android.com/apk/res/android">
    <item android:state_accelerated="false" android:color="@color/background_material_light" />
    <item android:color="@android:color/transparent" />
    <item android:color="@color/background_material_light" />
</selector>

libs/extras/android/support/v7/appcompat/res/color/switch_thumb_material_dark.xml

@@ -0,0 +1,20 @@
<?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.
-->

<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>

libs/extras/android/support/v7/appcompat/res/color/switch_thumb_material_light.xml

@@ -0,0 +1,20 @@
<?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.
-->

<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>