Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Adding P20 styles" into rvc-d1-dev

Browse Source
This commit is contained in:
Jay Aliomer
2020-04-28 18:27:17 +00:00
committed by Android (Google) Code Review
parent 545ee87b7c 6da7e0634e
commit d44d9cce56
31 changed files with 656 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
data/fonts/fonts.xml
View File

@@ -36,6 +36,39 @@
<font weight="700" style="italic">Roboto-BoldItalic.ttf</font> <font weight="700" style="italic">Roboto-BoldItalic.ttf</font>
</family> </family>
<!-- Pixel 2020 -->
<family name="lustria">
<font weight="400" style="normal">Lustria-Regular.ttf</font>
</family>
<alias name="lustria" to="lustria" weight="400"/>
<family name="karla">
<font weight="400" style="normal">Karla-Regular.ttf</font>
</family>
<alias name="karla" to="karla" weight="400"/>
<family name="fraunces">
<font weight="400" style="normal">Fraunces-Regular.ttf</font>
<font weight="600" style="normal">Fraunces-SemiBold.ttf</font>
</family>
<alias name="fraunces" to="fraunces" weight="400"/>
<alias name="fraunces-semi-bold" to="fraunces" weight="600"/>
<family name="big-shoulders-text">
<font weight="700" style="normal">BigShouldersText-Bold.ttf</font>
<font weight="800" style="normal">BigShouldersText-ExtraBold.ttf</font>
</family>
<alias name="big-shoulders-text-bold" to="big-shoulders-text" weight="700"/>
<alias name="big-shoulders-text-extra-bold" to="big-shoulders-text" weight="800"/>
<family name="barlow">
<font weight="700" style="normal">Barlow-Bold.ttf</font>
<font weight="500" style="normal">Barlow-Medium.ttf</font>
</family>
<alias name="barlow-bold" to="barlow" weight="700"/>
<alias name="barlow-medium" to="barlow" weight="500"/>
<!-- End Pixel 2020 -->
<!-- Note that aliases must come after the fonts they reference. --> <!-- Note that aliases must come after the fonts they reference. -->
<alias name="sans-serif-thin" to="sans-serif" weight="100" /> <alias name="sans-serif-thin" to="sans-serif" weight="100" />
<alias name="sans-serif-light" to="sans-serif" weight="300" /> <alias name="sans-serif-light" to="sans-serif" weight="300" />

4
packages/SystemUI/res/values/config.xml
View File

@@ -312,6 +312,10 @@
<item>com.android.systemui.toast.ToastUI</item> <item>com.android.systemui.toast.ToastUI</item>
</string-array> </string-array>
<!-- QS tile shape store width. negative implies fill configuration instead of stroke-->
<dimen name="config_qsTileStrokeWidthActive">-1dp</dimen>
<dimen name="config_qsTileStrokeWidthInactive">-1dp</dimen>
<!-- SystemUI vender service, used in config_systemUIServiceComponents. --> <!-- SystemUI vender service, used in config_systemUIServiceComponents. -->
<string name="config_systemUIVendorServiceComponent" translatable="false">com.android.systemui.VendorServices</string> <string name="config_systemUIVendorServiceComponent" translatable="false">com.android.systemui.VendorServices</string>

32
packages/SystemUI/src/com/android/systemui/qs/tileimpl/QSTileBaseView.java
View File

