PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Snap for 10314561 from c70e41a431 to udc-release

Browse Source 
Change-Id: I7ff27530c6a00bb47086e50db409cb849906ae1a
This commit is contained in:
Android Build Coastguard Worker
2023-06-13 23:19:49 +00:00
parent e3b4005618 c70e41a431
commit b9330af75f
38 changed files with 746 additions and 216 deletions
Download Patch File Download Diff File Expand all files Collapse all files
quickstep/res/layout/redesigned_gesture_tutorial_fragment.xml
+1 -1
View File
@@ -124,7 +124,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center"
android:scaleType="centerCrop"
android:scaleType="matrix"
app:lottie_loop="true" />
</RelativeLayout>
quickstep/res/values/strings.xml
+24 -14
View File
@@ -98,16 +98,17 @@
<string name="gesture_tutorial_rotation_prompt_title">Rotate your device</string>
<!-- Prompt shown before the gesture navigation tutorial to users who need to rotate their screen to begin. [CHAR LIMIT=100] -->
<string name="gesture_tutorial_rotation_prompt">Please rotate your device to complete the gesture navigation tutorial</string>
<!-- Feedback shown during interactive parts of Back gesture tutorial for right edge when the gesture is too far from the edge. [CHAR LIMIT=100] -->
<string name="back_gesture_feedback_swipe_too_far_from_edge">Make sure you swipe from the far-right or far-left edge.</string>
<string name="back_gesture_feedback_swipe_too_far_from_edge">Make sure you swipe from the far-right or far-left edge</string>
<!-- Feedback shown during interactive parts of Back gesture tutorial for right edge when the gesture is cancelled. [CHAR LIMIT=100] -->
<string name="back_gesture_feedback_cancelled">Make sure you swipe from the right or left edge to the middle of the screen and let go.</string>
<string name="back_gesture_feedback_cancelled">Make sure you swipe from the right or left edge to the middle of the screen and let go</string>
<!-- Feedback shown after completing the back gesture step if the user is following the full gesture tutorial flow. [CHAR LIMIT=100] -->
<string name="back_gesture_feedback_complete_with_overview_follow_up">You learned how to swipe from the right to go back. Next up, learn how to switch apps.</string>
<!-- Feedback shown after completing the back gesture step if the user started this tutorial individually. [CHAR LIMIT=100] -->
<string name="back_gesture_feedback_complete_without_follow_up">You completed the go back gesture.</string>
<string name="back_gesture_feedback_complete_without_follow_up">You completed the go back gesture</string>
<!-- Feedback shown during interactive parts of Back gesture tutorial when the gesture is within the nav bar region. [CHAR LIMIT=100] -->
<string name="back_gesture_feedback_swipe_in_nav_bar">Make sure you don\'t swipe too close to the bottom of the screen.</string>
<string name="back_gesture_feedback_swipe_in_nav_bar">Make sure you don\'t swipe too close to the bottom of the screen</string>
<!-- Subtitle shown on the confirmation screen after successful gesture. [CHAR LIMIT=60] -->
<string name="back_gesture_tutorial_confirm_subtitle">To change the sensitivity of the back gesture, go to Settings</string>
<!-- Feedback shown during interactive parts of Home gesture tutorial when the gesture is started too far from the edge. [CHAR LIMIT=100] -->
@@ -119,16 +120,18 @@
<string name="back_gesture_spoken_intro_subtitle">To go back to the last screen, swipe with 2 fingers from the left or right edge to the middle of the screen.</string>
<!-- Title of the gesture tutorial section educating users on how to go back to the previous screen. [CHAR LIMIT=100] -->
<string name="back_gesture_tutorial_title">Go back</string>
<!-- Subtitle of the gesture tutorial section educating users on how to go to back to the previous screen [CHAR LIMIT=100] -->
<string name="back_gesture_tutorial_subtitle">Swipe from the left or right edge to the middle of the screen</string>
<string name="home_gesture_feedback_swipe_too_far_from_edge">Make sure you swipe up from the bottom edge of the screen.</string>
<string name="home_gesture_feedback_swipe_too_far_from_edge">Make sure you swipe up from the bottom edge of the screen</string>
<!-- Feedback shown during interactive parts of Home gesture tutorial when the Overview gesture is detected. [CHAR LIMIT=100] -->
<string name="home_gesture_feedback_overview_detected">Make sure you don\'t pause before letting go.</string>
<string name="home_gesture_feedback_overview_detected">Make sure you don\'t pause before letting go</string>
<!-- Feedback shown during interactive parts of Home gesture tutorial when the gesture is horizontal instead of vertical. [CHAR LIMIT=100] -->
<string name="home_gesture_feedback_wrong_swipe_direction">Make sure you swipe straight up.</string>
<string name="home_gesture_feedback_wrong_swipe_direction">Make sure you swipe straight up</string>
<!-- Feedback shown after completing the home gesture step if the user is following the full gesture tutorial flow. [CHAR LIMIT=100] -->
<string name="home_gesture_feedback_complete_with_follow_up">You completed the go Home gesture. Next up, learn how to go back.</string>
<string name="home_gesture_feedback_complete_with_follow_up">You completed the go home gesture. Next up, learn how to go back.</string>
<!-- Feedback shown after completing the home gesture step if the user started this tutorial individually. [CHAR LIMIT=100] -->
<string name="home_gesture_feedback_complete_without_follow_up">You completed the go Home gesture.</string>
<string name="home_gesture_feedback_complete_without_follow_up">You completed the go home gesture</string>
<!-- Introduction title for the Home gesture tutorial. [CHAR LIMIT=100] -->
<string name="home_gesture_intro_title">Swipe to go home</string>
<!-- Introduction subtitle for the Home gesture tutorial. [CHAR LIMIT=100] -->
@@ -138,18 +141,20 @@
<!-- Title of the gesture tutorial section educating users on how to go to the home screen. [CHAR LIMIT=100] -->
<string name="home_gesture_tutorial_title">Go home</string>
<!-- Subtitle of the gesture tutorial section educating users on how to go to the home screen [CHAR LIMIT=100] -->
<string name="home_gesture_tutorial_subtitle">To go to your home screen at any time, swipe up from the bottom of your screen</string>
<string name="home_gesture_tutorial_subtitle">Swipe up from the bottom of your screen</string>
<!-- Title message when users successfully learn to go to the home screen [CHAR LIMIT=100] -->
<string name="home_gesture_tutorial_success">Great job!</string>
<!-- Feedback shown during interactive parts of Overview gesture tutorial when the gesture is started too far from the edge. [CHAR LIMIT=100] -->
<string name="overview_gesture_feedback_swipe_too_far_from_edge">Make sure you swipe up from the bottom edge of the screen.</string>
<string name="overview_gesture_feedback_swipe_too_far_from_edge">Make sure you swipe up from the bottom edge of the screen</string>
<!-- Feedback shown during interactive parts of Overview gesture tutorial when the Home gesture is detected. The window refers to the current app's window during the gesture. [CHAR LIMIT=100] -->
<string name="overview_gesture_feedback_home_detected">Try holding the window for longer before releasing.</string>
<string name="overview_gesture_feedback_home_detected">Try holding the window for longer before releasing</string>
<!-- Feedback shown during interactive parts of Overview gesture tutorial when the gesture is horizontal instead of vertical. [CHAR LIMIT=100] -->
<string name="overview_gesture_feedback_wrong_swipe_direction">Make sure you swipe straight up, then pause.</string>
<string name="overview_gesture_feedback_wrong_swipe_direction">Make sure you swipe straight up, then pause</string>
<!-- Feedback shown after completing the overview gesture step if the user is following the full gesture tutorial flow. [CHAR LIMIT=100] -->
<string name="overview_gesture_feedback_complete_with_follow_up">You learned how to use gestures. To turn off gestures, go to Settings.</string>
<!-- Feedback shown after completing the overview gesture step if the user started this tutorial individually. [CHAR LIMIT=100] -->
<string name="overview_gesture_feedback_complete_without_follow_up">You completed the switch apps gesture.</string>
<string name="overview_gesture_feedback_complete_without_follow_up">You completed the switch apps gesture</string>
<!-- Introduction title for the Overview gesture tutorial. [CHAR LIMIT=100] -->
<string name="overview_gesture_intro_title">Swipe to switch apps</string>
<!-- Introduction subtitle for the Overview gesture tutorial. [CHAR LIMIT=100] -->
@@ -158,6 +163,11 @@
<string name="overview_gesture_spoken_intro_subtitle">To switch between apps, swipe up with 2 fingers from the bottom of your screen, hold, then release.</string>
<!-- Title of the gesture tutorial section educating users on how to switch between apps. [CHAR LIMIT=100] -->
<string name="overview_gesture_tutorial_title">Switch apps</string>
<!-- Subtitle of the gesture tutorial section educating users on how to switch between apps [CHAR LIMIT=100] -->
<string name="overview_gesture_tutorial_subtitle">Swipe up from the bottom of your screen, hold, then release</string>
<!-- Title message when users successfully learn to switch between apps [CHAR LIMIT=100] -->
<string name="overview_gesture_tutorial_success">Well done!</string>
<!-- Title shown during interactive part of Assistant gesture tutorial. [CHAR LIMIT=30] -->
<string name="assistant_gesture_tutorial_playground_title" translatable="false">Tutorial: Assistant</string>
quickstep/src/com/android/launcher3/uioverrides/states/QuickstepAtomicAnimationFactory.java
+4
View File
@@ -94,8 +94,12 @@ public class QuickstepAtomicAnimationFactory extends
@Override
public void prepareForAtomicAnimation(LauncherState fromState, LauncherState toState,
StateAnimationConfig config) {
RecentsView overview = mActivity.getOverviewPanel();
if ((fromState == OVERVIEW || fromState == OVERVIEW_SPLIT_SELECT) && toState == NORMAL) {
overview.switchToScreenshot(() ->
overview.finishRecentsAnimation(true /* toRecents */, null));
if (fromState == OVERVIEW_SPLIT_SELECT) {
config.setInterpolator(ANIM_OVERVIEW_SPLIT_SELECT_FLOATING_TASK_TRANSLATE_OFFSCREEN,
clampToProgress(EMPHASIZED_ACCELERATE, 0, 0.4f));
quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/StatusBarTouchController.java
+9 -12
View File
@@ -30,8 +30,6 @@ import android.view.ViewConfiguration;
import android.view.Window;
import android.view.WindowManager;
import androidx.annotation.VisibleForTesting;
import com.android.launcher3.AbstractFloatingView;
import com.android.launcher3.DeviceProfile;
import com.android.launcher3.Launcher;
@@ -52,13 +50,12 @@ public class StatusBarTouchController implements TouchController {
private final Launcher mLauncher;
private final SystemUiProxy mSystemUiProxy;
@VisibleForTesting final float mTouchSlop;
private final float mTouchSlop;
private int mLastAction;
private final SparseArray<PointF> mDownEvents;
/* If {@code false}, this controller should not handle the input {@link MotionEvent}.*/
@VisibleForTesting
boolean mCanIntercept;
private boolean mCanIntercept;
public StatusBarTouchController(Launcher l) {
mLauncher = l;
@@ -85,9 +82,9 @@ public class StatusBarTouchController implements TouchController {
@Override
public final boolean onControllerInterceptTouchEvent(MotionEvent ev) {
final int action = ev.getActionMasked();
final int idx = ev.getActionIndex();
final int pid = ev.getPointerId(idx);
int action = ev.getActionMasked();
int idx = ev.getActionIndex();
int pid = ev.getPointerId(idx);
if (action == ACTION_DOWN) {
mCanIntercept = canInterceptTouch(ev);
if (!mCanIntercept) {
@@ -95,14 +92,14 @@ public class StatusBarTouchController implements TouchController {
}
mDownEvents.clear();
mDownEvents.put(pid, new PointF(ev.getX(), ev.getY()));
} else if (action == MotionEvent.ACTION_POINTER_DOWN) {
} else if (ev.getActionMasked() == MotionEvent.ACTION_POINTER_DOWN) {
// Check!! should only set it only when threshold is not entered.
mDownEvents.put(pid, new PointF(ev.getX(idx), ev.getY(idx)));
}
if (!mCanIntercept) {
return false;
}
if (action == ACTION_MOVE && mDownEvents.contains(pid)) {
if (action == ACTION_MOVE) {
float dy = ev.getY(idx) - mDownEvents.get(pid).y;
float dx = ev.getX(idx) - mDownEvents.get(pid).x;
// Currently input dispatcher will not do touch transfer if there are more than
@@ -129,6 +126,7 @@ public class StatusBarTouchController implements TouchController {
mLauncher.getStatsLogManager().logger()
.log(LAUNCHER_SWIPE_DOWN_WORKSPACE_NOTISHADE_OPEN);
setWindowSlippery(false);
return true;
}
return true;
}
@@ -142,8 +140,7 @@ public class StatusBarTouchController implements TouchController {
* Touches can slide out of the window but they cannot necessarily slide
* back in (unless the other window with touch focus permits it).
*/
@VisibleForTesting
void setWindowSlippery(boolean enable) {
private void setWindowSlippery(boolean enable) {
Window w = mLauncher.getWindow();
WindowManager.LayoutParams wlp = w.getAttributes();
if (enable) {
quickstep/src/com/android/quickstep/interaction/BackGestureTutorialController.java
+8 -1
View File
@@ -66,7 +66,9 @@ final class BackGestureTutorialController extends TutorialController {
@Override
public int getIntroductionSubtitle() {
return R.string.back_gesture_intro_subtitle;
return ENABLE_NEW_GESTURE_NAV_TUTORIAL.get()
? R.string.back_gesture_tutorial_subtitle
: R.string.back_gesture_intro_subtitle;
}
@Override
@@ -74,6 +76,11 @@ final class BackGestureTutorialController extends TutorialController {
return R.string.back_gesture_spoken_intro_subtitle;
}
@Override
public int getSuccessFeedbackTitle() {
return R.string.gesture_tutorial_nice;
}
@Override
public int getSuccessFeedbackSubtitle() {
return mTutorialFragment.isAtFinalStep()
quickstep/src/com/android/quickstep/interaction/HomeGestureTutorialController.java
+7
View File
@@ -73,6 +73,13 @@ final class HomeGestureTutorialController extends SwipeUpGestureTutorialControll
return R.string.home_gesture_spoken_intro_subtitle;
}
@Override
public int getSuccessFeedbackTitle() {
return ENABLE_NEW_GESTURE_NAV_TUTORIAL.get()
? R.string.home_gesture_tutorial_success
: R.string.gesture_tutorial_nice;
}
@Override
public int getSuccessFeedbackSubtitle() {
return mTutorialFragment.isAtFinalStep()
quickstep/src/com/android/quickstep/interaction/OverviewGestureTutorialController.java
+10 -1
View File
@@ -77,7 +77,9 @@ final class OverviewGestureTutorialController extends SwipeUpGestureTutorialCont
@Override
public int getIntroductionSubtitle() {
return R.string.overview_gesture_intro_subtitle;
return ENABLE_NEW_GESTURE_NAV_TUTORIAL.get()
? R.string.overview_gesture_tutorial_subtitle
: R.string.overview_gesture_intro_subtitle;
}
@Override
@@ -85,6 +87,13 @@ final class OverviewGestureTutorialController extends SwipeUpGestureTutorialCont
return R.string.overview_gesture_spoken_intro_subtitle;
}
@Override
public int getSuccessFeedbackTitle() {
return ENABLE_NEW_GESTURE_NAV_TUTORIAL.get()
? R.string.overview_gesture_tutorial_success
: R.string.gesture_tutorial_nice;
}
@Override
public int getSuccessFeedbackSubtitle() {
return mTutorialFragment.getNumSteps() > 1 && mTutorialFragment.isAtFinalStep()
quickstep/src/com/android/quickstep/interaction/TutorialController.java
+28 -1
View File
@@ -30,6 +30,7 @@ import android.annotation.RawRes;
import android.content.Context;
import android.content.pm.PackageManager;
import android.graphics.Color;
import android.graphics.Matrix;
import android.graphics.Outline;
import android.graphics.Rect;
import android.graphics.drawable.AnimatedVectorDrawable;
@@ -67,6 +68,7 @@ import com.android.quickstep.interaction.NavBarGestureHandler.NavBarGestureAttem
import com.android.systemui.shared.system.QuickStepContract;
import com.airbnb.lottie.LottieAnimationView;
import com.airbnb.lottie.LottieComposition;
import java.util.ArrayList;
@@ -175,6 +177,8 @@ abstract class TutorialController implements BackGestureAttemptCallback,
mExitingAppStartingCornerRadius = QuickStepContract.getWindowCornerRadius(mContext);
mExitingAppEndingCornerRadius = mContext.getResources().getDimensionPixelSize(
R.dimen.gesture_tutorial_back_gesture_end_corner_radius);
mAnimatedGestureDemonstration.addLottieOnCompositionLoadedListener(
this::createScalingMatrix);
mFeedbackTitleView.setText(getIntroductionTitle());
mFeedbackSubtitleView.setText(getIntroductionSubtitle());
@@ -214,6 +218,24 @@ abstract class TutorialController implements BackGestureAttemptCallback,
};
}
/** Scale the Lottie gesture animation to fit the device based on device dimensions */
private void createScalingMatrix(LottieComposition composition) {
Rect animationBoundsRect = composition.getBounds();
if (animationBoundsRect == null) {
mAnimatedGestureDemonstration.setScaleType(ImageView.ScaleType.CENTER_CROP);
return;
}
Matrix scaleMatrix = new Matrix();
float pivotX = mScreenWidth / 2f;
float pivotY = mScreenHeight;
float scaleFactor = mScreenWidth / animationBoundsRect.width();
scaleMatrix.postScale(scaleFactor, scaleFactor, pivotX, pivotY);
scaleMatrix.postTranslate(0,
mTutorialFragment.getDeviceProfile().heightPx - animationBoundsRect.height());
mAnimatedGestureDemonstration.setImageMatrix(scaleMatrix);
}
private void showSkipTutorialDialog() {
if (mSkipTutorialDialog != null) {
mSkipTutorialDialog.show();
@@ -321,6 +343,11 @@ abstract class TutorialController implements BackGestureAttemptCallback,
return NO_ID;
}
@StringRes
public int getSuccessFeedbackTitle() {
return NO_ID;
}
@StyleRes
public int getTitleTextAppearance() {
return NO_ID;
@@ -392,7 +419,7 @@ abstract class TutorialController implements BackGestureAttemptCallback,
void showFeedback(int subtitleResId, boolean isGestureSuccessful) {
showFeedback(
isGestureSuccessful
? R.string.gesture_tutorial_nice : R.string.gesture_tutorial_try_again,
? getSuccessFeedbackTitle() : R.string.gesture_tutorial_try_again,
subtitleResId,
NO_ID,
isGestureSuccessful,
quickstep/src/com/android/quickstep/views/RecentsView.java
-8
View File
@@ -4100,14 +4100,6 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
alpha = Utilities.boundToRange(alpha, 0, 1);
mContentAlpha = alpha;
runActionOnRemoteHandles(remoteTargetHandle -> {
TransformParams params = remoteTargetHandle.getTransformParams();
params.setTargetAlpha(mContentAlpha);
if (params.getTargetSet() != null) {
remoteTargetHandle.getTaskViewSimulator().apply(params);
}
});
int runningTaskId = getTaskIdsForRunningTaskView()[0];
for (int i = getTaskViewCount() - 1; i >= 0; i--) {
TaskView child = requireTaskViewAt(i);
quickstep/tests/src/com/android/launcher3/uioverrides/touchcontrollers/StatusBarTouchControllerTest.kt
-152
View File
@@ -1,152 +0,0 @@
/*
* Copyright (C) 202 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 com.android.launcher3.uioverrides.touchcontrollers
import android.view.MotionEvent
import android.view.WindowManager
import androidx.test.filters.SmallTest
import androidx.test.runner.AndroidJUnit4
import com.android.launcher3.Launcher
import com.android.launcher3.ui.AbstractLauncherUiTest
import com.android.launcher3.ui.TaplTestsLauncher3
import junit.framework.Assert.assertEquals
import junit.framework.Assert.assertFalse
import junit.framework.Assert.assertTrue
import org.junit.Before
import org.junit.Test
import org.junit.runner.RunWith
@SmallTest
@RunWith(AndroidJUnit4::class)
class StatusBarTouchControllerTest : AbstractLauncherUiTest() {
@Before
@Throws(Exception::class)
fun setup() {
TaplTestsLauncher3.initialize(this)
}
@Test
fun interceptActionDown_canIntercept() {
executeOnLauncher { launcher: Launcher? ->
val underTest = StatusBarTouchController(launcher)
assertFalse(underTest.mCanIntercept)
val downEvent = MotionEvent.obtain(1, 1, MotionEvent.ACTION_DOWN, 0f, 0f, 0)
underTest.onControllerInterceptTouchEvent(downEvent)
assertTrue(underTest.mCanIntercept)
}
}
@Test
fun interceptActionMove_handledAndSetSlippery() {
executeOnLauncher { launcher: Launcher ->
val underTest = StatusBarTouchController(launcher)
val downEvent = MotionEvent.obtain(1, 1, MotionEvent.ACTION_DOWN, 0f, 0f, 0)
underTest.onControllerInterceptTouchEvent(downEvent)
val w = launcher.window
assertEquals(0, w.attributes.flags and WindowManager.LayoutParams.FLAG_SLIPPERY)
val moveEvent =
MotionEvent.obtain(
2,
2,
MotionEvent.ACTION_MOVE,
underTest.mTouchSlop,
underTest.mTouchSlop + 10,
0
)
val handled = underTest.onControllerInterceptTouchEvent(moveEvent)
assertTrue(handled)
assertEquals(
WindowManager.LayoutParams.FLAG_SLIPPERY,
w.attributes.flags and WindowManager.LayoutParams.FLAG_SLIPPERY
)
}
}
@Test
fun interceptActionMove_not_handled() {
executeOnLauncher { launcher: Launcher? ->
val underTest = StatusBarTouchController(launcher)
val downEvent = MotionEvent.obtain(1, 1, MotionEvent.ACTION_DOWN, 0f, 0f, 0)
underTest.onControllerInterceptTouchEvent(downEvent)
val moveEvent =
MotionEvent.obtain(
2,
2,
MotionEvent.ACTION_MOVE,
underTest.mTouchSlop + 10,
underTest.mTouchSlop,
0
)
val handled = underTest.onControllerInterceptTouchEvent(moveEvent)
assertFalse(handled)
}
}
@Test
fun interceptActionMoveAsFirstGestureEvent_notCrashedNorHandled() {
executeOnLauncher { launcher: Launcher? ->
val underTest = StatusBarTouchController(launcher)
underTest.mCanIntercept = true
val moveEvent = MotionEvent.obtain(2, 2, MotionEvent.ACTION_MOVE, 10f, 10f, 0)
val handled = underTest.onControllerInterceptTouchEvent(moveEvent)
assertFalse(handled)
}
}
@Test
fun handleActionUp_setNotSlippery() {
executeOnLauncher { launcher: Launcher ->
val underTest = StatusBarTouchController(launcher)
underTest.mCanIntercept = true
underTest.setWindowSlippery(true)
val moveEvent = MotionEvent.obtain(2, 2, MotionEvent.ACTION_UP, 10f, 10f, 0)
val handled = underTest.onControllerTouchEvent(moveEvent)
assertTrue(handled)
assertEquals(
0,
launcher.window.attributes.flags and WindowManager.LayoutParams.FLAG_SLIPPERY
)
}
}
@Test
fun handleActionCancel_setNotSlippery() {
executeOnLauncher { launcher: Launcher ->
val underTest = StatusBarTouchController(launcher)
underTest.mCanIntercept = true
underTest.setWindowSlippery(true)
val moveEvent = MotionEvent.obtain(2, 2, MotionEvent.ACTION_CANCEL, 10f, 10f, 0)
val handled = underTest.onControllerTouchEvent(moveEvent)
assertTrue(handled)
assertEquals(
0,
launcher.window.attributes.flags and WindowManager.LayoutParams.FLAG_SLIPPERY
)
}
}
}
res/color-night-v31/material_color_surface.xml
+19
View File
@@ -0,0 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright (C) 2022 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.
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="@android:color/system_neutral1_500" android:lStar="6" />
</selector>
res/color-night-v31/material_color_surface_bright.xml
+19
View File
@@ -0,0 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright (C) 2022 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.
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="@android:color/system_neutral1_500" android:lStar="24" />
</selector>
res/color-night-v31/material_color_surface_container.xml
+19
View File
@@ -0,0 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright (C) 2022 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.
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="@android:color/system_neutral1_500" android:lStar="12" />
</selector>
res/color-night-v31/material_color_surface_container_high.xml
+19
View File
@@ -0,0 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright (C) 2022 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.
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="@android:color/system_neutral1_500" android:lStar="12" />
</selector>
res/color-night-v31/material_color_surface_container_highest.xml
+19
View File
@@ -0,0 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright (C) 2022 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.
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="@android:color/system_neutral1_500" android:lStar="12" />
</selector>
res/color-night-v31/material_color_surface_container_low.xml
+19
View File
@@ -0,0 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright (C) 2022 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.
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="@android:color/system_neutral1_500" android:lStar="12" />
</selector>
res/color-night-v31/material_color_surface_container_lowest.xml
+19
View File
@@ -0,0 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright (C) 2022 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.
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="@android:color/system_neutral1_500" android:lStar="12" />
</selector>
res/color-night-v31/material_color_surface_dim.xml
+19
View File
@@ -0,0 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright (C) 2022 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.
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="@android:color/system_neutral1_500" android:lStar="6" />
</selector>
res/color-night-v31/material_color_surface_inverse.xml
+19
View File
@@ -0,0 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright (C) 2022 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.
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="@android:color/system_neutral1_500" android:lStar="98" />
</selector>
res/color-night-v31/material_color_surface_variant.xml
+19
View File
@@ -0,0 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright (C) 2022 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.
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="@android:color/system_neutral1_500" android:lStar="6" />
</selector>
res/color-night-v31/surface.xml
-23
View File
@@ -1,23 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
/*
**
** Copyright 2021, 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.
*/
-->
<selector
xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="@android:color/system_neutral1_800" />
</selector>
res/color-v31/material_color_surface.xml
+19
View File
@@ -0,0 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright (C) 2023 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.
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="@android:color/system_neutral1_500" android:lStar="98" />
</selector>
res/color-v31/material_color_surface_bright.xml
+19
View File
@@ -0,0 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright (C) 2023 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.
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="@android:color/system_neutral1_500" android:lStar="98" />
</selector>
res/color-v31/material_color_surface_container.xml
+19
View File
@@ -0,0 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright (C) 2023 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.
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="@android:color/system_neutral1_500" android:lStar="94" />
</selector>
res/color-v31/material_color_surface_container_high.xml
+19
View File
@@ -0,0 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright (C) 2023 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.
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="@android:color/system_neutral1_500" android:lStar="94" />
</selector>
res/color-v31/material_color_surface_container_highest.xml
+19
View File
@@ -0,0 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright (C) 2023 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.
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="@android:color/system_neutral1_500" android:lStar="94" />
</selector>
res/color-v31/material_color_surface_container_low.xml
+19
View File
@@ -0,0 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright (C) 2023 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.
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="@android:color/system_neutral1_500" android:lStar="94" />
</selector>
res/color-v31/material_color_surface_container_lowest.xml
+19
View File
@@ -0,0 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright (C) 2022 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.
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="@android:color/system_neutral1_500" android:lStar="94" />
</selector>
res/color-v31/material_color_surface_dim.xml
+19
View File
@@ -0,0 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright (C) 2022 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.
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="@android:color/system_neutral1_500" android:lStar="87" />
</selector>
res/color-v31/material_color_surface_inverse.xml
+20
View File
@@ -0,0 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright (C) 2023 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.
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="@android:color/system_neutral1_500" android:lStar="6" />
</selector>
res/color-v31/material_color_surface_variant.xml
+19
View File
@@ -0,0 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright (C) 2022 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.
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="@android:color/system_neutral1_500" android:lStar="87" />
</selector>
res/color-v31/surface.xml
+2 -1
View File
@@ -19,5 +19,6 @@
-->
<selector
xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="@android:color/system_neutral1_500" android:lStar="98"/>
<item android:color="?attr/materialColorSurfaceContainerHighest"/>
</selector>
res/values-night-v31/colors.xml
+35
View File
@@ -51,4 +51,39 @@
@android:color/system_accent1_200</color>
<color name="work_fab_icon_color">
@android:color/system_accent1_900</color>
<color name="material_color_on_secondary_fixed_variant">@android:color/system_accent2_700</color>
<color name="material_color_on_tertiary_fixed_variant">@android:color/system_accent3_700</color>
<color name="material_color_on_primary_fixed_variant">@android:color/system_accent1_700</color>
<color name="material_color_on_secondary_container">@android:color/system_accent2_100</color>
<color name="material_color_on_tertiary_container">@android:color/system_accent3_100</color>
<color name="material_color_on_primary_container">@android:color/system_accent1_100</color>
<color name="material_color_secondary_fixed_dim">@android:color/system_accent2_200</color>
<color name="material_color_on_error_container">#FFDAD5</color>
<color name="material_color_on_secondary_fixed">@android:color/system_accent2_900</color>
<color name="material_color_on_surface_inverse">@android:color/system_neutral1_900</color>
<color name="material_color_tertiary_fixed_dim">@android:color/system_accent3_200</color>
<color name="material_color_on_tertiary_fixed">@android:color/system_accent3_900</color>
<color name="material_color_primary_fixed_dim">@android:color/system_accent1_200</color>
<color name="material_color_secondary_container">@android:color/system_accent2_700</color>
<color name="material_color_error_container">#930001</color>
<color name="material_color_on_primary_fixed">@android:color/system_accent1_900</color>
<color name="material_color_primary_inverse">@android:color/system_accent1_600</color>
<color name="material_color_secondary_fixed">@android:color/system_accent2_100</color>
<color name="material_color_tertiary_container">@android:color/system_accent3_700</color>
<color name="material_color_tertiary_fixed">@android:color/system_accent3_100</color>
<color name="material_color_primary_container">@android:color/system_accent1_700</color>
<color name="material_color_on_background">@android:color/system_neutral1_800</color>
<color name="material_color_primary_fixed">@android:color/system_accent1_100</color>
<color name="material_color_on_secondary">@android:color/system_accent2_800</color>
<color name="material_color_on_tertiary">@android:color/system_accent3_800</color>
<color name="material_color_on_error">#690001</color>
<color name="material_color_on_surface_variant">@android:color/system_neutral2_200</color>
<color name="material_color_outline">@android:color/system_neutral2_400</color>
<color name="material_color_outline_variant">@android:color/system_neutral2_700</color>
<color name="material_color_on_primary">@android:color/system_accent1_800</color>
<color name="material_color_on_surface">@android:color/system_neutral1_100</color>
<color name="material_color_primary">@android:color/system_accent1_200</color>
<color name="material_color_secondary">@android:color/system_accent2_200</color>
<color name="material_color_tertiary">@android:color/system_accent3_200</color>
</resources>
res/values-night/colors.xml
+64
View File
@@ -0,0 +1,64 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
**
** Copyright 2023, 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>
<color name="material_color_on_secondary_fixed_variant">#3F4759</color>
<color name="material_color_on_tertiary_fixed_variant">#583E5B</color>
<color name="material_color_surface_container_lowest">#0D0E11</color>
<color name="material_color_on_primary_fixed_variant">#2B4678</color>
<color name="material_color_on_secondary_container">#DBE2F9</color>
<color name="material_color_on_tertiary_container">#FBD7FC</color>
<color name="material_color_surface_container_low">#1B1B1F</color>
<color name="material_color_on_primary_container">#D8E2FF</color>
<color name="material_color_secondary_fixed_dim">#BFC6DC</color>
<color name="material_color_on_error_container">#FFDAD5</color>
<color name="material_color_on_secondary_fixed">#141B2C</color>
<color name="material_color_on_surface_inverse">#1B1B1F</color>
<color name="material_color_tertiary_fixed_dim">#DEBCDF</color>
<color name="material_color_on_tertiary_fixed">#29132D</color>
<color name="material_color_primary_fixed_dim">#ADC6FF</color>
<color name="material_color_secondary_container">#3F4759</color>
<color name="material_color_error_container">#930001</color>
<color name="material_color_on_primary_fixed">#001A41</color>
<color name="material_color_primary_inverse">#445E91</color>
<color name="material_color_secondary_fixed">#DBE2F9</color>
<color name="material_color_surface_inverse">#FAF9FD</color>
<color name="material_color_surface_variant">#44474F</color>
<color name="material_color_tertiary_container">#583E5B</color>
<color name="material_color_tertiary_fixed">#FBD7FC</color>
<color name="material_color_primary_container">#2B4678</color>
<color name="material_color_on_background">#E3E2E6</color>
<color name="material_color_primary_fixed">#D8E2FF</color>
<color name="material_color_on_secondary">#293041</color>
<color name="material_color_on_tertiary">#402843</color>
<color name="material_color_surface_dim">#121316</color>
<color name="material_color_surface_bright">#38393C</color>
<color name="material_color_on_error">#690001</color>
<color name="material_color_surface">#121316</color>
<color name="material_color_surface_container_high">#292A2D</color>
<color name="material_color_surface_container_highest">#343538</color>
<color name="material_color_on_surface_variant">#C4C6D0</color>
<color name="material_color_outline">#72747D</color>
<color name="material_color_outline_variant">#444746</color>
<color name="material_color_on_primary">#102F60</color>
<color name="material_color_on_surface">#E3E2E6</color>
<color name="material_color_surface_container">#1F1F23</color>
<color name="material_color_primary">#ADC6FF</color>
<color name="material_color_secondary">#BFC6DC</color>
<color name="material_color_tertiary">#DEBCDF</color>
</resources>
res/values-v31/colors.xml
+36
View File
@@ -102,4 +102,40 @@
@android:color/system_accent1_200</color>
<color name="work_fab_icon_color">
@android:color/system_accent1_900</color>
<color name="material_color_on_secondary_fixed_variant">@android:color/system_accent2_700</color>
<color name="material_color_on_tertiary_fixed_variant">@android:color/system_accent3_700</color>
<color name="material_color_on_primary_fixed_variant">@android:color/system_accent1_700</color>
<color name="material_color_on_secondary_container">@android:color/system_accent2_900</color>
<color name="material_color_on_tertiary_container">@android:color/system_accent3_900</color>
<color name="material_color_on_primary_container">@android:color/system_accent1_900</color>
<color name="material_color_secondary_fixed_dim">@android:color/system_accent2_200</color>
<color name="material_color_on_error_container">#410000</color>
<color name="material_color_on_secondary_fixed">@android:color/system_accent2_900</color>
<color name="material_color_on_surface_inverse">@android:color/system_neutral1_100</color>
<color name="material_color_tertiary_fixed_dim">@android:color/system_accent3_200</color>
<color name="material_color_on_tertiary_fixed">@android:color/system_accent3_900</color>
<color name="material_color_primary_fixed_dim">@android:color/system_accent1_200</color>
<color name="material_color_secondary_container">@android:color/system_accent2_100</color>
<color name="material_color_error_container">#FFDAD5</color>
<color name="material_color_on_primary_fixed">@android:color/system_accent1_900</color>
<color name="material_color_primary_inverse">@android:color/system_accent1_200</color>
<color name="material_color_secondary_fixed">@android:color/system_accent2_100</color>
<color name="material_color_tertiary_container">@android:color/system_accent3_100</color>
<color name="material_color_tertiary_fixed">@android:color/system_accent3_100</color>
<color name="material_color_primary_container">@android:color/system_accent1_100</color>
<color name="material_color_on_background">@android:color/system_neutral1_50</color>
<color name="material_color_primary_fixed">@android:color/system_accent1_100</color>
<color name="material_color_on_secondary">@android:color/system_accent2_0</color>
<color name="material_color_on_tertiary">@android:color/system_accent3_0</color>
<color name="material_color_on_error">#FFFFFF</color>
<color name="material_color_on_surface_variant">@android:color/system_neutral2_700</color>
<color name="material_color_outline">@android:color/system_neutral2_500</color>
<color name="material_color_outline_variant">@android:color/system_neutral2_200</color>
<color name="material_color_on_primary">@android:color/system_accent1_0</color>
<color name="material_color_on_surface">@android:color/system_neutral1_900</color>
<color name="material_color_primary">@android:color/system_accent1_600</color>
<color name="material_color_secondary">@android:color/system_accent2_600</color>
<color name="material_color_tertiary">@android:color/system_accent3_600</color>
</resources>
res/values/attrs.xml
+45
View File
@@ -506,6 +506,51 @@
<attr name="appIconSize" format="dimension" />
</declare-styleable>
<attr name="materialColorOnSecondaryFixedVariant" format="color" />
<attr name="materialColorOnTertiaryFixedVariant" format="color" />
<attr name="materialColorSurfaceContainerLowest" format="color" />
<attr name="materialColorOnPrimaryFixedVariant" format="color" />
<attr name="materialColorOnSecondaryContainer" format="color" />
<attr name="materialColorOnTertiaryContainer" format="color" />
<attr name="materialColorSurfaceContainerLow" format="color" />
<attr name="materialColorOnPrimaryContainer" format="color" />
<attr name="materialColorSecondaryFixedDim" format="color" />
<attr name="materialColorOnErrorContainer" format="color" />
<attr name="materialColorOnSecondaryFixed" format="color" />
<attr name="materialColorOnSurfaceInverse" format="color" />
<attr name="materialColorTertiaryFixedDim" format="color" />
<attr name="materialColorOnTertiaryFixed" format="color" />
<attr name="materialColorPrimaryFixedDim" format="color" />
<attr name="materialColorSecondaryContainer" format="color" />
<attr name="materialColorErrorContainer" format="color" />
<attr name="materialColorOnPrimaryFixed" format="color" />
<attr name="materialColorPrimaryInverse" format="color" />
<attr name="materialColorSecondaryFixed" format="color" />
<attr name="materialColorTertiaryContainer" format="color" />
<attr name="materialColorTertiaryFixed" format="color" />
<attr name="materialColorPrimaryContainer" format="color" />
<attr name="materialColorOnBackground" format="color" />
<attr name="materialColorPrimaryFixed" format="color" />
<attr name="materialColorOnSecondary" format="color" />
<attr name="materialColorOnTertiary" format="color" />
<attr name="materialColorOnError" format="color" />
<attr name="materialColorOnSurfaceVariant" format="color" />
<attr name="materialColorOutline" format="color" />
<attr name="materialColorOutlineVariant" format="color" />
<attr name="materialColorOnPrimary" format="color" />
<attr name="materialColorOnSurface" format="color" />
<attr name="materialColorPrimary" format="color" />
<attr name="materialColorSecondary" format="color" />
<attr name="materialColorTertiary" format="color" />
<attr name="materialColorSurfaceInverse" format="color" />
<attr name="materialColorSurfaceVariant" format="color" />
<attr name="materialColorSurfaceDim" format="color" />
<attr name="materialColorSurfaceBright" format="color" />
<attr name="materialColorSurface" format="color" />
<attr name="materialColorSurfaceContainerHigh" format="color" />
<attr name="materialColorSurfaceContainerHighest" format="color" />
<attr name="materialColorSurfaceContainer" format="color" />
<declare-styleable name="WidgetSections">
<!-- Component name of an app widget provider. -->
<attr name="provider" format="string" />
res/values/colors.xml
+45
View File
@@ -128,4 +128,49 @@
<color name="widget_picker_selected_tab_text_color_dark">#2D312F</color>
<color name="widget_picker_unselected_tab_text_color_dark">#C4C7C5</color>
<color name="widget_picker_collapse_handle_color_dark">#444746</color>
<color name="material_color_on_secondary_fixed_variant">#3F4759</color>
<color name="material_color_on_tertiary_fixed_variant">#583E5B</color>
<color name="material_color_surface_container_lowest">#FFFFFF</color>
<color name="material_color_on_primary_fixed_variant">#2B4678</color>
<color name="material_color_on_secondary_container">#141B2C</color>
<color name="material_color_on_tertiary_container">#29132D</color>
<color name="material_color_surface_container_low">#F5F3F7</color>
<color name="material_color_on_primary_container">#001A41</color>
<color name="material_color_secondary_fixed_dim">#BFC6DC</color>
<color name="material_color_on_error_container">#410000</color>
<color name="material_color_on_secondary_fixed">#141B2C</color>
<color name="material_color_on_surface_inverse">#E3E2E6</color>
<color name="material_color_tertiary_fixed_dim">#DEBCDF</color>
<color name="material_color_on_tertiary_fixed">#29132D</color>
<color name="material_color_primary_fixed_dim">#ADC6FF</color>
<color name="material_color_secondary_container">#DBE2F9</color>
<color name="material_color_error_container">#FFDAD5</color>
<color name="material_color_on_primary_fixed">#001A41</color>
<color name="material_color_primary_inverse">#ADC6FF</color>
<color name="material_color_secondary_fixed">#DBE2F9</color>
<color name="material_color_surface_inverse">#121316</color>
<color name="material_color_surface_variant">#E1E2EC</color>
<color name="material_color_tertiary_container">#FBD7FC</color>
<color name="material_color_tertiary_fixed">#FBD7FC</color>
<color name="material_color_primary_container">#D8E2FF</color>
<color name="material_color_on_background">#1B1B1F</color>
<color name="material_color_primary_fixed">#D8E2FF</color>
<color name="material_color_on_secondary">#FFFFFF</color>
<color name="material_color_on_tertiary">#FFFFFF</color>
<color name="material_color_surface_dim">#DBD9DD</color>
<color name="material_color_surface_bright">#FAF9FD</color>
<color name="material_color_on_error">#FFFFFF</color>
<color name="material_color_surface">#FAF9FD</color>
<color name="material_color_surface_container_high">#E9E7EC</color>
<color name="material_color_surface_container_highest">#E3E2E6</color>
<color name="material_color_on_surface_variant">#44474F</color>
<color name="material_color_outline">#72747D</color>
<color name="material_color_outline_variant">#C4C7C5</color>
<color name="material_color_on_primary">#FFFFFF</color>
<color name="material_color_on_surface">#1B1B1F</color>
<color name="material_color_surface_container">#EFEDF1</color>
<color name="material_color_primary">#445E91</color>
<color name="material_color_secondary">#575E71</color>
<color name="material_color_tertiary">#715573</color>
</resources>
res/values/styles.xml
+47 -2
View File
@@ -31,7 +31,7 @@
<style name="LauncherTheme" parent="@style/BaseLauncherTheme">
<item name="android:textColorSecondary">#DE000000</item>
<item name="allAppsScrimColor">?android:attr/colorBackgroundFloating</item>
<item name="allAppsScrimColor">?attr/materialColorSurfaceDim</item>
<item name="allappsHeaderProtectionColor">@color/popup_color_tertiary_light</item>
<item name="allAppsNavBarScrimColor">#66FFFFFF</item>
<item name="popupColorPrimary">@color/popup_color_primary_light</item>
@@ -75,6 +75,51 @@
<item name="android:statusBarColor">#00000000</item>
<item name="android:navigationBarColor">#00000000</item>
<item name="android:switchStyle">@style/SwitchStyle</item>
<item name="materialColorOnSecondaryFixedVariant">@color/material_color_on_secondary_fixed_variant</item>
<item name="materialColorOnTertiaryFixedVariant">@color/material_color_on_tertiary_fixed_variant</item>
<item name="materialColorSurfaceContainerLowest">@color/material_color_surface_container_lowest</item>
<item name="materialColorOnPrimaryFixedVariant">@color/material_color_on_primary_fixed_variant</item>
<item name="materialColorOnSecondaryContainer">@color/material_color_on_secondary_container</item>
<item name="materialColorOnTertiaryContainer">@color/material_color_on_tertiary_container</item>
<item name="materialColorSurfaceContainerLow">@color/material_color_surface_container_low</item>
<item name="materialColorOnPrimaryContainer">@color/material_color_on_primary_container</item>
<item name="materialColorSecondaryFixedDim">@color/material_color_secondary_fixed_dim</item>
<item name="materialColorOnErrorContainer">@color/material_color_on_error_container</item>
<item name="materialColorOnSecondaryFixed">@color/material_color_on_secondary_fixed</item>
<item name="materialColorOnSurfaceInverse">@color/material_color_on_surface_inverse</item>
<item name="materialColorTertiaryFixedDim">@color/material_color_tertiary_fixed_dim</item>
<item name="materialColorOnTertiaryFixed">@color/material_color_on_tertiary_fixed</item>
<item name="materialColorPrimaryFixedDim">@color/material_color_primary_fixed_dim</item>
<item name="materialColorSecondaryContainer">@color/material_color_secondary_container</item>
<item name="materialColorErrorContainer">@color/material_color_error_container</item>
<item name="materialColorOnPrimaryFixed">@color/material_color_on_primary_fixed</item>
<item name="materialColorPrimaryInverse">@color/material_color_primary_inverse</item>
<item name="materialColorSecondaryFixed">@color/material_color_secondary_fixed</item>
<item name="materialColorSurfaceInverse">@color/material_color_surface_inverse</item>
<item name="materialColorSurfaceVariant">@color/material_color_surface_variant</item>
<item name="materialColorTertiaryContainer">@color/material_color_tertiary_container</item>
<item name="materialColorTertiaryFixed">@color/material_color_tertiary_fixed</item>
<item name="materialColorPrimaryContainer">@color/material_color_primary_container</item>
<item name="materialColorOnBackground">@color/material_color_on_background</item>
<item name="materialColorPrimaryFixed">@color/material_color_primary_fixed</item>
<item name="materialColorOnSecondary">@color/material_color_on_secondary</item>
<item name="materialColorOnTertiary">@color/material_color_on_tertiary</item>
<item name="materialColorSurfaceDim">@color/material_color_surface_dim</item>
<item name="materialColorSurfaceBright">@color/material_color_surface_bright</item>
<item name="materialColorOnError">@color/material_color_on_error</item>
<item name="materialColorSurface">@color/material_color_surface</item>
<item name="materialColorSurfaceContainerHigh">@color/material_color_surface_container_high</item>
<item name="materialColorSurfaceContainerHighest">@color/material_color_surface_container_highest</item>
<item name="materialColorOnSurfaceVariant">@color/material_color_on_surface_variant</item>
<item name="materialColorOutline">@color/material_color_outline</item>
<item name="materialColorOutlineVariant">@color/material_color_outline_variant</item>
<item name="materialColorOnPrimary">@color/material_color_on_primary</item>
<item name="materialColorOnSurface">@color/material_color_on_surface</item>
<item name="materialColorSurfaceContainer">@color/material_color_surface_container</item>
<item name="materialColorPrimary">@color/material_color_primary</item>
<item name="materialColorSecondary">@color/material_color_secondary</item>
<item name="materialColorTertiary">@color/material_color_tertiary</item>
</style>
<style name="SwitchStyle"
@@ -105,7 +150,7 @@
<item name="android:textColorHint">#A0FFFFFF</item>
<item name="android:colorControlHighlight">#19FFFFFF</item>
<item name="android:colorPrimary">#FF212121</item>
<item name="allAppsScrimColor">?android:attr/colorBackgroundFloating</item>
<item name="allAppsScrimColor">?attr/materialColorSurfaceDim</item>
<item name="allAppsNavBarScrimColor">#80000000</item>
<item name="popupColorPrimary">@color/popup_color_primary_dark</item>
<item name="popupColorSecondary">@color/popup_color_secondary_dark</item>