Fix conflicts
This commit is contained in:
1 parent
3269857e66
commit
32922a2e02
25 files changed
+39
-358
No files matched your search
@@ -17,6 +17,7 @@ package com.android.launcher3.allapps;
|
||||
|
||||
import static com.android.launcher3.workprofile.PersonalWorkSlidingTabStrip.getTabWidth;
|
||||
|
||||
import android.animation.LayoutTransition;
|
||||
import android.content.Context;
|
||||
import android.graphics.Insets;
|
||||
import android.graphics.Rect;
|
||||
@@ -103,7 +104,9 @@ public class WorkModeSwitch extends LinearLayout implements Insettable,
|
||||
setInsets(mActivityContext.getDeviceProfile().getInsets());
|
||||
mTextView.setText(R.string.work_apps_pause_btn_text);
|
||||
|
||||
getLayoutTransition().enableTransitionType(LayoutTransition.CHANGING);
|
||||
if (Utilities.ATLEAST_U) {
|
||||
getLayoutTransition().enableTransitionType(LayoutTransition.CHANGING);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -193,10 +196,6 @@ public class WorkModeSwitch extends LinearLayout implements Insettable,
|
||||
return mImeInsets;
|
||||
}
|
||||
|
||||
public Rect getImeInsets() {
|
||||
return mImeInsets;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onTranslationStart() {
|
||||
setFlag(FLAG_TRANSLATION_ONGOING);
|
||||
|
||||
Reference in new issue
Block a user