Skip to content

Fix animation interopolator path #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
AndroBuddy wants to merge 9 commits into
base: sc-qpr3
Choose a base branch
from
Open

Fix animation interopolator path #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
dcc3803
overlays: bring back icon packs
jhonboy121 Dec 1, 2021
7b94ac1
IconPackKaiAndroidOverlay: fix for carriers using 5 bars of signal
anayw2001 Jan 24, 2022
efb58e2
IconPack{Kai,Victor}: Fix clock icon
DarkJoker360 Jun 16, 2021
85de213
base: overlay: fix volume panel arrow in Victor and Sam icon packs
kshatriya-abhay Nov 24, 2020
baa0d25
SystemUI: Stop building NotoSerif font.
imjyotiraditya Dec 13, 2020
47b0fed
SystemUI: Add left padding for keyguard slices
luk1337 May 26, 2022
71cd582
base: overlays: Add Xperia overlays
AndroBuddy Jul 2, 2022
df17af0
Fix animation interopolator path
AndroBuddy Jul 2, 2022
0b8d733
Xperia Settings overlay icons
AndroBuddy Jul 10, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
76 changes: 0 additions & 76 deletions data/etc/preinstalled-packages-platform-overlays.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,58 +53,6 @@
<install-in-user-type package="com.android.internal.systemui.onehanded.gestural">
<install-in user-type="FULL" />
</install-in-user-type>
<install-in-user-type package="com.android.theme.color.amethyst">
<install-in user-type="FULL" />
<install-in user-type="PROFILE" />
</install-in-user-type>
<install-in-user-type package="com.android.theme.color.aquamarine">
<install-in user-type="FULL" />
<install-in user-type="PROFILE" />
</install-in-user-type>
<install-in-user-type package="com.android.theme.color.black">
<install-in user-type="FULL" />
<install-in user-type="PROFILE" />
</install-in-user-type>
<install-in-user-type package="com.android.theme.color.carbon">
<install-in user-type="FULL" />
<install-in user-type="PROFILE" />
</install-in-user-type>
<install-in-user-type package="com.android.theme.color.cinnamon">
<install-in user-type="FULL" />
<install-in user-type="PROFILE" />
</install-in-user-type>
<install-in-user-type package="com.android.theme.color.green">
<install-in user-type="FULL" />
<install-in user-type="PROFILE" />
</install-in-user-type>
<install-in-user-type package="com.android.theme.color.ocean">
<install-in user-type="FULL" />
<install-in user-type="PROFILE" />
</install-in-user-type>
<install-in-user-type package="com.android.theme.color.orchid">
<install-in user-type="FULL" />
<install-in user-type="PROFILE" />
</install-in-user-type>
<install-in-user-type package="com.android.theme.color.palette">
<install-in user-type="FULL" />
<install-in user-type="PROFILE" />
</install-in-user-type>
<install-in-user-type package="com.android.theme.color.purple">
<install-in user-type="FULL" />
<install-in user-type="PROFILE" />
</install-in-user-type>
<install-in-user-type package="com.android.theme.color.sand">
<install-in user-type="FULL" />
<install-in user-type="PROFILE" />
</install-in-user-type>
<install-in-user-type package="com.android.theme.color.space">
<install-in user-type="FULL" />
<install-in user-type="PROFILE" />
</install-in-user-type>
<install-in-user-type package="com.android.theme.color.tangerine">
<install-in user-type="FULL" />
<install-in user-type="PROFILE" />
</install-in-user-type>
<install-in-user-type package="com.android.theme.font.notoserifsource">
<install-in user-type="FULL" />
<install-in user-type="PROFILE" />
Expand Down Expand Up @@ -229,28 +177,4 @@
<install-in user-type="FULL" />
<install-in user-type="PROFILE" />
</install-in-user-type>
<install-in-user-type package="com.android.theme.icon.pebble">
<install-in user-type="FULL" />
<install-in user-type="PROFILE" />
</install-in-user-type>
<install-in-user-type package="com.android.theme.icon.roundedrect">
<install-in user-type="FULL" />
<install-in user-type="PROFILE" />
</install-in-user-type>
<install-in-user-type package="com.android.theme.icon.squircle">
<install-in user-type="FULL" />
<install-in user-type="PROFILE" />
</install-in-user-type>
<install-in-user-type package="com.android.theme.icon.taperedrect">
<install-in user-type="FULL" />
<install-in user-type="PROFILE" />
</install-in-user-type>
<install-in-user-type package="com.android.theme.icon.teardrop">
<install-in user-type="FULL" />
<install-in user-type="PROFILE" />
</install-in-user-type>
<install-in-user-type package="com.android.theme.icon.vessel">
<install-in user-type="FULL" />
<install-in user-type="PROFILE" />
</install-in-user-type>
</config>
9 changes: 6 additions & 3 deletions packages/SystemUI/src/com/android/keyguard/KeyguardSliceView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@
import com.android.settingslib.Utils;
import com.android.systemui.R;
import com.android.systemui.animation.Interpolators;
import com.android.systemui.keyguard.KeyguardSliceProvider;
import com.android.systemui.util.wakelock.KeepAwakeAnimationListener;