@@ -18,8 +18,10 @@ import static com.android.systemui.qs.tileimpl.QSIconViewImpl.QS_ANIM_LENGTH;
import android.animation.ValueAnimator; import android.animation.ValueAnimator;
import android.content.Context; import android.content.Context;
import android.content.res.ColorStateList; import android.content.res.ColorStateList;
import android.content.res.Resources;
import android.content.res.TypedArray; import android.content.res.TypedArray;
import android.graphics.Color; import android.graphics.Color;
import android.graphics.Paint;
import android.graphics.Path; import android.graphics.Path;
import android.graphics.drawable.AdaptiveIconDrawable; import android.graphics.drawable.AdaptiveIconDrawable;
import android.graphics.drawable.Drawable; import android.graphics.drawable.Drawable;
@@ -64,6 +66,8 @@ public class QSTileBaseView extends com.android.systemui.plugins.qs.QSTileView {
private boolean mTileState; private boolean mTileState;
private boolean mCollapsedView; private boolean mCollapsedView;
private boolean mShowRippleEffect = true; private boolean mShowRippleEffect = true;
private float mStrokeWidthActive;
private float mStrokeWidthInactive;
private final ImageView mBg; private final ImageView mBg;
private final TextView mDetailText; private final TextView mDetailText;
@@ -83,6 +87,10 @@ public class QSTileBaseView extends com.android.systemui.plugins.qs.QSTileView {
// Default to Quick Tile padding, and QSTileView will specify its own padding. // Default to Quick Tile padding, and QSTileView will specify its own padding.
int padding = context.getResources().getDimensionPixelSize(R.dimen.qs_quick_tile_padding); int padding = context.getResources().getDimensionPixelSize(R.dimen.qs_quick_tile_padding);
mIconFrame = new FrameLayout(context); mIconFrame = new FrameLayout(context);
mStrokeWidthActive = context.getResources()
.getDimension(R.dimen.config_qsTileStrokeWidthActive);
mStrokeWidthInactive = context.getResources()
.getDimension(R.dimen.config_qsTileStrokeWidthInactive);
int size = context.getResources().getDimensionPixelSize(R.dimen.qs_quick_tile_size); int size = context.getResources().getDimensionPixelSize(R.dimen.qs_quick_tile_size);
addView(mIconFrame, new LayoutParams(size, size)); addView(mIconFrame, new LayoutParams(size, size));
mBg = new ImageView(getContext()); mBg = new ImageView(getContext());
@@ -206,7 +214,31 @@ public class QSTileBaseView extends com.android.systemui.plugins.qs.QSTileView {
mHandler.obtainMessage(H.STATE_CHANGED, state).sendToTarget(); mHandler.obtainMessage(H.STATE_CHANGED, state).sendToTarget();
} }
private void updateStrokeShapeWidth(QSTile.State state) {
Resources resources = getContext().getResources();
if (!(mBg.getDrawable() instanceof ShapeDrawable)) {
return;
}
ShapeDrawable d = (ShapeDrawable) mBg.getDrawable();
d.getPaint().setStyle(Paint.Style.FILL);
switch (state.state) {
case Tile.STATE_INACTIVE:
if (mStrokeWidthInactive >= 0) {
d.getPaint().setStyle(Paint.Style.STROKE);
d.getPaint().setStrokeWidth(mStrokeWidthInactive);
}
break;
case Tile.STATE_ACTIVE:
if (mStrokeWidthActive >= 0) {
d.getPaint().setStyle(Paint.Style.STROKE);
d.getPaint().setStrokeWidth(mStrokeWidthActive);
}
break;
}
}
protected void handleStateChanged(QSTile.State state) { protected void handleStateChanged(QSTile.State state) {
updateStrokeShapeWidth(state);
int circleColor = getCircleColor(state.state); int circleColor = getCircleColor(state.state);
boolean allowAnimations = animationsEnabled(); boolean allowAnimations = animationsEnabled();
if (circleColor != mCircleColor) { if (circleColor != mCircleColor) {

29
packages/overlays/AccentColorCarbonOverlay/Android.mk Normal file
View File

@@ -0,0 +1,29 @@
#
# Copyright 2018, 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.
#
LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS)
LOCAL_RRO_THEME := AccentColorCarbon
LOCAL_PRODUCT_MODULE := true
LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
LOCAL_PACKAGE_NAME := AccentColorCarbonOverlay
LOCAL_SDK_VERSION := current
include $(BUILD_RRO_PACKAGE)

23
packages/overlays/AccentColorCarbonOverlay/AndroidManifest.xml Normal file
View File

@@ -0,0 +1,23 @@
<!--
~ Copyright (C) 2020 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.color.carbon"
android:versionCode="1"
android:versionName="1.0">
<overlay android:targetPackage="android" android:category="android.theme.customization.accent_color" android:priority="1"/>
<application android:label="@string/accent_color_overlay_name" android:hasCode="false"/>
</manifest>

20
packages/overlays/AccentColorCarbonOverlay/res/values/colors_device_defaults.xml Normal file
View File

@@ -0,0 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
~ Copyright (C) 2020 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="accent_device_default_light">#434E58</color>
<color name="accent_device_default_dark">#3DDCFF</color>
</resources>

21
packages/overlays/AccentColorCarbonOverlay/res/values/strings.xml Normal file
View File

@@ -0,0 +1,21 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright (C) 2020 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 xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<!-- Black accent color name application label. [CHAR LIMIT=50] -->
<string name="accent_color_overlay_name" translatable="false">Carbon</string>
</resources>

29
packages/overlays/AccentColorPaletteOverlay/Android.mk Normal file
View File

@@ -0,0 +1,29 @@
#
# Copyright 2018, 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.
#
LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS)
LOCAL_RRO_THEME := AccentColorPalette
LOCAL_PRODUCT_MODULE := true
LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
LOCAL_PACKAGE_NAME := AccentColorPaletteOverlay
LOCAL_SDK_VERSION := current
include $(BUILD_RRO_PACKAGE)

23
packages/overlays/AccentColorPaletteOverlay/AndroidManifest.xml Normal file
View File

@@ -0,0 +1,23 @@
<!--
~ Copyright (C) 2020 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.color.palette"
android:versionCode="1"
android:versionName="1.0">
<overlay android:targetPackage="android" android:category="android.theme.customization.accent_color" android:priority="1"/>
<application android:label="@string/accent_color_overlay" android:hasCode="false"/>
</manifest>

20
packages/overlays/AccentColorPaletteOverlay/res/values/colors_device_defaults.xml Normal file
View File

@@ -0,0 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
~ Copyright (C) 2020 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="accent_device_default_light">#c01668</color>
<color name="accent_device_default_dark">#ffb6d9</color>
</resources>

21
packages/overlays/AccentColorPaletteOverlay/res/values/strings.xml Normal file
View File

@@ -0,0 +1,21 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright (C) 2020 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 xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<!-- Black accent color name application label. [CHAR LIMIT=50] -->
<string name="accent_color_overlay" translatable="false">Palette</string>
</resources>

29
packages/overlays/AccentColorSandOverlay/Android.mk Normal file
View File

@@ -0,0 +1,29 @@
#
# Copyright 2018, 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.
#
LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS)
LOCAL_RRO_THEME := AccentColorSand
LOCAL_PRODUCT_MODULE := true
LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
LOCAL_PACKAGE_NAME := AccentColorSandOverlay
LOCAL_SDK_VERSION := current
include $(BUILD_RRO_PACKAGE)

23
packages/overlays/AccentColorSandOverlay/AndroidManifest.xml Normal file
View File

@@ -0,0 +1,23 @@
<!--
~ Copyright (C) 2020 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.color.sand"
android:versionCode="1"
android:versionName="1.0">
<overlay android:targetPackage="android" android:category="android.theme.customization.accent_color" android:priority="1"/>
<application android:label="@string/accent_color_overlay" android:hasCode="false"/>
</manifest>

20
packages/overlays/AccentColorSandOverlay/res/values/colors_device_defaults.xml Normal file
View File

@@ -0,0 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
~ Copyright (C) 2020 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="accent_device_default_light">#795548</color>
<color name="accent_device_default_dark">#c8ac94</color>
</resources>

21
packages/overlays/AccentColorSandOverlay/res/values/strings.xml Normal file
View File

@@ -0,0 +1,21 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright (C) 2020 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 xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<!-- Black accent color name application label. [CHAR LIMIT=50] -->
<string name="accent_color_overlay" translatable="false">Sand</string>
</resources>

6
packages/overlays/Android.mk
View File

@@ -24,12 +24,18 @@ LOCAL_REQUIRED_MODULES := \
AccentColorSpaceOverlay \ AccentColorSpaceOverlay \
AccentColorGreenOverlay \ AccentColorGreenOverlay \
AccentColorPurpleOverlay \ AccentColorPurpleOverlay \
AccentColorPaletteOverlay \
AccentColorCarbonOverlay \
AccentColorSandOverlay \
DisplayCutoutEmulationCornerOverlay \ DisplayCutoutEmulationCornerOverlay \
DisplayCutoutEmulationDoubleOverlay \ DisplayCutoutEmulationDoubleOverlay \
DisplayCutoutEmulationHoleOverlay \ DisplayCutoutEmulationHoleOverlay \
DisplayCutoutEmulationTallOverlay \ DisplayCutoutEmulationTallOverlay \
DisplayCutoutEmulationWaterfallOverlay \ DisplayCutoutEmulationWaterfallOverlay \
FontNotoSerifSourceOverlay \ FontNotoSerifSourceOverlay \
FontKaiOverlay \
FontVictorOverlay \
FontSamOverlay \
IconPackCircularAndroidOverlay \ IconPackCircularAndroidOverlay \
IconPackCircularLauncherOverlay \ IconPackCircularLauncherOverlay \
IconPackCircularSettingsOverlay \ IconPackCircularSettingsOverlay \

29
packages/overlays/FontKaiOverlay/Android.mk Normal file
View File

@@ -0,0 +1,29 @@
#
# 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.
#
LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS)
LOCAL_RRO_THEME := FontLustria
LOCAL_PRODUCT_MODULE := true
LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
LOCAL_PACKAGE_NAME := FontLustriaOverlay
LOCAL_SDK_VERSION := current
include $(BUILD_RRO_PACKAGE)

29
packages/overlays/FontKaiOverlay/AndroidManifest.xml Normal file
View File

@@ -0,0 +1,29 @@
<!--
~ Copyright (C) 2020 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.font.kai"
android:versionCode="1"
android:versionName="1.0">
<overlay android:targetPackage="android"
android:category="android.theme.customization.font"
android:priority="1"/>
<application android:label="@string/font_overlay" android:hasCode="false">
<meta-data
android:name="android.theme.customization.REQUIRED_SYSTEM_FONTS"
android:value="lustria,source-sans-pro,source-sans-pro-medium" />
</application>
</manifest>

25
packages/overlays/FontKaiOverlay/res/values/config.xml Normal file
View File

@@ -0,0 +1,25 @@
<!--
~ Copyright (C) 2020 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 xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<!-- Name of a font family to use for body text. -->
<string name="config_bodyFontFamily" translatable="false">source-sans-pro</string>
<!-- Name of a font family to use for medium body text. -->
<string name="config_bodyFontFamilyMedium" translatable="false">source-sans-pro-semi-bold</string>
<!-- Name of a font family to use for headlines. If empty, falls back to platform default -->
<string name="config_headlineFontFamilyMedium" translatable="false">lustria</string>
<string name="config_headlineFontFamily" translatable="false">@string/config_headlineFontFamilyMedium</string>
</resources>

19
packages/overlays/FontKaiOverlay/res/values/strings.xml Normal file
View File

@@ -0,0 +1,19 @@
<!--
~ Copyright (C) 2020 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 xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<!-- Headline / Body font Noto Serif / Source Sans Pro overlay -->
<string name="font_overlay" translatable="false">Lustria</string>
</resources>

29
packages/overlays/FontSamOverlay/Android.mk Normal file
View File

@@ -0,0 +1,29 @@
#
# 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.
#
LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS)
LOCAL_RRO_THEME := FontSam
LOCAL_PRODUCT_MODULE := true
LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
LOCAL_PACKAGE_NAME := FontSamOverlay
LOCAL_SDK_VERSION := current
include $(BUILD_RRO_PACKAGE)

