From 601cf30cf6426ad11436c872d5c2d9e27834d21c Mon Sep 17 00:00:00 2001 From: Bill Yi Date: Fri, 23 Sep 2022 11:29:40 -0700 Subject: [PATCH 1/2] Import translations. DO NOT MERGE ANYWHERE Auto-generated-cl: translation import Change-Id: Ie774ec691c1005f3eb37600db6b25da57b9a88ea --- res/values-ky/strings.xml | 2 +- res/values-mr/strings.xml | 2 +- res/values-or/strings.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/res/values-ky/strings.xml b/res/values-ky/strings.xml index 4a0cd23a16..5d401bc831 100644 --- a/res/values-ky/strings.xml +++ b/res/values-ky/strings.xml @@ -86,7 +86,7 @@ "%1$s телефон чалууларды аткарууга уруксаты жок" "Виджет жүктөлбөй жатат" "Виджеттин жөндөөлөрү" - "Жөндөп бүтүү үчүн таптап коюңуз" + "Аягына чейин тууралоо үчүн басып коюңуз" "Бул системдик колдонмо жана аны чечкенге болбойт." "Аталышын түзөтүү" "%1$s өчүрүлгөн" diff --git a/res/values-mr/strings.xml b/res/values-mr/strings.xml index 6829b9edea..8625ae5fd2 100644 --- a/res/values-mr/strings.xml +++ b/res/values-mr/strings.xml @@ -121,7 +121,7 @@ "काढा" "शोधा" "हा अ‍ॅप इंस्टॉल केलेला नाही" - "या चिन्हासाठी अ‍ॅप इंस्टॉल केलेला नाही. तुम्ही ते काढू शकता किंवा अ‍ॅपचा शोध घेऊ शकता आणि त्यास व्यक्तिचलितपणे इंस्टॉल करू शकता." + "या आयकनसाठी अ‍ॅप इंस्टॉल केलेले नाही. तुम्ही तो काढू शकता किंवा अ‍ॅपचा शोध घेऊन ते मॅन्युअली इंस्टॉल करू शकता." "%1$s इंस्टॉल करत आहे, %2$s पूर्ण झाले" "%1$s डाउनलोड होत आहे , %2$s पूर्ण झाले" "%1$s इंस्टॉल करण्याची प्रतिक्षा करत आहे" diff --git a/res/values-or/strings.xml b/res/values-or/strings.xml index 3d2ff6cbae..9067076c9b 100644 --- a/res/values-or/strings.xml +++ b/res/values-or/strings.xml @@ -72,7 +72,7 @@ "ବ୍ୟକ୍ତିଗତ ଆପ୍ ତାଲିକା" "କାର୍ଯ୍ୟକାରୀ ଆପ୍‌ ତାଲିକା" "ବାହାର କରନ୍ତୁ" - "ଅନଇନଷ୍ଟଲ୍‌ କରନ୍ତୁ" + "ଅନଇନଷ୍ଟଲ କରନ୍ତୁ" "ଆପ୍‌ ସୂଚନା" "ଇନଷ୍ଟଲ୍‌ କରନ୍ତୁ" "ଆପ ପରାମର୍ଶ ଦିଅନ୍ତୁ ନାହିଁ" From cdadbaa2253ef9b36cb0a9a4b08a8e0a13401a1b Mon Sep 17 00:00:00 2001 From: Federico Baron Date: Wed, 21 Sep 2022 12:50:18 -0700 Subject: [PATCH 2/2] Rename alpha and refactor the way alpha is set in PageIndicator Here we rename DOT_INACTIVE_ALPHA and DOT_ACTIVE_ALPHA to reflect the new code, and we also use mPaginationPaint.setAlpha a bit differently Bug: 247561880 Test: Manual Change-Id: I5ee25ee3fb36715d54f9ed86c0d59448829d7260 --- .../launcher3/pageindicators/PageIndicatorDots.java | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/com/android/launcher3/pageindicators/PageIndicatorDots.java b/src/com/android/launcher3/pageindicators/PageIndicatorDots.java index 439e1c7a45..fb51bf01a7 100644 --- a/src/com/android/launcher3/pageindicators/PageIndicatorDots.java +++ b/src/com/android/launcher3/pageindicators/PageIndicatorDots.java @@ -56,8 +56,8 @@ public class PageIndicatorDots extends View implements PageIndicator { private static final int ENTER_ANIMATION_STAGGERED_DELAY = 150; private static final int ENTER_ANIMATION_DURATION = 400; - private static final int DOT_ACTIVE_ALPHA = 255; - private static final int DOT_INACTIVE_ALPHA = 128; + private static final int PAGE_INDICATOR_ALPHA = 255; + private static final int DOT_ALPHA = 128; private static final int DOT_GAP_FACTOR = 3; private static final float DOT_GAP_FACTOR_FLOAT = 3.8f; @@ -282,7 +282,7 @@ public class PageIndicatorDots extends View implements PageIndicator { circleGap = -circleGap; } for (int i = 0; i < mEntryAnimationRadiusFactors.length; i++) { - mPaginationPaint.setAlpha(i == mActivePage ? DOT_ACTIVE_ALPHA : DOT_INACTIVE_ALPHA); + mPaginationPaint.setAlpha(i == mActivePage ? PAGE_INDICATOR_ALPHA : DOT_ALPHA); if (SHOW_DELIGHTFUL_PAGINATION_FOLDER.get()) { canvas.drawCircle(x, y, getRadius(x) * mEntryAnimationRadiusFactors[i], mPaginationPaint); @@ -293,7 +293,8 @@ public class PageIndicatorDots extends View implements PageIndicator { x += circleGap; } } else { - mPaginationPaint.setAlpha(DOT_INACTIVE_ALPHA); + // Here we draw the dots + mPaginationPaint.setAlpha(DOT_ALPHA); for (int i = 0; i < mNumPages; i++) { if (SHOW_DELIGHTFUL_PAGINATION_FOLDER.get()) { canvas.drawCircle(x, y, getRadius(x), mPaginationPaint); @@ -303,8 +304,8 @@ public class PageIndicatorDots extends View implements PageIndicator { x += circleGap; } - mPaginationPaint.setAlpha(DOT_ACTIVE_ALPHA); - + // Here we draw the current page indicator + mPaginationPaint.setAlpha(PAGE_INDICATOR_ALPHA); if (SHOW_DELIGHTFUL_PAGINATION_FOLDER.get()) { RectF currRect = getActiveRect(); int scrollPerPage = getScrollPerPage();