import java.io.FileDescriptor;
Expand Down Expand Up @@ -446,13 +447,15 @@ public void setText(CharSequence text, BufferType type) {

private void updatePadding() {
boolean hasText = !TextUtils.isEmpty(getText());
boolean isDate = Uri.parse(KeyguardSliceProvider.KEYGUARD_DATE_URI).equals(getTag());
int padding = (int) getContext().getResources()
.getDimension(R.dimen.widget_horizontal_padding) / 2;
int iconPadding = (int) mContext.getResources()
.getDimension(R.dimen.widget_icon_padding);
// orientation is vertical, so add padding to top & bottom
setPadding(0, padding, 0, hasText ? padding : 0);
setPadding(!isDate ? iconPadding : 0, padding, 0, hasText ? padding : 0);

setCompoundDrawablePadding((int) mContext.getResources()
.getDimension(R.dimen.widget_icon_padding));
setCompoundDrawablePadding(iconPadding);
}

@Override
Expand Down
23 changes: 22 additions & 1 deletion packages/overlays/Android.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,33 @@ LOCAL_REQUIRED_MODULES := \
DisplayCutoutEmulationHoleOverlay \
DisplayCutoutEmulationTallOverlay \
DisplayCutoutEmulationWaterfallOverlay \
IconPackCircularAndroidOverlay \
IconPackCircularSettingsOverlay \
IconPackCircularSystemUIOverlay \
IconPackVictorAndroidOverlay \
IconPackVictorSettingsOverlay \
IconPackVictorSystemUIOverlay \
IconPackSamAndroidOverlay \
IconPackSamSettingsOverlay \
IconPackSamSystemUIOverlay \
IconPackKaiAndroidOverlay \
IconPackKaiSettingsOverlay \
IconPackKaiSystemUIOverlay \
IconPackFilledAndroidOverlay \
IconPackFilledSettingsOverlay \
IconPackFilledSystemUIOverlay \
IconPackRoundedAndroidOverlay \
IconPackRoundedSettingsOverlay \
IconPackRoundedSystemUIOverlay \
IconPackXperiaAndroidOverlay \
IconPackXperiaSettingsOverlay \
IconPackXperiaSystemUIOverlay \
NavigationBarMode3ButtonOverlay \
NavigationBarModeGesturalOverlay \
NavigationBarModeGesturalOverlayNarrowBack \
NavigationBarModeGesturalOverlayWideBack \
NavigationBarModeGesturalOverlayExtraWideBack \
OneHandedModeGesturalOverlay \
OneHandedModeGesturalOverlay \
preinstalled-packages-platform-overlays.xml

include $(BUILD_PHONY_PACKAGE)
Expand Down
1 change: 1 addition & 0 deletions packages/overlays/CleanSpec.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@
#$(call add-clean-step, rm -rf $(PRODUCT_OUT)/data/*)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/vendor/overlay/DisplayCutout*)
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/vendor/overlay/IconPack*)

# ************************************************
# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
Expand Down
30 changes: 30 additions & 0 deletions packages/overlays/IconPackCircularAndroidOverlay/Android.bp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
//
// Copyright 2019, 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.
//

package {
// See: http://go/android-license-faq
// A large-scale-change added 'default_applicable_licenses' to import
// all of the 'license_kinds' from "frameworks_base_license"
// to get the below license kinds:
// SPDX-license-identifier-Apache-2.0
default_applicable_licenses: ["frameworks_base_license"],
}