29
packages/overlays/FontSamOverlay/AndroidManifest.xml Normal file
View File

@@ -0,0 +1,29 @@
<!--
~ Copyright (C) 2020 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.font.sam"
android:versionCode="1"
android:versionName="1.0">
<overlay android:targetPackage="android"
android:category="android.theme.customization.font"
android:priority="1"/>
<application android:label="@string/font_overlay" android:hasCode="false">
<meta-data
android:name="android.theme.customization.REQUIRED_SYSTEM_FONTS"
android:value="fraunces,fraunces-semi-bold,karla,karla-bold" />
</application>
</manifest>

22
packages/overlays/FontSamOverlay/res/values/config.xml Normal file
View File

@@ -0,0 +1,22 @@
<!--
~ Copyright (C) 2020 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 xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="config_bodyFontFamily" translatable="false">karla</string>
<string name="config_bodyFontFamilyMedium" translatable="false">karla-bold</string>
<string name="config_headlineFontFamily" translatable="false">fraunces</string>
<string name="config_headlineFontFamilyMedium" translatable="false">fraunces-semi-bold</string>
</resources>

19
packages/overlays/FontSamOverlay/res/values/strings.xml Normal file
View File

@@ -0,0 +1,19 @@
<!--
~ Copyright (C) 2020 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 xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<!-- Headline / Body font Noto Serif / Source Sans Pro overlay -->
<string name="font_overlay" translatable="false">Sam</string>
</resources>

