Merge branch 'master' into add-mi8-redmi6

This commit is contained in:
Pierre-Hugues HUSSON 2018-12-26 20:54:27 +01:00 committed by GitHub
commit 84149d2923
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
17 changed files with 244 additions and 10 deletions

8
LG/V40/Android.mk Normal file
View file

@ -0,0 +1,8 @@
LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
LOCAL_MODULE_TAGS := optional
LOCAL_PACKAGE_NAME := treble-overlay-lg-v40
LOCAL_MODULE_PATH := $(TARGET_OUT)/overlay
LOCAL_IS_RUNTIME_RESOURCE_OVERLAY := true
LOCAL_PRIVATE_PLATFORM_APIS := true
include $(BUILD_PACKAGE)

View file

@ -0,0 +1,10 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="me.phh.treble.overlay.lg.v40"
android:versionCode="1"
android:versionName="1.0">
<overlay android:targetPackage="android"
android:requiredSystemPropertyName="ro.vendor.build.fingerprint"
android:requiredSystemPropertyValue="+lge/judypn*"
android:priority="54"
android:isStatic="true" />
</manifest>

View file

@ -0,0 +1,22 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
/*
** Copyright 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.
*/
-->
<resources>
<!-- Height of the status bar -->
<dimen name="status_bar_height">24dp</dimen>
</resources>

View file

@ -0,0 +1,27 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
/*
** Copyright 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.
*/
-->
<resources>
<!-- Height of the status bar in portrait -->
<dimen name="status_bar_height_portrait">94px</dimen>
<!-- Height of the status bar -->
<dimen name="status_bar_height">94px</dimen>
<!-- Height of the status bar in landscape -->
<dimen name="status_bar_height_landscape">24dp</dimen>
<string translatable="false" name="config_mainBuiltInDisplayCutout">M -250,0 L -250,94 L 250,94 L 250,0 Z</string>
</resources>

View file

@ -18,10 +18,10 @@
-->
<resources>
<!-- Height of the status bar in portrait -->
<dimen name="status_bar_height_portrait">110px</dimen>
<dimen name="status_bar_height_portrait">88px</dimen>
<!-- Height of the status bar -->
<dimen name="status_bar_height">110px</dimen>
<dimen name="status_bar_height">88px</dimen>
<!-- Height of the status bar in landscape -->
<dimen name="status_bar_height_landscape">24dp</dimen>
<string translatable="false" name="config_mainBuiltInDisplayCutout">M -295,0 L -295,88 L 295,88 L 295,0 Z</string>
</resources>
</resources>

View file

@ -18,10 +18,10 @@
-->
<resources>
<!-- Height of the status bar in portrait -->
<dimen name="status_bar_height_portrait">110px</dimen>
<dimen name="status_bar_height_portrait">88px</dimen>
<!-- Height of the status bar -->
<dimen name="status_bar_height">110px</dimen>
<dimen name="status_bar_height">88px</dimen>
<!-- Height of the status bar in landscape -->
<dimen name="status_bar_height_landscape">24dp</dimen>
<string translatable="false" name="config_mainBuiltInDisplayCutout">M -295,0 L -295,88 L 295,88 L 295,0 Z</string>
</resources>
</resources>

View file

@ -18,9 +18,10 @@
-->
<resources>
<!-- Height of the status bar in portrait -->
<dimen name="status_bar_height_portrait">110px</dimen>
<dimen name="status_bar_height_portrait">81px</dimen>
<!-- Height of the status bar -->
<dimen name="status_bar_height">110px</dimen>
<dimen name="status_bar_height">81px</dimen>
<!-- Height of the status bar in landscape -->
<dimen name="status_bar_height_landscape">24dp</dimen>
<string translatable="false" name="config_mainBuiltInDisplayCutout">M -160,0 L -160,81 L 160,81 L 160,0 Z</string>
</resources>

View file

