Merge branch 'android14-release' into 14-dev

This commit is contained in:
MrSluffy committed 2023-12-13 18:47:55 +08:00
1 parent 5931c9afec
commit 32700b0100
994 files changed
+36404 -15826

No files matched your search

@@ -100,7 +100,9 @@ public class WorkModeSwitch extends LinearLayout implements Insettable,
setWindowInsetsAnimationCallback(keyboardInsetAnimationCallback);
}
setBackground(DrawableTokens.WorkAppsToggleBackground.resolve(getContext()));
if (!Utilities.ATLEAST_U) {
setBackground(DrawableTokens.WorkAppsToggleBackground.resolve(getContext()));
}
ColorStateList textColor = ColorStateListTokens.AllAppsTabText.resolve(getContext());
mTextView.setTextColor(textColor);
setCompoundDrawableTintList(mTextView,textColor);
@@ -109,7 +111,6 @@ public class WorkModeSwitch extends LinearLayout implements Insettable,
setInsets(mActivityContext.getDeviceProfile().getInsets());
mTextView.setText(R.string.work_apps_pause_btn_text);
mIcon.setColorFilter(mTextView.getCurrentTextColor());
getLayoutTransition().enableTransitionType(LayoutTransition.CHANGING);
}
@@ -178,7 +179,7 @@ public class WorkModeSwitch extends LinearLayout implements Insettable,
return super.onApplyWindowInsets(insets);
}
private void updateTranslationY() {
void updateTranslationY() {
setTranslationY(-mImeInsets.bottom);
}
@@ -194,6 +195,10 @@ public class WorkModeSwitch extends LinearLayout implements Insettable,
}
}
public Rect getImeInsets() {
return mImeInsets;
}
@Override
public void onTranslationStart() {
setFlag(FLAG_TRANSLATION_ONGOING);