29
packages/overlays/FontVictorOverlay/Android.mk Normal file
View File

@@ -0,0 +1,29 @@
#
# 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.
#
LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS)
LOCAL_RRO_THEME := FontVictor
LOCAL_PRODUCT_MODULE := true
LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
LOCAL_PACKAGE_NAME := FontVictorOverlay
LOCAL_SDK_VERSION := current
include $(BUILD_RRO_PACKAGE)

29
packages/overlays/FontVictorOverlay/AndroidManifest.xml Normal file
View File

@@ -0,0 +1,29 @@
<!--
~ Copyright (C) 2020 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.font.victor"
android:versionCode="1"
android:versionName="1.0">
<overlay android:targetPackage="android"
android:category="android.theme.customization.font"
android:priority="1"/>
<application android:label="@string/font_overlay" android:hasCode="false">
<meta-data
android:name="android.theme.customization.REQUIRED_SYSTEM_FONTS"
android:value="barlow,barlow-medium,big-shoulders-text-bold,big-shoulders-text-extra-bold" />
</application>
</manifest>

22
packages/overlays/FontVictorOverlay/res/values/config.xml Normal file
View File

@@ -0,0 +1,22 @@
<!--
~ Copyright (C) 2020 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 xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="config_bodyFontFamily" translatable="false">big-shoulders-text-bold</string>
<string name="config_bodyFontFamilyMedium" translatable="false">big-shoulders-text-extra-bold</string>
<string name="config_headlineFontFamily" translatable="false">barlow</string>
<string name="config_headlineFontFamilyMedium" translatable="false">barlow-medium</string>
</resources>

