nehemiah-zb/lineage_build_unified
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Changes for June 2020

Browse Source
This commit is contained in:
Andy CrossGate Yan 2020-06-07 13:24:29 +00:00
parent cdc219defb
commit 445d90977a
5 changed files with 191 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
buildbot_treble.sh
View File

@ -23,10 +23,19 @@ echo "Setting up build environment"
source build/envsetup.sh &> /dev/null source build/envsetup.sh &> /dev/null
echo "" echo ""
echo "Applying PHH patches" echo "Reverting LOS FOD implementation"
cd frameworks/base cd frameworks/base
git am $BL/patches/0001-Squashed-revert-of-LOS-FOD-implementation.patch git am $BL/patches/0001-Squashed-revert-of-LOS-FOD-implementation.patch
cd ../.. cd ../..
cd frameworks/native
git am $BL/patches/0001-Revert-surfaceflinger-Add-support-for-extension-lib.patch
cd ../..
cd vendor/lineage
git revert 612c5a846ea5aed339fe1275c119ee111faae78c --no-edit # soong: Add flag for fod extension
cd ../..
echo ""
echo "Applying PHH patches"
rm -f device/*/sepolicy/common/private/genfs_contexts rm -f device/*/sepolicy/common/private/genfs_contexts
cd device/phh/treble cd device/phh/treble
git clean -fdx git clean -fdx
@ -61,7 +70,6 @@ git revert 82b15278bad816632dcaeaed623b569978e9840d --no-edit # Update lineage.m
git am $BL/patches/0001-Remove-fsck-SELinux-labels.patch git am $BL/patches/0001-Remove-fsck-SELinux-labels.patch
git am $BL/patches/0001-treble-Add-overlay-lineage.patch git am $BL/patches/0001-treble-Add-overlay-lineage.patch
git am $BL/patches/0001-treble-Don-t-specify-config_wallpaperCropperPackage.patch git am $BL/patches/0001-treble-Don-t-specify-config_wallpaperCropperPackage.patch
git am $BL/patches/0001-Increase-system-partition-size-for-arm_ab.patch
git am $BL/patches/0001-TEMP-treble-Fix-init.treble-environ.rc-hardcode-for-.patch git am $BL/patches/0001-TEMP-treble-Fix-init.treble-environ.rc-hardcode-for-.patch
cd ../../.. cd ../../..
cd external/tinycompress cd external/tinycompress

24
patches/0001-Increase-system-partition-size-for-arm_ab.patch
View File

@ -1,24 +0,0 @@
From 037c36f36b8f71bd2001c30285bcfcd6523973b0 Mon Sep 17 00:00:00 2001
From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
Date: Wed, 4 Sep 2019 01:37:30 +0000
Subject: [PATCH] Increase system partition size for arm_ab
Change-Id: I3ac099dd64624ec27c5fb64ce3fa3a9e500402e5
---
phhgsi_arm_ab/BoardConfig.mk | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/phhgsi_arm_ab/BoardConfig.mk b/phhgsi_arm_ab/BoardConfig.mk
index 18aaace..5726959 100644
--- a/phhgsi_arm_ab/BoardConfig.mk
+++ b/phhgsi_arm_ab/BoardConfig.mk
@@ -2,5 +2,5 @@ include build/make/target/board/generic_arm_ab/BoardConfig.mk
include device/phh/treble/board-base.mk
ifeq ($(BOARD_SYSTEMIMAGE_PARTITION_RESERVED_SIZE),)
-BOARD_SYSTEMIMAGE_PARTITION_SIZE := 1073741824
+BOARD_SYSTEMIMAGE_PARTITION_SIZE := 1313583104
endif
--
2.17.1

106
patches/0001-Revert-surfaceflinger-Add-support-for-extension-lib.patch Normal file
View File