runtime_resource_overlay {
name: "IconPackCircularAndroidOverlay",
theme: "IconPackCircularAndroid",
product_specific: true,
}
24 changes: 24 additions & 0 deletions packages/overlays/IconPackCircularAndroidOverlay/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
<!--
/**
* Copyright (c) 2019, 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.
*/
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.android.theme.icon_pack.circular.android"
android:versionCode="1"
android:versionName="1.0">
<overlay android:targetPackage="android" android:category="android.theme.customization.icon_pack.android" android:priority="1"/>
<application android:label="Circular" android:hasCode="false"/>
</manifest>
34 changes: 34 additions & 0 deletions ...overlays/IconPackCircularAndroidOverlay/res/anim/ic_signal_wifi_transient_animation_0.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright (C) 2019 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:ordering="together">
<objectAnimator android:propertyName="fillAlpha" android:duration="150"
android:startOffset="0" android:valueFrom="0.3"
android:valueTo="0.3" android:valueType="floatType"
android:interpolator="@*android:interpolator/transient_interpolator" />
<objectAnimator android:propertyName="fillAlpha" android:duration="17"
android:startOffset="150" android:valueFrom="0.3"
android:valueTo="1" android:valueType="floatType"
android:interpolator="@*android:interpolator/transient_interpolator" />
<objectAnimator android:propertyName="fillAlpha" android:duration="483"
android:startOffset="167" android:valueFrom="1" android:valueTo="1"
android:valueType="floatType"
android:interpolator="@*android:interpolator/transient_interpolator" />
<objectAnimator android:propertyName="fillAlpha" android:duration="17"
android:startOffset="650" android:valueFrom="1"
android:valueTo="0.3" android:valueType="floatType"
android:interpolator="@*android:interpolator/transient_interpolator" />
</set>
34 changes: 34 additions & 0 deletions ...overlays/IconPackCircularAndroidOverlay/res/anim/ic_signal_wifi_transient_animation_1.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright (C) 2019 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:ordering="together">
<objectAnimator android:propertyName="fillAlpha" android:duration="317"
android:startOffset="0" android:valueFrom="0.3"
android:valueTo="0.3" android:valueType="floatType"
android:interpolator="@*android:interpolator/transient_interpolator" />
<objectAnimator android:propertyName="fillAlpha" android:duration="17"
android:startOffset="317" android:valueFrom="0.3"
android:valueTo="1" android:valueType="floatType"
android:interpolator="@*android:interpolator/transient_interpolator" />
<objectAnimator android:propertyName="fillAlpha" android:duration="483"
android:startOffset="333" android:valueFrom="1" android:valueTo="1"
android:valueType="floatType"
android:interpolator="@*android:interpolator/transient_interpolator" />
<objectAnimator android:propertyName="fillAlpha" android:duration="17"
android:startOffset="817" android:valueFrom="1"
android:valueTo="0.3" android:valueType="floatType"
android:interpolator="@*android:interpolator/transient_interpolator" />
</set>
34 changes: 34 additions & 0 deletions ...overlays/IconPackCircularAndroidOverlay/res/anim/ic_signal_wifi_transient_animation_2.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright (C) 2019 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:ordering="together">
<objectAnimator android:propertyName="fillAlpha" android:duration="483"
android:startOffset="0" android:valueFrom="0.3"
android:valueTo="0.3" android:valueType="floatType"
android:interpolator="@*android:interpolator/transient_interpolator" />
<objectAnimator android:propertyName="fillAlpha" android:duration="17"
android:startOffset="483" android:valueFrom="0.3"
android:valueTo="1" android:valueType="floatType"
android:interpolator="@*android:interpolator/transient_interpolator" />
<objectAnimator android:propertyName="fillAlpha" android:duration="483"
android:startOffset="500" android:valueFrom="1" android:valueTo="1"
android:valueType="floatType"
android:interpolator="@*android:interpolator/transient_interpolator" />
<objectAnimator android:propertyName="fillAlpha" android:duration="17"
android:startOffset="983" android:valueFrom="1"
android:valueTo="0.3" android:valueType="floatType"
android:interpolator="@*android:interpolator/transient_interpolator" />
</set>
34 changes: 34 additions & 0 deletions ...overlays/IconPackCircularAndroidOverlay/res/anim/ic_signal_wifi_transient_animation_3.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright (C) 2019 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:ordering="together">
<objectAnimator android:propertyName="fillAlpha" android:duration="650"
android:startOffset="0" android:valueFrom="0.3"
android:valueTo="0.3" android:valueType="floatType"
android:interpolator="@*android:interpolator/transient_interpolator" />
<objectAnimator android:propertyName="fillAlpha" android:duration="17"
android:startOffset="650" android:valueFrom="0.3"
android:valueTo="1" android:valueType="floatType"
android:interpolator="@*android:interpolator/transient_interpolator" />
<objectAnimator android:propertyName="fillAlpha" android:duration="483"
android:startOffset="667" android:valueFrom="1" android:valueTo="1"
android:valueType="floatType"
android:interpolator="@*android:interpolator/transient_interpolator" />
<objectAnimator android:propertyName="fillAlpha" android:duration="17"
android:startOffset="1150" android:valueFrom="1"
android:valueTo="0.3" android:valueType="floatType"
android:interpolator="@*android:interpolator/transient_interpolator" />
</set>
21 changes: 21 additions & 0 deletions ...overlays/IconPackCircularAndroidOverlay/res/anim/ic_signal_wifi_transient_animation_4.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright (C) 2019 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:ordering="together">
<objectAnimator android:propertyName="translateX" android:duration="1250"
android:startOffset="0" android:valueFrom="0" android:valueTo="1"
android:valueType="floatType"/>
</set>
Loading