@ -0,0 +1,22 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
/*
** Copyright 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.
*/
-->
<resources>
<!-- Height of the status bar -->
<dimen name="status_bar_height">24dp</dimen>
</resources>

View file

@ -0,0 +1,27 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
/*
** Copyright 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.
*/
-->
<resources>
<!-- Height of the status bar in portrait -->
<dimen name="status_bar_height_portrait">88px</dimen>
<!-- Height of the status bar -->
<dimen name="status_bar_height">88px</dimen>
<!-- Height of the status bar in landscape -->
<dimen name="status_bar_height_landscape">24dp</dimen>
<string translatable="false" name="config_mainBuiltInDisplayCutout">M -295,0 L -295,88 L 295,88 L 295,0 Z</string>
</resources>

View file

@ -0,0 +1,6 @@
LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
LOCAL_MODULE_TAGS := optional
LOCAL_PACKAGE_NAME := treble-overlay-xiaomi-redminote6pro-systemui
LOCAL_PRIVATE_PLATFORM_APIS := true
include $(BUILD_PACKAGE)

View file

@ -0,0 +1,9 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="me.phh.treble.overlay.xiaomi.redminote6pro.systemui"
android:versionCode="1"
android:versionName="1.0">
<overlay android:targetPackage="com.android.systemui"
android:requiredSystemPropertyName="ro.vendor.build.fingerprint"
android:requiredSystemPropertyValue="+*iaomi/tulip*"
android:priority="56" />
</manifest>

View file

@ -0,0 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
* Copyright (c) 2006, 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>
<dimen name="rounded_corner_content_padding">46px</dimen>
</resources>

View file

@ -0,0 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
* Copyright (c) 2006, 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>
<dimen name="rounded_corner_content_padding">46px</dimen>
</resources>

View file

@ -0,0 +1,22 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
/*
** Copyright 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.
*/
-->
<resources>
<!-- Height of the status bar -->
<dimen name="status_bar_height">24dp</dimen>
</resources>

View file

@ -0,0 +1,29 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
/*
** Copyright 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.
*/
-->
<resources>
<!-- Height of the status bar in portrait -->
<dimen name="status_bar_height_portrait">88px</dimen>
<!-- Height of the status bar -->
<dimen name="status_bar_height">88px</dimen>
<!-- Height of the status bar in landscape -->
<dimen name="status_bar_height_landscape">24dp</dimen>
<string translatable="false" name="config_mainBuiltInDisplayCutout">M -280,0 L -280,88 L 280,88 L 280,0 Z</string>
<!-- Radius of the software rounded corners. -->
<dimen name="rounded_corner_radius">92px</dimen>
</resources>

13
build/build.sh Normal file → Executable file
View file

@ -2,8 +2,17 @@
set -e
export LD_LIBRARY_PATH=.
export PATH=$PATH:.
if [ "$1" == "--local-aapt" ];then
export LD_LIBRARY_PATH=.
export PATH=.:$PATH
shift
fi
if ! which aapt > /dev/null;then
export LD_LIBRARY_PATH=.
export PATH=$PATH:.
fi
if ! which aapt > /dev/null;then
echo "Please install aapt (apt install aapt should do)"
exit 1

View file

@ -25,6 +25,7 @@ PRODUCT_PACKAGES += \
treble-overlay-huawei-telephony \
treble-overlay-lenovo-z5 \
treble-overlay-lg-g7 \
treble-overlay-lg-v40 \
treble-overlay-moto-g6 \
treble-overlay-moto-g6plus \
treble-overlay-nokia-b2n \
@ -53,6 +54,7 @@ PRODUCT_PACKAGES += \
treble-overlay-xiaomi-redmi6pro \
treble-overlay-xiaomi-redminote5 \
treble-overlay-xiaomi-redminote6pro \
treble-overlay-xiaomi-redminote6pro-systemui \
treble-overlay-xiaomi-redmis2 \
PRODUCT_PACKAGES += \