@ -0,0 +1,106 @@
From 7d7802adc9d58e2b3c65eba48e543ac5b8d8813f Mon Sep 17 00:00:00 2001
From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
Date: Wed, 10 Jun 2020 15:36:26 +0000
Subject: [PATCH] Revert "surfaceflinger: Add support for extension lib"
This reverts commit 470dde656e0ee547f78ac403a6f959e1438c2158.
Change-Id: I7c7ed49ba33f98e2715e12f24a0b01c937cae5ac
---
services/surfaceflinger/BufferQueueLayer.cpp | 11 +----------
services/surfaceflinger/CompositionEngine/Android.bp | 10 ----------
.../CompositionEngine/src/OutputLayer.cpp | 10 +---------
3 files changed, 2 insertions(+), 29 deletions(-)
diff --git a/services/surfaceflinger/BufferQueueLayer.cpp b/services/surfaceflinger/BufferQueueLayer.cpp
index 18c74e6c6..eb1bf66cd 100644
--- a/services/surfaceflinger/BufferQueueLayer.cpp
+++ b/services/surfaceflinger/BufferQueueLayer.cpp
@@ -18,7 +18,6 @@
#define LOG_TAG "BufferQueueLayer"
#define ATRACE_TAG ATRACE_TAG_GRAPHICS
#include <compositionengine/Display.h>
-#include <compositionengine/FodExtension.h>
#include <compositionengine/Layer.h>
#include <compositionengine/OutputLayer.h>
#include <compositionengine/impl/LayerCompositionState.h>
@@ -563,19 +562,11 @@ status_t BufferQueueLayer::setDefaultBufferProperties(uint32_t w, uint32_t h, Pi
return BAD_VALUE;
}
- uint64_t usageBits = getEffectiveUsage(0);
-
- if (mName == FOD_LAYER_NAME) {
- usageBits = getFodUsageBits(usageBits, false);
- } else if (mName == FOD_TOUCHED_LAYER_NAME) {
- usageBits = getFodUsageBits(usageBits, true);
- }
-
mFormat = format;
setDefaultBufferSize(w, h);
mConsumer->setDefaultBufferFormat(format);
- mConsumer->setConsumerUsageBits(usageBits);
+ mConsumer->setConsumerUsageBits(getEffectiveUsage(0));
return NO_ERROR;
}
diff --git a/services/surfaceflinger/CompositionEngine/Android.bp b/services/surfaceflinger/CompositionEngine/Android.bp
index fd1c369d8..6f076ad11 100644
--- a/services/surfaceflinger/CompositionEngine/Android.bp
+++ b/services/surfaceflinger/CompositionEngine/Android.bp
@@ -45,7 +45,6 @@ cc_library {
"src/DisplayColorProfile.cpp",
"src/DisplaySurface.cpp",
"src/DumpHelpers.cpp",
- "src/FodExtension.cpp",
"src/HwcBufferCache.cpp",
"src/Layer.cpp",
"src/LayerCompositionState.cpp",
@@ -57,15 +56,6 @@ cc_library {
],
local_include_dirs: ["include"],
export_include_dirs: ["include"],
- product_variables: {
- lineage: {
- target_surfaceflinger_fod_lib: {
- cflags: ["-DTARGET_PROVIDES_FOD_LIB"],
- whole_static_libs: ["%s"],
- },
- },
- },
-
}
cc_library {
diff --git a/services/surfaceflinger/CompositionEngine/src/OutputLayer.cpp b/services/surfaceflinger/CompositionEngine/src/OutputLayer.cpp
index 985b598f1..5ce72b087 100644
--- a/services/surfaceflinger/CompositionEngine/src/OutputLayer.cpp
+++ b/services/surfaceflinger/CompositionEngine/src/OutputLayer.cpp
@@ -16,7 +16,6 @@
#include <android-base/stringprintf.h>
#include <compositionengine/CompositionEngine.h>
-#include <compositionengine/FodExtension.h>
#include <compositionengine/Layer.h>
#include <compositionengine/LayerFE.h>
#include <compositionengine/Output.h>
@@ -336,14 +335,7 @@ void OutputLayer::writeStateToHWC(bool includeGeometry) const {
static_cast<int32_t>(error));
}
- uint32_t z = mState.z;
- if (strcmp(mLayerFE->getDebugName(), FOD_LAYER_NAME) == 0) {
- z = getFodZOrder(z, false);
- } else if (strcmp(mLayerFE->getDebugName(), FOD_TOUCHED_LAYER_NAME) == 0) {
- z = getFodZOrder(z, true);
- }
-
- if (auto error = hwcLayer->setZOrder(z); error != HWC2::Error::None) {
+ if (auto error = hwcLayer->setZOrder(mState.z); error != HWC2::Error::None) {
ALOGE("[%s] Failed to set Z %u: %s (%d)", mLayerFE->getDebugName(), mState.z,
to_string(error).c_str(), static_cast<int32_t>(error));
}
--
2.17.1

119
patches/0001-Squashed-revert-of-LOS-FOD-implementation.patch
View File

@ -1,4 +1,4 @@
From 171f155e6519497027676482483b530305d21cd9 Mon Sep 17 00:00:00 2001 From 6d38ca2cea41942ef2e2168e7d00110d48e37690 Mon Sep 17 00:00:00 2001
From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com> From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
Date: Wed, 5 Feb 2020 02:24:44 +0000 Date: Wed, 5 Feb 2020 02:24:44 +0000
Subject: [PATCH] Squashed revert of LOS FOD implementation Subject: [PATCH] Squashed revert of LOS FOD implementation
@ -13,14 +13,14 @@ Change-Id: Ifbcd5ff44c97e536fd2e417deadc2b08773b7b5e
.../res/drawable/fod_icon_default.xml | 25 - .../res/drawable/fod_icon_default.xml | 25 -
packages/SystemUI/res/values/config.xml | 1 - packages/SystemUI/res/values/config.xml | 1 -
.../SystemUI/res/values/lineage_config.xml | 4 - .../SystemUI/res/values/lineage_config.xml | 4 -
.../systemui/biometrics/FODCircleView.java | 454 ------------------ .../systemui/biometrics/FODCircleView.java | 465 ------------------
.../biometrics/FODCircleViewImpl.java | 62 --- .../biometrics/FODCircleViewImpl.java | 62 ---
.../systemui/statusbar/CommandQueue.java | 28 -- .../systemui/statusbar/CommandQueue.java | 28 --
services/core/Android.bp | 1 - services/core/Android.bp | 1 -
.../biometrics/BiometricServiceBase.java | 2 +- .../biometrics/BiometricServiceBase.java | 2 +-
.../fingerprint/FingerprintService.java | 112 ----- .../fingerprint/FingerprintService.java | 112 -----
.../statusbar/StatusBarManagerService.java | 22 - .../statusbar/StatusBarManagerService.java | 22 -
13 files changed, 1 insertion(+), 718 deletions(-) 13 files changed, 1 insertion(+), 729 deletions(-)
delete mode 100644 packages/SystemUI/res/drawable/fod_icon_default.xml delete mode 100644 packages/SystemUI/res/drawable/fod_icon_default.xml
delete mode 100644 packages/SystemUI/src/com/android/systemui/biometrics/FODCircleView.java delete mode 100644 packages/SystemUI/src/com/android/systemui/biometrics/FODCircleView.java
delete mode 100644 packages/SystemUI/src/com/android/systemui/biometrics/FODCircleViewImpl.java delete mode 100644 packages/SystemUI/src/com/android/systemui/biometrics/FODCircleViewImpl.java
@ -105,10 +105,10 @@ index 38e9d311128..00000000000
- android:pathData="M17.81,4.47c-0.08,0 -0.16,-0.02 -0.23,-0.06C15.66,3.42 14,3 12.01,3c-1.98,0 -3.86,0.47 -5.57,1.41 -0.24,0.13 -0.54,0.04 -0.68,-0.2 -0.13,-0.24 -0.04,-0.55 0.2,-0.68C7.82,2.52 9.86,2 12.01,2c2.13,0 3.99,0.47 6.03,1.52 0.25,0.13 0.34,0.43 0.21,0.67 -0.09,0.18 -0.26,0.28 -0.44,0.28zM3.5,9.72c-0.1,0 -0.2,-0.03 -0.29,-0.09 -0.23,-0.16 -0.28,-0.47 -0.12,-0.7 0.99,-1.4 2.25,-2.5 3.75,-3.27C9.98,4.04 14,4.03 17.15,5.65c1.5,0.77 2.76,1.86 3.75,3.25 0.16,0.22 0.11,0.54 -0.12,0.7 -0.23,0.16 -0.54,0.11 -0.7,-0.12 -0.9,-1.26 -2.04,-2.25 -3.39,-2.94 -2.87,-1.47 -6.54,-1.47 -9.4,0.01 -1.36,0.7 -2.5,1.7 -3.4,2.96 -0.08,0.14 -0.23,0.21 -0.39,0.21zM9.75,21.79c-0.13,0 -0.26,-0.05 -0.35,-0.15 -0.87,-0.87 -1.34,-1.43 -2.01,-2.64 -0.69,-1.23 -1.05,-2.73 -1.05,-4.34 0,-2.97 2.54,-5.39 5.66,-5.39s5.66,2.42 5.66,5.39c0,0.28 -0.22,0.5 -0.5,0.5s-0.5,-0.22 -0.5,-0.5c0,-2.42 -2.09,-4.39 -4.66,-4.39 -2.57,0 -4.66,1.97 -4.66,4.39 0,1.44 0.32,2.77 0.93,3.85 0.64,1.15 1.08,1.64 1.85,2.42 0.19,0.2 0.19,0.51 0,0.71 -0.11,0.1 -0.24,0.15 -0.37,0.15zM16.92,19.94c-1.19,0 -2.24,-0.3 -3.1,-0.89 -1.49,-1.01 -2.38,-2.65 -2.38,-4.39 0,-0.28 0.22,-0.5 0.5,-0.5s0.5,0.22 0.5,0.5c0,1.41 0.72,2.74 1.94,3.56 0.71,0.48 1.54,0.71 2.54,0.71 0.24,0 0.64,-0.03 1.04,-0.1 0.27,-0.05 0.53,0.13 0.58,0.41 0.05,0.27 -0.13,0.53 -0.41,0.58 -0.57,0.11 -1.07,0.12 -1.21,0.12zM14.91,22c-0.04,0 -0.09,-0.01 -0.13,-0.02 -1.59,-0.44 -2.63,-1.03 -3.72,-2.1 -1.4,-1.39 -2.17,-3.24 -2.17,-5.22 0,-1.62 1.38,-2.94 3.08,-2.94 1.7,0 3.08,1.32 3.08,2.94 0,1.07 0.93,1.94 2.08,1.94s2.08,-0.87 2.08,-1.94c0,-3.77 -3.25,-6.83 -7.25,-6.83 -2.84,0 -5.44,1.58 -6.61,4.03 -0.39,0.81 -0.59,1.76 -0.59,2.8 0,0.78 0.07,2.01 0.67,3.61 0.1,0.26 -0.03,0.55 -0.29,0.64 -0.26,0.1 -0.55,-0.04 -0.64,-0.29 -0.49,-1.31 -0.73,-2.61 -0.73,-3.96 0,-1.2 0.23,-2.29 0.68,-3.24 1.33,-2.79 4.28,-4.6 7.51,-4.6 4.55,0 8.25,3.51 8.25,7.83 0,1.62 -1.38,2.94 -3.08,2.94s-3.08,-1.32 -3.08,-2.94c0,-1.07 -0.93,-1.94 -2.08,-1.94s-2.08,0.87 -2.08,1.94c0,1.71 0.66,3.31 1.87,4.51 0.95,0.94 1.86,1.46 3.27,1.85 0.27,0.07 0.42,0.35 0.35,0.61 -0.05,0.23 -0.26,0.38 -0.47,0.38z" /> - android:pathData="M17.81,4.47c-0.08,0 -0.16,-0.02 -0.23,-0.06C15.66,3.42 14,3 12.01,3c-1.98,0 -3.86,0.47 -5.57,1.41 -0.24,0.13 -0.54,0.04 -0.68,-0.2 -0.13,-0.24 -0.04,-0.55 0.2,-0.68C7.82,2.52 9.86,2 12.01,2c2.13,0 3.99,0.47 6.03,1.52 0.25,0.13 0.34,0.43 0.21,0.67 -0.09,0.18 -0.26,0.28 -0.44,0.28zM3.5,9.72c-0.1,0 -0.2,-0.03 -0.29,-0.09 -0.23,-0.16 -0.28,-0.47 -0.12,-0.7 0.99,-1.4 2.25,-2.5 3.75,-3.27C9.98,4.04 14,4.03 17.15,5.65c1.5,0.77 2.76,1.86 3.75,3.25 0.16,0.22 0.11,0.54 -0.12,0.7 -0.23,0.16 -0.54,0.11 -0.7,-0.12 -0.9,-1.26 -2.04,-2.25 -3.39,-2.94 -2.87,-1.47 -6.54,-1.47 -9.4,0.01 -1.36,0.7 -2.5,1.7 -3.4,2.96 -0.08,0.14 -0.23,0.21 -0.39,0.21zM9.75,21.79c-0.13,0 -0.26,-0.05 -0.35,-0.15 -0.87,-0.87 -1.34,-1.43 -2.01,-2.64 -0.69,-1.23 -1.05,-2.73 -1.05,-4.34 0,-2.97 2.54,-5.39 5.66,-5.39s5.66,2.42 5.66,5.39c0,0.28 -0.22,0.5 -0.5,0.5s-0.5,-0.22 -0.5,-0.5c0,-2.42 -2.09,-4.39 -4.66,-4.39 -2.57,0 -4.66,1.97 -4.66,4.39 0,1.44 0.32,2.77 0.93,3.85 0.64,1.15 1.08,1.64 1.85,2.42 0.19,0.2 0.19,0.51 0,0.71 -0.11,0.1 -0.24,0.15 -0.37,0.15zM16.92,19.94c-1.19,0 -2.24,-0.3 -3.1,-0.89 -1.49,-1.01 -2.38,-2.65 -2.38,-4.39 0,-0.28 0.22,-0.5 0.5,-0.5s0.5,0.22 0.5,0.5c0,1.41 0.72,2.74 1.94,3.56 0.71,0.48 1.54,0.71 2.54,0.71 0.24,0 0.64,-0.03 1.04,-0.1 0.27,-0.05 0.53,0.13 0.58,0.41 0.05,0.27 -0.13,0.53 -0.41,0.58 -0.57,0.11 -1.07,0.12 -1.21,0.12zM14.91,22c-0.04,0 -0.09,-0.01 -0.13,-0.02 -1.59,-0.44 -2.63,-1.03 -3.72,-2.1 -1.4,-1.39 -2.17,-3.24 -2.17,-5.22 0,-1.62 1.38,-2.94 3.08,-2.94 1.7,0 3.08,1.32 3.08,2.94 0,1.07 0.93,1.94 2.08,1.94s2.08,-0.87 2.08,-1.94c0,-3.77 -3.25,-6.83 -7.25,-6.83 -2.84,0 -5.44,1.58 -6.61,4.03 -0.39,0.81 -0.59,1.76 -0.59,2.8 0,0.78 0.07,2.01 0.67,3.61 0.1,0.26 -0.03,0.55 -0.29,0.64 -0.26,0.1 -0.55,-0.04 -0.64,-0.29 -0.49,-1.31 -0.73,-2.61 -0.73,-3.96 0,-1.2 0.23,-2.29 0.68,-3.24 1.33,-2.79 4.28,-4.6 7.51,-4.6 4.55,0 8.25,3.51 8.25,7.83 0,1.62 -1.38,2.94 -3.08,2.94s-3.08,-1.32 -3.08,-2.94c0,-1.07 -0.93,-1.94 -2.08,-1.94s-2.08,0.87 -2.08,1.94c0,1.71 0.66,3.31 1.87,4.51 0.95,0.94 1.86,1.46 3.27,1.85 0.27,0.07 0.42,0.35 0.35,0.61 -0.05,0.23 -0.26,0.38 -0.47,0.38z" />
-</vector> -</vector>
diff --git a/packages/SystemUI/res/values/config.xml b/packages/SystemUI/res/values/config.xml diff --git a/packages/SystemUI/res/values/config.xml b/packages/SystemUI/res/values/config.xml
index 13a0ec2b5ab..139906a2641 100644 index f99dc023a9f..e6e47457749 100644
--- a/packages/SystemUI/res/values/config.xml --- a/packages/SystemUI/res/values/config.xml
+++ b/packages/SystemUI/res/values/config.xml +++ b/packages/SystemUI/res/values/config.xml
@@ -292,7 +292,6 @@ @@ -300,7 +300,6 @@
<item>com.android.systemui.globalactions.GlobalActionsComponent</item> <item>com.android.systemui.globalactions.GlobalActionsComponent</item>
<item>com.android.systemui.ScreenDecorations</item> <item>com.android.systemui.ScreenDecorations</item>
<item>com.android.systemui.biometrics.BiometricDialogImpl</item> <item>com.android.systemui.biometrics.BiometricDialogImpl</item>
@ -133,10 +133,10 @@ index fd732a7127a..e520306aa78 100644
<integer name="config_maxVisibleNotificationIconsOnLock">5</integer> <integer name="config_maxVisibleNotificationIconsOnLock">5</integer>
diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/FODCircleView.java b/packages/SystemUI/src/com/android/systemui/biometrics/FODCircleView.java diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/FODCircleView.java b/packages/SystemUI/src/com/android/systemui/biometrics/FODCircleView.java
deleted file mode 100644 deleted file mode 100644
index 6be2fef143d..00000000000 index a1691b9cb69..00000000000
--- a/packages/SystemUI/src/com/android/systemui/biometrics/FODCircleView.java --- a/packages/SystemUI/src/com/android/systemui/biometrics/FODCircleView.java
+++ /dev/null +++ /dev/null
@@ -1,454 +0,0 @@ @@ -1,465 +0,0 @@
-/** -/**
- * Copyright (C) 2019 The Android Open Source Project - * Copyright (C) 2019 The Android Open Source Project
- * - *
@ -196,8 +196,10 @@ index 6be2fef143d..00000000000
- private final int mDreamingMaxOffset; - private final int mDreamingMaxOffset;
- private final int mNavigationBarSize; - private final int mNavigationBarSize;
- private final boolean mShouldBoostBrightness; - private final boolean mShouldBoostBrightness;
- private final Paint mPaintFingerprintBackground = new Paint();
- private final Paint mPaintFingerprint = new Paint(); - private final Paint mPaintFingerprint = new Paint();
- private final WindowManager.LayoutParams mParams = new WindowManager.LayoutParams(); - private final WindowManager.LayoutParams mParams = new WindowManager.LayoutParams();
- private final WindowManager.LayoutParams mPressedParams = new WindowManager.LayoutParams();
- private final WindowManager mWindowManager; - private final WindowManager mWindowManager;
- -
- private IFingerprintInscreen mFingerprintInscreenDaemon; - private IFingerprintInscreen mFingerprintInscreenDaemon;
@ -210,13 +212,12 @@ index 6be2fef143d..00000000000
- -
- private boolean mIsBouncer; - private boolean mIsBouncer;
- private boolean mIsDreaming; - private boolean mIsDreaming;
- private boolean mIsShowing;
- private boolean mIsCircleShowing; - private boolean mIsCircleShowing;
- -
- private float mCurrentDimAmount = 0.0f;
-
- private Handler mHandler; - private Handler mHandler;
- -
- private final ImageView mPressedView;
-
- private LockPatternUtils mLockPatternUtils; - private LockPatternUtils mLockPatternUtils;
- -
- private Timer mBurnInProtectionTimer; - private Timer mBurnInProtectionTimer;
@ -299,10 +300,12 @@ index 6be2fef143d..00000000000
- Resources res = context.getResources(); - Resources res = context.getResources();
- -
- mColor = res.getColor(R.color.config_fodColor); - mColor = res.getColor(R.color.config_fodColor);
- mColorBackground = res.getColor(R.color.config_fodColorBackground); - mPaintFingerprint.setColor(mColor);
-
- mPaintFingerprint.setAntiAlias(true); - mPaintFingerprint.setAntiAlias(true);
- mPaintFingerprint.setColor(mColorBackground); -
- mColorBackground = res.getColor(R.color.config_fodColorBackground);
- mPaintFingerprintBackground.setColor(mColorBackground);
- mPaintFingerprintBackground.setAntiAlias(true);
- -
- mWindowManager = context.getSystemService(WindowManager.class); - mWindowManager = context.getSystemService(WindowManager.class);
- -
@ -316,14 +319,28 @@ index 6be2fef143d..00000000000
- mParams.width = mSize; - mParams.width = mSize;
- mParams.format = PixelFormat.TRANSLUCENT; - mParams.format = PixelFormat.TRANSLUCENT;
- -
- mParams.setTitle("Fingerprint on display");
- mParams.packageName = "android"; - mParams.packageName = "android";
- mParams.type = WindowManager.LayoutParams.TYPE_DISPLAY_OVERLAY; - mParams.type = WindowManager.LayoutParams.TYPE_DISPLAY_OVERLAY;
- mParams.flags = WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE | - mParams.flags = WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE |
- WindowManager.LayoutParams.FLAG_DIM_BEHIND |
- WindowManager.LayoutParams.FLAG_LAYOUT_IN_SCREEN; - WindowManager.LayoutParams.FLAG_LAYOUT_IN_SCREEN;
- mParams.gravity = Gravity.TOP | Gravity.LEFT; - mParams.gravity = Gravity.TOP | Gravity.LEFT;
- -
- mPressedParams.copyFrom(mParams);
- mPressedParams.flags |= WindowManager.LayoutParams.FLAG_DIM_BEHIND;
-
- mParams.setTitle("Fingerprint on display");
- mPressedParams.setTitle("Fingerprint on display.touched");
-
- mPressedView = new ImageView(context) {
- @Override
- protected void onDraw(Canvas canvas) {
- if (mIsCircleShowing) {
- canvas.drawCircle(mSize / 2, mSize / 2, mSize / 2.0f, mPaintFingerprint);
- }
- super.onDraw(canvas);
- }
- };
-
- mWindowManager.addView(this, mParams); - mWindowManager.addView(this, mParams);
- -
- updatePosition(); - updatePosition();
@ -333,21 +350,13 @@ index 6be2fef143d..00000000000
- -
- mUpdateMonitor = KeyguardUpdateMonitor.getInstance(context); - mUpdateMonitor = KeyguardUpdateMonitor.getInstance(context);
- mUpdateMonitor.registerCallback(mMonitorCallback); - mUpdateMonitor.registerCallback(mMonitorCallback);
-
- getViewTreeObserver().addOnGlobalLayoutListener(() -> {
- float drawingDimAmount = mParams.dimAmount;
- if (mCurrentDimAmount == 0.0f && drawingDimAmount > 0.0f) {
- dispatchPress();
- mCurrentDimAmount = drawingDimAmount;
- } else if (mCurrentDimAmount > 0.0f && drawingDimAmount == 0.0f) {
- mCurrentDimAmount = drawingDimAmount;
- }
- });
- } - }
- -
- @Override - @Override
- protected void onDraw(Canvas canvas) { - protected void onDraw(Canvas canvas) {
- canvas.drawCircle(mSize / 2, mSize / 2, mSize / 2.0f, mPaintFingerprint); - if (!mIsCircleShowing) {
- canvas.drawCircle(mSize / 2, mSize / 2, mSize / 2.0f, mPaintFingerprintBackground);
- }
- super.onDraw(canvas); - super.onDraw(canvas);
- } - }
- -
@ -435,9 +444,8 @@ index 6be2fef143d..00000000000
- setKeepScreenOn(true); - setKeepScreenOn(true);
- -
- setDim(true); - setDim(true);
- updateAlpha(); - dispatchPress();
- -
- mPaintFingerprint.setColor(mColor);
- setImageDrawable(null); - setImageDrawable(null);
- invalidate(); - invalidate();
- } - }
@ -445,14 +453,11 @@ index 6be2fef143d..00000000000
- public void hideCircle() { - public void hideCircle() {
- mIsCircleShowing = false; - mIsCircleShowing = false;
- -
- mPaintFingerprint.setColor(mColorBackground);
- setImageResource(R.drawable.fod_icon_default); - setImageResource(R.drawable.fod_icon_default);
- invalidate(); - invalidate();
- -
- dispatchRelease(); - dispatchRelease();
-
- setDim(false); - setDim(false);
- updateAlpha();
- -
- setKeepScreenOn(false); - setKeepScreenOn(false);
- } - }
@ -468,8 +473,6 @@ index 6be2fef143d..00000000000
- return; - return;
- } - }
- -
- mIsShowing = true;
-
- updatePosition(); - updatePosition();
- -
- dispatchShow(); - dispatchShow();
@ -477,19 +480,13 @@ index 6be2fef143d..00000000000
- } - }
- -
- public void hide() { - public void hide() {
- mIsShowing = false;
-
- setVisibility(View.GONE); - setVisibility(View.GONE);
- hideCircle(); - hideCircle();
- dispatchHide(); - dispatchHide();
- } - }
- -
- private void updateAlpha() { - private void updateAlpha() {
- if (mIsCircleShowing) { - setAlpha(mIsDreaming ? 0.5f : 1.0f);
- setAlpha(1.0f);
- } else {
- setAlpha(mIsDreaming ? 0.5f : 1.0f);
- }
- } - }
- -
- private void updatePosition() { - private void updatePosition() {
@ -499,33 +496,41 @@ index 6be2fef143d..00000000000
- defaultDisplay.getRealSize(size); - defaultDisplay.getRealSize(size);
- -
- int rotation = defaultDisplay.getRotation(); - int rotation = defaultDisplay.getRotation();
- int x, y;
- switch (rotation) { - switch (rotation) {
- case Surface.ROTATION_0: - case Surface.ROTATION_0:
- mParams.x = mPositionX; - x = mPositionX;
- mParams.y = mPositionY; - y = mPositionY;
- break; - break;
- case Surface.ROTATION_90: - case Surface.ROTATION_90:
- mParams.x = mPositionY; - x = mPositionY;
- mParams.y = mPositionX; - y = mPositionX;
- break; - break;
- case Surface.ROTATION_180: - case Surface.ROTATION_180:
- mParams.x = mPositionX; - x = mPositionX;
- mParams.y = size.y - mPositionY - mSize; - y = size.y - mPositionY - mSize;
- break; - break;
- case Surface.ROTATION_270: - case Surface.ROTATION_270:
- mParams.x = size.x - mPositionY - mSize - mNavigationBarSize; - x = size.x - mPositionY - mSize - mNavigationBarSize;
- mParams.y = mPositionX; - y = mPositionX;
- break; - break;
- default: - default:
- throw new IllegalArgumentException("Unknown rotation: " + rotation); - throw new IllegalArgumentException("Unknown rotation: " + rotation);
- } - }
- -
- mPressedParams.x = mParams.x = x;
- mPressedParams.y = mParams.y = y;
-
- if (mIsDreaming) { - if (mIsDreaming) {
- mParams.x += mDreamingOffsetX; - mParams.x += mDreamingOffsetX;
- mParams.y += mDreamingOffsetY; - mParams.y += mDreamingOffsetY;
- } - }
- -
- mWindowManager.updateViewLayout(this, mParams); - mWindowManager.updateViewLayout(this, mParams);
-
- if (mPressedView.getParent() != null) {
- mWindowManager.updateViewLayout(mPressedView, mPressedParams);
- }
- } - }
- -
- private void setDim(boolean dim) { - private void setDim(boolean dim) {
@ -542,16 +547,22 @@ index 6be2fef143d..00000000000
- } - }
- -
- if (mShouldBoostBrightness) { - if (mShouldBoostBrightness) {
- mParams.screenBrightness = 1.0f; - mPressedParams.screenBrightness = 1.0f;
- } - }
- -
- mParams.dimAmount = dimAmount / 255.0f; - mPressedParams.dimAmount = dimAmount / 255.0f;
- if (mPressedView.getParent() == null) {
- mWindowManager.addView(mPressedView, mPressedParams);
- } else {
- mWindowManager.updateViewLayout(mPressedView, mPressedParams);
- }
- } else { - } else {
- mParams.screenBrightness = 0.0f; - mPressedParams.screenBrightness = 0.0f;
- mParams.dimAmount = 0.0f; - mPressedParams.dimAmount = 0.0f;
- if (mPressedView.getParent() != null) {
- mWindowManager.removeView(mPressedView);
- }
- } - }
-
- mWindowManager.updateViewLayout(this, mParams);
- } - }
- -
- private boolean isPinOrPattern(int userId) { - private boolean isPinOrPattern(int userId) {

21
patches/0001-UI-Revive-navbar-layout-tuning-via-sysui_nav_bar-tun.patch
View File

@ -1,4 +1,4 @@
From 9a0fea3a8fa45f4fd804f06eaa0a39a044ecb0d8 Mon Sep 17 00:00:00 2001 From 6642bca8a784f2a65cde080935878c830e383ffd Mon Sep 17 00:00:00 2001
From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com> From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
Date: Sun, 3 Nov 2019 03:32:02 +0000 Date: Sun, 3 Nov 2019 03:32:02 +0000
Subject: [PATCH] UI: Revive navbar layout tuning via sysui_nav_bar tunable Subject: [PATCH] UI: Revive navbar layout tuning via sysui_nav_bar tunable
@ -8,23 +8,22 @@ This partially undoes https://github.com/LineageOS/android_frameworks_base/commi
Change-Id: I7a0fcfc9c27a08100712200d50f295f4bd81494d Change-Id: I7a0fcfc9c27a08100712200d50f295f4bd81494d
--- ---
.../systemui/statusbar/phone/NavigationBarInflaterView.java | 6 ++++-- .../systemui/statusbar/phone/NavigationBarInflaterView.java | 5 ++++-
1 file changed, 4 insertions(+), 2 deletions(-) 1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarInflaterView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarInflaterView.java diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarInflaterView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarInflaterView.java
index 79a47af9fdf..50b3a47b6fa 100644 index db58e1364b3..9ebeab07f11 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarInflaterView.java --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarInflaterView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarInflaterView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarInflaterView.java
@@ -155,7 +155,7 @@ public class NavigationBarInflaterView extends FrameLayout @@ -173,6 +173,7 @@ public class NavigationBarInflaterView extends FrameLayout
@Override
protected void onAttachedToWindow() {
super.onAttachedToWindow(); super.onAttachedToWindow();
- Dependency.get(TunerService.class).addTunable(this, NAV_BAR_INVERSE); Dependency.get(TunerService.class).addTunable(this, NAV_BAR_INVERSE);
+ Dependency.get(TunerService.class).addTunable(this, NAV_BAR_VIEWS, NAV_BAR_INVERSE); Dependency.get(TunerService.class).addTunable(this, KEY_NAVIGATION_HINT);
+ Dependency.get(TunerService.class).addTunable(this, NAV_BAR_VIEWS);
} }
@Override @Override
@@ -167,7 +167,9 @@ public class NavigationBarInflaterView extends FrameLayout @@ -184,7 +185,9 @@ public class NavigationBarInflaterView extends FrameLayout
@Override @Override
public void onTuningChanged(String key, String newValue) { public void onTuningChanged(String key, String newValue) {
@ -34,7 +33,7 @@ index 79a47af9fdf..50b3a47b6fa 100644
+ } else if (NAV_BAR_INVERSE.equals(key)) { + } else if (NAV_BAR_INVERSE.equals(key)) {
mInverseLayout = TunerService.parseIntegerSwitch(newValue, false); mInverseLayout = TunerService.parseIntegerSwitch(newValue, false);
updateLayoutInversion(); updateLayoutInversion();
} } else if (KEY_NAVIGATION_HINT.equals(key)) {
-- --
2.17.1 2.17.1