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

Commit 40f806ef authored by Jon Miranda's avatar Jon Miranda Committed by android-build-merger
Browse files

Merge "Merge branch 'ub-launcher3-dorval-polish2'" into oc-mr1-dev 

am: fb46415e

Change-Id: I78c3b855c5c213c3ba89288f6d0f8a1a61c263d3
parents c510d042 fb46415e

AndroidManifest.xml

+1 −0
Original line number Original line Diff line number Diff line
@@ -82,6 +82,7 @@ 
                <category android:name="android.intent.category.HOME" />

                <category android:name="android.intent.category.HOME" />

                <category android:name="android.intent.category.DEFAULT" />

                <category android:name="android.intent.category.DEFAULT" />

                <category android:name="android.intent.category.MONKEY"/>

                <category android:name="android.intent.category.MONKEY"/>

                <category android:name="android.intent.category.LAUNCHER_APP" />

            </intent-filter>

            </intent-filter>

        </activity>

        </activity>

go/res/values-v26/bools.xml

0 → 100644
+21 −0
Original line number Original line Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

/* Copyright 2017, 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.

*/

-->



<resources>

    <bool name="notification_badging_enabled">false</bool>

</resources>
 
 No newline at end of file

go/res/values/override.xml

0 → 100644
+22 −0
Original line number Original line Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

/*

* Copyright (C) 2017 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.

*/

-->

<resources>

    <!-- String representing the intent to delete a package. -->

    <string name="delete_package_intent" translatable="false">#Intent;action=android.intent.action.DELETE;launchFlags=0x10800000;B.android.intent.extra.RETURN_RESULT=true;end</string>

</resources>
 
 No newline at end of file

res/animator-v23/discovery_bounce.xml

0 → 100644
+43 −0
Original line number Original line Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

/*

** Copyright 2017, 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.

*/

-->

<objectAnimator xmlns:android="http://schemas.android.com/apk/res/android"

    android:duration="2166"

    android:repeatCount="5">

    <propertyValuesHolder

        android:propertyName="progress"

        android:valueType="floatType">

        <keyframe

            android:fraction="0"

            android:value="1f" />

        <keyframe

            android:fraction="0.346"

            android:value="1f" />

        <keyframe

            android:fraction=".423"

            android:interpolator="@interpolator/disco_bounce"

            android:value="0.9438f" />

        <keyframe

            android:fraction="0.654"

            android:interpolator="@interpolator/disco_bounce"

            android:value="1f" />

        <keyframe

            android:fraction="1"

            android:value="1f" />

    </propertyValuesHolder>

</objectAnimator>

res/anim/discovery_bounce.xml→res/animator/discovery_bounce.xml

+10 −20
Original line number Original line Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<?xml version="1.0" encoding="utf-8"?>

<!--

<!--

/*

/*

** Copyright 2016, The Android Open Source Project

** Copyright 2017, The Android Open Source Project

**

**

** Licensed under the Apache License, Version 2.0 (the "License");

** Licensed under the Apache License, Version 2.0 (the "License");

** you may not use this file except in compliance with the License.

** you may not use this file except in compliance with the License.
@@ -16,30 +16,20 @@ 
** limitations under the License.

** limitations under the License.

*/

*/

-->

-->



<set xmlns:android="http://schemas.android.com/apk/res/android"

<set xmlns:android="http://schemas.android.com/apk/res/android"

        android:ordering="sequentially"

    android:ordering="sequentially">

        android:startOffset="200">



    <objectAnimator

    <objectAnimator

        android:duration="166"

        android:interpolator="@interpolator/disco_bounce"

        android:propertyName="progress"

        android:propertyName="progress"

        android:duration="250"

        android:startOffset="750"

        android:interpolator="@interpolator/disco_bounce_section1"

        android:valueFrom="1f"

        android:valueFrom="1f"

        android:valueTo=".94f"

        android:valueTo="0.9438f"

        android:valueType="floatType" />

        android:valueType="floatType" />

    <objectAnimator

    <objectAnimator

        android:duration="500"

        android:interpolator="@interpolator/disco_bounce"

        android:propertyName="progress"

        android:propertyName="progress"

        android:duration="216"

        android:interpolator="@interpolator/disco_bounce_section2"

        android:valueFrom=".94f"

        android:valueTo="1.012f"

        android:valueType="floatType"/>

    <objectAnimator

        android:propertyName="progress"

        android:duration="234"

        android:interpolator="@interpolator/disco_bounce_section3"

        android:valueFrom="1.012f"

        android:valueTo="1f"

        android:valueTo="1f"

        android:valueType="floatType" />

        android:valueType="floatType" />

</set>
 
</set>