19
packages/overlays/FontVictorOverlay/res/values/strings.xml Normal file
View File

@@ -0,0 +1,19 @@
<!--
~ Copyright (C) 2020 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 xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<!-- Headline / Body font Noto Serif / Source Sans Pro overlay -->
<string name="font_overlay" translatable="false">Victor</string>
</resources>

1
packages/overlays/IconShapeTaperedRectOverlay/AndroidManifest.xml
View File

@@ -20,7 +20,6 @@
android:versionName="1.0"> android:versionName="1.0">
<overlay <overlay
android:targetPackage="android" android:targetPackage="android"
android:targetName="IconShapeCustomization"
android:category="android.theme.customization.adaptive_icon_shape" android:category="android.theme.customization.adaptive_icon_shape"
android:priority="1"/> android:priority="1"/>

2
packages/overlays/IconShapeTaperedRectOverlay/res/values/config.xml
View File

@@ -23,5 +23,7 @@
<dimen name="config_dialogCornerRadius">0dp</dimen> <dimen name="config_dialogCornerRadius">0dp</dimen>
<!-- Corner radius for bottom sheet system dialogs --> <!-- Corner radius for bottom sheet system dialogs -->
<dimen name="config_bottomDialogCornerRadius">0dp</dimen> <dimen name="config_bottomDialogCornerRadius">0dp</dimen>
<!-- Tile stroke width -->
<dimen name="config_qsTileStrokeWidthInactive">10dp</dimen>
</resources> </resources>

1
packages/overlays/IconShapeVesselOverlay/AndroidManifest.xml
View File

@@ -19,7 +19,6 @@
android:versionName="1.0"> android:versionName="1.0">
<overlay <overlay
android:targetPackage="android" android:targetPackage="android"
android:targetName="IconShapeCustomization"
android:category="android.theme.customization.adaptive_icon_shape" android:category="android.theme.customization.adaptive_icon_shape"
android:priority="1"/> android:priority="1"/>