Merge "Move palette constants to XML" into oc-dr1-dev am: 8d5b831095 (ca0c7831) · Commits · e / os / android_frameworks_base

core/java/com/android/internal/colorextraction/ColorExtractor.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -51,7 +51,7 @@ public class ColorExtractor implements WallpaperManager.OnColorsChangedListener
		private WallpaperColors mLockColors;

		public ColorExtractor(Context context) {
		this(context, new Tonal());
		this(context, new Tonal(context));
		}

		@VisibleForTesting

core/java/com/android/internal/colorextraction/types/Tonal.java

+155 −432

File changed.

Preview size limit exceeded, changes collapsed.

core/res/res/values/symbols.xml

+1 −0

Original line number	Diff line number	Diff line
		@@ -1469,6 +1469,7 @@
		<java-symbol type="xml" name="global_keys" />
		<java-symbol type="xml" name="default_zen_mode_config" />
		<java-symbol type="xml" name="sms_7bit_translation_table" />
		<java-symbol type="xml" name="color_extraction" />

		<java-symbol type="raw" name="color_fade_vert" />
		<java-symbol type="raw" name="color_fade_frag" />

core/res/res/xml/color_extraction.xml

0 → 100644

+348 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!--
		~ Copyright (C) 2017 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
		-->

		<colorextraction>
		<!-- List of material color palettes in HSL -->
		<palettes>
		<!-- Grey scale -->
		<palette h="0f, 0f, 0f, 0f, 0f, 0f, 0f, 0f, 0f, 0f, 0f, 0f"
		s="0f, 0f, 0f, 0f, 0f, 0f, 0f, 0f, 0f, 0f, 0f, 0f"
		l="0.08f, 0.11f, 0.14901960784313725f, 0.2f, 0.2980392156862745f, 0.4f,
		0.4980392156862745f, 0.6196078431372549f, 0.7176470588235294f,
		0.8196078431372549f, 0.9176470588235294f, 0.9490196078431372f"/>
		<!-- All colors -->
		<palette h="1,1,0.991,0.991,0.9833333333333333,0,0,0,
		0.01134380453752181,0.015625000000000003,0.024193548387096798,
		0.027397260273972573,0.017543859649122865"
		s="1,1,1,1,1,1,1,0.8434782608695652,1,1,1,1,1"
		l="0.04,0.09,0.14,0.2,0.27450980392156865,
		0.34901960784313724,0.4235294117647059,0.5490196078431373,
		0.6254901960784314,0.6862745098039216,0.7568627450980392,
		0.8568627450980393,0.9254901960784314"/>
		<palette h="0.638,0.638,0.6385767790262171,0.6301169590643275,
		0.6223958333333334,0.6151079136690647,0.6065400843881856,
		0.5986964618249534,0.5910746812386157,0.5833333333333334,
		0.5748031496062993,0.5582010582010583"
		s="1,1,1,1,0.9014084507042253,0.8128654970760234,
		0.7979797979797981,0.7816593886462883,0.778723404255319,1,1,1"
		l="0.05,0.12,0.17450980392156862,0.2235294117647059,
		0.2784313725490196,0.3352941176470588,0.388235294117647,
		0.44901960784313727,0.5392156862745098,0.6509803921568628,
		0.7509803921568627,0.8764705882352941"/>
		<palette h="0.563,0.569,0.5666,0.5669934640522876,0.5748031496062993,
		0.5595238095238095,0.5473118279569893,0.5393258426966292,
		0.5315955766192734,0.524031007751938,0.5154711673699016,
		0.508080808080808,0.5"
		s="1,1,1,1,1,1,1,1,1,0.8847736625514403,1,1,1"
		l="0.07,0.12,0.16,0.2,0.24901960784313726,
		0.27450980392156865,0.30392156862745096,0.34901960784313724,
		0.4137254901960784,0.47647058823529415,0.5352941176470588,
		0.6764705882352942,0.8"/>
		<palette h="0.508,0.511,0.508,0.508,0.5082304526748972,
		0.5069444444444444,0.5,0.5,0.5,0.48724954462659376,
		0.4800347222222222,0.4755134281200632,0.4724409448818897,
		0.4671052631578947"
		s="1,1,1,1,1,0.8888888888888887,0.9242424242424242,1,
		1,0.8133333333333332,0.7868852459016393,1,1,1"
		l="0.04,0.06,0.08,0.12,0.1588235294117647,
		0.21176470588235297,0.25882352941176473,0.3,0.34901960784313724,
		0.44117647058823534,0.5215686274509804,0.5862745098039216,
		0.7509803921568627,0.8509803921568627"/>
		<palette h="0.333,0.333,0.333,0.3333333333333333,0.3333333333333333,
		0.34006734006734,0.34006734006734,0.34006734006734,
		0.34259259259259256,0.3475783475783476,0.34767025089605735,
		0.3467741935483871,0.3703703703703704"
		s="0.70,0.72,0.69,0.6703296703296703,0.728813559322034,
		0.5657142857142856,0.5076923076923077,0.3944223107569721,
		0.6206896551724138,0.8931297709923666,1,1,1"
		l="0.05,0.08,0.14,0.1784313725490196,0.23137254901960785,
		0.3431372549019608,0.38235294117647056,0.49215686274509807,
		0.6588235294117647,0.7431372549019608,0.8176470588235294,
		0.8784313725490196,0.9294117647058824"/>
		<palette h="0.161,0.163,0.163,0.162280701754386,0.15032679738562088,
		0.15879265091863518,0.16236559139784948,0.17443868739205526,
		0.17824074074074076,0.18674698795180725,0.18692449355432778,
		0.1946778711484594,0.18604651162790695"
		s="1,1,1,1,1,1,1,1,1,1,1,1,1"
		l="0.05,0.08,0.11,0.14901960784313725,0.2,
		0.24901960784313726,0.30392156862745096,0.3784313725490196,
		0.4235294117647059,0.48823529411764705,0.6450980392156863,
		0.7666666666666666,0.8313725490196078"/>
		<palette h="0.108,0.105,0.105,0.105,0.10619469026548674,
		0.11924686192468618,0.13046448087431692,0.14248366013071895,
		0.1506024096385542,0.16220238095238093,0.16666666666666666,
		0.16666666666666666,0.162280701754386,0.15686274509803924"
		s="1,1,1,1,1,1,1,1,1,1,1,1,1,1"
		l="0.17,0.22,0.28,0.35,0.44313725490196076,
		0.46862745098039216,0.47843137254901963,0.5,0.5117647058823529,
		0.5607843137254902,0.6509803921568628,0.7509803921568627,
		0.8509803921568627,0.9"/>
		<palette h="0.036,0.036,0.036,0.036,0.03561253561253561,
		0.05098039215686275,0.07516339869281045,0.09477124183006536,
		0.1150326797385621,0.134640522875817,0.14640522875816991,
		0.1582397003745319,0.15773809523809523,0.15359477124183002"
		s="1,1,1,1,1,1,1,1,1,1,1,1,1,1"
		l="0.19,0.26,0.34,0.39,0.4588235294117647,0.5,0.5,0.5,
		0.5,0.5,0.5,0.6509803921568628,0.7803921568627451,0.9"/>
		<palette h="0.955,0.961,0.958,0.9596491228070175,0.9593837535014005,
		0.9514767932489452,0.943859649122807,0.9396825396825397,
		0.9395424836601307,0.9393939393939394,0.9362745098039216,
		0.9754098360655739,0.9824561403508771"
		s="0.87,0.85,0.85,0.84070796460177,0.8206896551724138,
		0.7979797979797981,0.7661290322580644,0.9051724137931036,
		1,1,1,1,1"
		l="0.06,0.11,0.16,0.22156862745098038,0.2843137254901961,
		0.388235294117647,0.48627450980392156,0.5450980392156863,
		0.6,0.6764705882352942,0.8,0.8803921568627451,
		0.9254901960784314"/>
		<palette h="0.866,0.855,0.841025641025641,0.8333333333333334,
		0.8285256410256411,0.821522309711286,0.8083333333333333,
		0.8046594982078853,0.8005822416302766,0.7842377260981912,
		0.7771084337349398,0.7747747747747749"
		s="1,1,1,1,1,1,1,1,1,
		0.737142857142857,0.6434108527131781,0.46835443037974644"
		l="0.05,0.08,0.12745098039215685,0.15490196078431373,
		0.20392156862745098,0.24901960784313726,0.3137254901960784,
		0.36470588235294116,0.44901960784313727,0.6568627450980392,
		0.7470588235294118,0.8450980392156863"/>
		<palette h="0.925,0.93,0.938,0.947,0.955952380952381,
		0.9681069958847737,0.9760479041916167,0.9873563218390804,0,0,
		0.009057971014492771,0.026748971193415648,
		0.041666666666666616,0.05303030303030304"
		s="1,1,1,1,1,0.8350515463917526,0.6929460580912863,
		0.6387665198237885,0.6914893617021276,0.7583892617449666,
		0.8070175438596495,0.9310344827586209,1,1"
		l="0.10,0.13,0.17,0.2,0.27450980392156865,
		0.3803921568627451,0.4725490196078432,0.5549019607843138,
		0.6313725490196078,0.707843137254902,0.7764705882352941,
		0.8294117647058823,0.9058823529411765,0.9568627450980391"/>
		<palette h="0.733,0.736,0.744,0.7514619883040936,0.7679738562091503,
		0.7802083333333333,0.7844311377245509,0.796875,
		0.8165618448637316,0.8487179487179487,0.8582375478927203,
		0.8562091503267975,0.8666666666666667"
		s="1,1,1,1,1,0.8163265306122449,0.6653386454183268,
		0.7547169811320753,0.929824561403509,0.9558823529411766,
		0.9560439560439562,1,1"
		l="0.07,0.12,0.17,0.2235294117647059,0.3,
		0.38431372549019605,0.492156862745098,0.5843137254901961,
		0.6647058823529411,0.7333333333333334,0.8215686274509804,0.9,
		0.9411764705882353"/>
		<palette h="0.6666666666666666,0.6666666666666666,0.6666666666666666,
		0.6666666666666666,0.6666666666666666,0.6666666666666666,
		0.6666666666666666,0.6666666666666666,0.6666666666666666,
		0.6666666666666666,0.6666666666666666"
		s="0.25,0.24590163934426232,0.17880794701986752,
		0.14606741573033713,0.13761467889908252,0.14893617021276592,
		0.16756756756756758,0.20312500000000017,0.26086956521739135,
		0.29999999999999966,0.5000000000000004"
		l="0.18,0.2392156862745098,0.296078431372549,
		0.34901960784313724,0.4274509803921569,0.5392156862745098,
		0.6372549019607843,0.7490196078431373,0.8196078431372549,
		0.8823529411764706,0.9372549019607843"/>
		<palette h="0.938,0.944,0.952,0.961,0.9678571428571429,
		0.9944812362030905,0,0,
		0.0047348484848484815,0.00316455696202532,0,
		0.9980392156862745,0.9814814814814816,0.9722222222222221"
		s="1,1,1,1,1,0.7023255813953488,0.6638655462184874,
		0.6521739130434782,0.7719298245614035,0.8315789473684211,
		0.6867469879518071,0.7264957264957265,0.8181818181818182,
		0.8181818181818189"
		l="0.08,0.13,0.18,0.23,0.27450980392156865,
		0.4215686274509804,
		0.4666666666666667,0.503921568627451,0.5529411764705883,
		0.6274509803921569,0.6745098039215687,0.7705882352941176,
		0.892156862745098,0.9568627450980391"/>
		<palette h="0.88,0.888,0.897,0.9052287581699346,0.9112021857923498,
		0.9270152505446624,0.9343137254901961,0.9391534391534391,
		0.9437984496124031,0.943661971830986,0.9438943894389439,
		0.9426229508196722,0.9444444444444444"
		s="1,1,1,1,0.8133333333333332,0.7927461139896375,
		0.7798165137614679,0.7777777777777779,0.8190476190476191,
		0.8255813953488372,0.8211382113821142,0.8133333333333336,
		0.8000000000000006"
		l="0.08,0.12,0.16,0.2,0.29411764705882354,
		0.3784313725490196,0.42745098039215684,0.4764705882352941,
		0.5882352941176471,0.6627450980392157,0.7588235294117647,
		0.8529411764705882,0.9411764705882353"/>
		<palette h="0.669,0.680,0.6884057971014492,0.6974789915966387,
		0.7079889807162534,0.7154471544715447,0.7217741935483872,
		0.7274143302180687,0.7272727272727273,0.7258064516129031,
		0.7252252252252251,0.7333333333333333"
		s="0.81,0.81,0.8214285714285715,0.6878612716763006,
		0.6080402010050251,0.5774647887323943,0.5391304347826086,
		0.46724890829694316,0.4680851063829788,0.462686567164179,
		0.45679012345678977,0.4545454545454551"
		l="0.12,0.16,0.2196078431372549,0.33921568627450976,
		0.39019607843137255,0.4176470588235294,0.45098039215686275,
		0.5509803921568628,0.6313725490196078,0.7372549019607844,
		0.8411764705882353,0.9352941176470588"/>
		<palette h="0.6470588235294118,0.6516666666666667,0.6464174454828661,
		0.6441441441441442,0.6432748538011696,0.6416666666666667,
		0.6402439024390243,0.6412429378531074,0.6435185185185186,
		0.6428571428571429"
		s="0.8095238095238095,0.6578947368421053,0.5721925133689839,
		0.5362318840579711,0.5,0.4424778761061947,0.44086021505376327,
		0.44360902255639095,0.4499999999999997,0.4375000000000006"
		l="0.16470588235294117,0.2980392156862745,0.36666666666666664,
		0.40588235294117647,0.44705882352941173,
		0.5568627450980392,0.6352941176470588,0.7392156862745098,
		0.8431372549019608,0.9372549019607843"/>
		<palette h="0.469,0.46732026143790845,0.4718614718614719,
		0.4793650793650794,0.48071625344352614,0.4829683698296837,
		0.484375,0.4841269841269842,0.48444444444444457,
		0.48518518518518516,0.4907407407407408"
		s="1,1,1,1,1,1,0.6274509803921569,0.41832669322709176,
		0.41899441340782106,0.4128440366972478,0.4090909090909088"
		l="0.07,0.1,0.15098039215686274,0.20588235294117646,
		0.2372549019607843,0.26862745098039215,0.4,0.5078431372549019,
		0.6490196078431372,0.7862745098039216,0.9137254901960784"/>
		<palette h="0.542,0.5444444444444444,0.5555555555555556,
		0.5555555555555556,0.553763440860215,0.5526315789473684,
		0.5555555555555556,0.5555555555555555,0.5555555555555556,
		0.5512820512820514,0.5666666666666667"
		s="0.25,0.24590163934426232,0.19148936170212766,
		0.1791044776119403,0.18343195266272191,0.18446601941747576,
		0.1538461538461539,0.15625000000000003,0.15328467153284678,
		0.15662650602409653,0.151515151515151"
		l="0.05,0.1196078431372549,0.1843137254901961,
		0.2627450980392157,
		0.33137254901960783,0.403921568627451,0.5411764705882354,
		0.6235294117647059,0.7313725490196079,0.8372549019607843,
		0.9352941176470588"/>
		<palette h="0.022222222222222223,0.02469135802469136,0.031249999999999997,
		0.03947368421052631,0.04166666666666668,
		0.043650793650793655,0.04411764705882352,0.04166666666666652,
		0.04444444444444459,0.05555555555555529"
		s="0.33333333333333337,0.2783505154639175,0.2580645161290323,
		0.25675675675675674,0.2528735632183908,0.17500000000000002,
		0.15315315315315312,0.15189873417721522,
		0.15789473684210534,0.15789473684210542"
		l="0.08823529411764705,0.19019607843137254,0.2431372549019608,
		0.2901960784313725,0.3411764705882353,0.47058823529411764,
		0.5647058823529412,0.6901960784313725,0.8137254901960784,
		0.9254901960784314"/>
		<palette h="0.027,0.03,0.038,0.044,0.050884955752212385,
		0.07254901960784313,0.0934640522875817,
		0.10457516339869281,0.11699346405228758,
		0.1255813953488372,0.1268939393939394,0.12533333333333332,
		0.12500000000000003,0.12777777777777777"
		s="1,1,1,1,1,1,1,1,1,1,1,1,1,1"
		l="0.25,0.3,0.35,0.4,0.44313725490196076,0.5,0.5,0.5,
		0.5,0.5784313725490196,
		0.6549019607843137,0.7549019607843137,0.8509803921568627,
		0.9411764705882353"/>
		</palettes>
		<blacklist>
		<!-- Red -->
		<range h="0, 20"
		s="0.7, 1"
		l="0.21, 0.79"/>
		<range h="0, 20"
		s="0.3, 0.7"
		l="0.355, 0.653"/>
		<!-- Red Orange -->
		<range h="20, 40"
		s="0.7, 1"
		l="0.28, 0.643"/>
		<range h="20, 40"
		s="0.3, 0.7"
		l="0.414, 0.561"/>
		<range h="20, 40"
		s="0, 3"
		l="0.343, 0.584"/>
		<!-- Orange -->
		<range h="40, 60"
		s="0.7, 1"
		l="0.173, 0.349"/>
		<range h="40, 60"
		s="0.3, 0.7"
		l="0.233, 0.427"/>
		<range h="40, 60"
		s="0, 0.3"
		l="0.231, 0.484"/>
		<!-- Yellow 60 -->
		<range h="60, 80"
		s="0.7, 1"
		l="0.488, 0.737"/>
		<range h="60, 80"
		s="0.3, 0.7"
		l="0.673, 0.837"/>
		<!-- Yellow Green 80 -->
		<range h="80, 100"
		s="0.7, 1"
		l="0.469, 0.61"/>
		<!-- Yellow green 100 -->
		<range h="100, 120"
		s="0.7, 1"
		l="0.388, 0.612"/>
		<range h="100, 120"
		s="0.3, 0.7"
		l="0.424, 0.541"/>
		<!-- Green -->
		<range h="120, 140"
		s="0.7, 1"
		l="0.375, 0.52"/>
		<range h="120, 140"
		s="0.3, 0.7"
		l="0.435, 0.524"/>
		<!-- Green Blue 140 -->
		<range h="140, 160"
		s="0.7, 1"
		l="0.496, 0.641"/>
		<!-- Seaoam -->
		<range h="160, 180"
		s="0.7, 1"
		l="0.496, 0.567"/>
		<!-- Cyan -->
		<range h="180, 200"
		s="0.7, 1"
		l="0.52, 0.729"/>
		<!-- Blue -->
		<range h="220, 240"
		s="0.7, 1"
		l="0.396, 0.571"/>
		<range h="220, 240"
		s="0.3, 0.7"
		l="0.425, 0.551"/>
		<!-- Blue Purple 240 -->
		<range h="240, 260"
		s="0.7, 1"
		l="0.418, 0.639"/>
		<range h="220, 240"
		s="0.3, 0.7"
		l="0.441, 0.576"/>
		<!-- Blue Purple 260 -->
		<range h="260, 280"
		s="0.3, 1"
		l="0.461, 0.553"/>
		<!-- Fuchsia -->
		<range h="300, 320"
		s="0.7, 1"
		l="0.484, 0.588"/>
		<range h="300, 320"
		s="0.3, 0.7"
		l="0.48, 0.592"/>
		<!-- Pink -->
		<range h="320, 340"
		s="0.7, 1"
		l="0.466, 0.629"/>
		<!-- Soft red -->
		<range h="340, 360"
		s="0.7, 1"
		l="0.437, 0.596"/>
		</blacklist>
		</colorextraction>
		No newline at end of file

packages/SystemUI/src/com/android/systemui/colorextraction/SysuiColorExtractor.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -42,7 +42,7 @@ public class SysuiColorExtractor extends ColorExtractor {
		private final GradientColors mWpHiddenColors;

		public SysuiColorExtractor(Context context) {
		this(context, new Tonal(), true);
		this(context, new Tonal(context), true);
		}

		@VisibleForTesting