Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 155ce3ae authored by George Mount's avatar George Mount Committed by Android (Google) Code Review
Browse files

Merge "Create reasonable Activity Transition defaults for quantum theme." into lmp-preview-dev

parents 8988dbb6 e5fcc9b4
Loading
Loading
Loading
Loading
+16 −0
Original line number Diff line number Diff line
<?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.
-->
<fade xmlns:android="http://schemas.android.com/apk/res/android"/>
+30 −0
Original line number Diff line number Diff line
<?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.
-->
<transitionSet xmlns:android="http://schemas.android.com/apk/res/android">
    <transitionSet>
        <changeBounds/>
        <changeTransform/>
        <changeClipBounds/>
        <targets>
            <target android:excludeClass="android.widget.ImageView"/>
        </targets>
    </transitionSet>
    <moveImage>
        <targets>
            <target android:targetClass="android.widget.ImageView"/>
        </targets>
    </moveImage>
</transitionSet>
+3 −0
Original line number Diff line number Diff line
@@ -165,6 +165,9 @@ please see themes_device_defaults.xml.
        <item name="windowActionBarFullscreenDecorLayout">@layout/screen_toolbar</item>
        <item name="statusBarColor">?attr/colorPrimaryDark</item>
        <item name="navigationBarColor">@color/black</item>
        <item name="windowEnterTransition">@transition/fade</item>
        <item name="windowSharedElementEnterTransition">@transition/move</item>
        <item name="windowSharedElementExitTransition">@transition/move</item>

        <!-- Dialog attributes -->
        <item name="dialogTheme">@style/Theme.Quantum.Dialog</item>