Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 09c07c35 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "More options to mix floating and nav bar height overlays (1/2)"

parents c188069f 38f7a43d

CleanSpec.mk

+3 −0
Original line number Diff line number Diff line
@@ -248,6 +248,9 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/framework/com.android.mediad 
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/framework/com.android.location.provider.jar)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/framework/com.android.future.usb.accessory.jar)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/framework/com.android.media.remotedisplay.jar)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/overlay/ExperimentNavigationBarSlim)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/vendor/overlay/ExperimentNavigationBarSlim)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/vendor/overlay/ExperimentNavigationBarSlim)

# ******************************************************************

# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST ABOVE THIS BANNER

# ******************************************************************

packages/overlays/ExperimentNavigationBarDefaultOverlay/Android.mk

0 → 100644
+30 −0
Original line number Diff line number Diff line 
#

#  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 := ExperimentNavigationBarDefault

LOCAL_CERTIFICATE := platform



LOCAL_SRC_FILES := $(call all-subdir-java-files)



LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res



LOCAL_PACKAGE_NAME := ExperimentNavigationBarDefaultOverlay

LOCAL_SDK_VERSION := current



include $(BUILD_RRO_PACKAGE)
 
 No newline at end of file

packages/overlays/ExperimentNavigationBarDefaultOverlay/AndroidManifest.xml

0 → 100644
+27 −0
Original line number Diff line number Diff line 
<!--

/**

 * Copyright (c) 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.

 */

-->

<manifest xmlns:android="http://schemas.android.com/apk/res/android"

        package="com.android.internal.experiment.navbar.default"

        android:versionCode="1"

        android:versionName="1.0">

    <overlay android:targetPackage="android"

        android:category="com.android.internal.experiment_navbar_default"

        android:priority="1"/>



    <application android:label="@string/experiment_navigationbar_overlay" android:hasCode="false"/>

</manifest>
 
 No newline at end of file

packages/overlays/ExperimentNavigationBarSlimOverlay/res/values-as/strings.xml→packages/overlays/ExperimentNavigationBarDefaultOverlay/res/values/config.xml

+9 −8
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8"?>

<?xml version="1.0" encoding="utf-8"?>

<!--

/**

 * Copyright (c) 2018, The Android Open Source Project
@@ -16,8 +16,9 @@ 
 * limitations under the License.

 */

-->



<resources xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">

    <string name="experiment_navigationbar_overlay" msgid="6953777362606036161">"লাহী নেভিগে’শ্বন বাৰ সম্পৰীক্ষা"</string>

<resources>

    <!-- Height of the bottom navigation / system bar frame; navigation buttons height. -->

    <dimen name="navigation_bar_frame_width">48dp</dimen>

    <!-- Width of the navigation bar frame when it is placed vertically on the screen -->

    <dimen name="navigation_bar_frame_height">48dp</dimen>

</resources>
 
 No newline at end of file

packages/overlays/ExperimentNavigationBarSlimOverlay/res/values-gu/strings.xml→packages/overlays/ExperimentNavigationBarDefaultOverlay/res/values/strings.xml

+7 −8
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8"?>

<?xml version="1.0" encoding="utf-8"?>

<!--

/**

 * Copyright (c) 2018, The Android Open Source Project
@@ -16,8 +16,7 @@ 
 * limitations under the License.

 */

-->



<resources xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">

    <string name="experiment_navigationbar_overlay" msgid="6953777362606036161">"સ્લિમ નૅવિગેશન બારનો પ્રયોગ"</string>

<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">

    <!-- Name of overlay [CHAR LIMIT=64] -->

    <string name="experiment_navigationbar_overlay">Default Navigation Bar Experiment (48dp)</string>

</resources>
 
 No newline at end of file