From 38f7a43d46ead40c00662ea2348e62d18bf4c21c Mon Sep 17 00:00:00 2001 From: Matthew Ng Date: Tue, 27 Nov 2018 14:54:12 -0800 Subject: [PATCH] More options to mix floating and nav bar height overlays (1/2) Before slim buttons and floating were mutually exclusive, now they can both be enabled as overlays so floating with a slim nav height can occur. Bug: 112934365 Test: manual Change-Id: Ic6b3e1216e5395e71c72391f893182e263188572 --- CleanSpec.mk | 3 ++ .../Android.mk | 30 +++++++++++++++++++ .../AndroidManifest.xml | 27 +++++++++++++++++ .../res/values/config.xml} | 17 ++++++----- .../res/values}/strings.xml | 15 +++++----- .../AndroidManifest.xml | 2 +- .../res/values/config.xml | 4 --- .../Android.mk | 4 +-- .../AndroidManifest.xml | 4 +-- .../res/values-af/strings.xml | 0 .../res/values-am/strings.xml | 0 .../res/values-ar/strings.xml | 0 .../res/values-az/strings.xml | 0 .../res/values-b+sr+Latn/strings.xml | 0 .../res/values-be/strings.xml | 0 .../res/values-bg/strings.xml | 0 .../res/values-bs/strings.xml | 0 .../res/values-ca/strings.xml | 0 .../res/values-cs/strings.xml | 0 .../res/values-da/strings.xml | 0 .../res/values-de/strings.xml | 0 .../res/values-el/strings.xml | 0 .../res/values-en-rAU/strings.xml | 0 .../res/values-en-rCA/strings.xml | 0 .../res/values-en-rGB/strings.xml | 0 .../res/values-en-rIN/strings.xml | 0 .../res/values-en-rXC/strings.xml | 0 .../res/values-es-rUS/strings.xml | 0 .../res/values-es/strings.xml | 0 .../res/values-et/strings.xml | 0 .../res/values-eu/strings.xml | 0 .../res/values-fa/strings.xml | 0 .../res/values-fi/strings.xml | 0 .../res/values-fr-rCA/strings.xml | 0 .../res/values-fr/strings.xml | 0 .../res/values-gl/strings.xml | 0 .../res/values-hi/strings.xml | 0 .../res/values-hr/strings.xml | 0 .../res/values-hu/strings.xml | 0 .../res/values-hy/strings.xml | 0 .../res/values-in/strings.xml | 0 .../res/values-is/strings.xml | 0 .../res/values-it/strings.xml | 0 .../res/values-iw/strings.xml | 0 .../res/values-ja/strings.xml | 0 .../res/values-ka/strings.xml | 0 .../res/values-kk/strings.xml | 0 .../res/values-km/strings.xml | 0 .../res/values-ko/strings.xml | 0 .../res/values-ky/strings.xml | 0 .../res/values-lo/strings.xml | 0 .../res/values-lt/strings.xml | 0 .../res/values-lv/strings.xml | 0 .../res/values-mk/strings.xml | 0 .../res/values-mn/strings.xml | 0 .../res/values-mr/strings.xml | 0 .../res/values-ms/strings.xml | 0 .../res/values-my/strings.xml | 0 .../res/values-nb/strings.xml | 0 .../res/values-nl/strings.xml | 0 .../res/values-pl/strings.xml | 0 .../res/values-pt-rBR/strings.xml | 0 .../res/values-pt-rPT/strings.xml | 0 .../res/values-pt/strings.xml | 0 .../res/values-ro/strings.xml | 0 .../res/values-ru/strings.xml | 0 .../res/values-sk/strings.xml | 0 .../res/values-sl/strings.xml | 0 .../res/values-sq/strings.xml | 0 .../res/values-sr/strings.xml | 0 .../res/values-sv/strings.xml | 0 .../res/values-sw/strings.xml | 0 .../res/values-th/strings.xml | 0 .../res/values-tl/strings.xml | 0 .../res/values-tr/strings.xml | 0 .../res/values-uk/strings.xml | 0 .../res/values-ur/strings.xml | 0 .../res/values-uz/strings.xml | 0 .../res/values-vi/strings.xml | 0 .../res/values-zh-rCN/strings.xml | 0 .../res/values-zh-rHK/strings.xml | 0 .../res/values-zh-rTW/strings.xml | 0 .../res/values-zu/strings.xml | 0 .../res/values/config.xml | 8 ++--- .../res/values/strings.xml | 2 +- .../Android.mk | 30 +++++++++++++++++++ .../AndroidManifest.xml} | 18 ++++++----- .../res/values/config.xml | 28 +++++++++++++++++ .../res/values}/strings.xml | 15 +++++----- .../Android.mk | 30 +++++++++++++++++++ .../AndroidManifest.xml | 27 +++++++++++++++++ .../res/values/config.xml | 28 +++++++++++++++++ .../res/values}/strings.xml | 15 +++++----- .../res/values-kn/strings.xml | 23 -------------- .../res/values-ne/strings.xml | 23 -------------- .../res/values-or/strings.xml | 23 -------------- .../res/values-pa/strings.xml | 23 -------------- .../res/values-ta/strings.xml | 23 -------------- .../res/values-te/strings.xml | 23 -------------- 99 files changed, 254 insertions(+), 191 deletions(-) create mode 100644 packages/overlays/ExperimentNavigationBarDefaultOverlay/Android.mk create mode 100644 packages/overlays/ExperimentNavigationBarDefaultOverlay/AndroidManifest.xml rename packages/overlays/{ExperimentNavigationBarSlimOverlay/res/values-as/strings.xml => ExperimentNavigationBarDefaultOverlay/res/values/config.xml} (62%) rename packages/overlays/{ExperimentNavigationBarSlimOverlay/res/values-gu => ExperimentNavigationBarDefaultOverlay/res/values}/strings.xml (63%) rename packages/overlays/{ExperimentNavigationBarSlimOverlay => ExperimentNavigationBarSlim24Overlay}/Android.mk (85%) rename packages/overlays/{ExperimentNavigationBarSlimOverlay => ExperimentNavigationBarSlim24Overlay}/AndroidManifest.xml (92%) rename packages/overlays/{ExperimentNavigationBarSlimOverlay => ExperimentNavigationBarSlim24Overlay}/res/values-af/strings.xml (100%) rename packages/overlays/{ExperimentNavigationBarSlimOverlay => ExperimentNavigationBarSlim24Overlay}/res/values-am/strings.xml (100%) rename packages/overlays/{ExperimentNavigationBarSlimOverlay => ExperimentNavigationBarSlim24Overlay}/res/values-ar/strings.xml (100%) rename packages/overlays/{ExperimentNavigationBarSlimOverlay => ExperimentNavigationBarSlim24Overlay}/res/values-az/strings.xml (100%) rename packages/overlays/{ExperimentNavigationBarSlimOverlay => ExperimentNavigationBarSlim24Overlay}/res/values-b+sr+Latn/strings.xml (100%) rename packages/overlays/{ExperimentNavigationBarSlimOverlay => ExperimentNavigationBarSlim24Overlay}/res/values-be/strings.xml (100%) rename packages/overlays/{ExperimentNavigationBarSlimOverlay => ExperimentNavigationBarSlim24Overlay}/res/values-bg/strings.xml (100%) rename packages/overlays/{ExperimentNavigationBarSlimOverlay => ExperimentNavigationBarSlim24Overlay}/res/values-bs/strings.xml (100%) rename packages/overlays/{ExperimentNavigationBarSlimOverlay => ExperimentNavigationBarSlim24Overlay}/res/values-ca/strings.xml (100%) rename packages/overlays/{ExperimentNavigationBarSlimOverlay => ExperimentNavigationBarSlim24Overlay}/res/values-cs/strings.xml (100%) rename packages/overlays/{ExperimentNavigationBarSlimOverlay => ExperimentNavigationBarSlim24Overlay}/res/values-da/strings.xml (100%) rename packages/overlays/{ExperimentNavigationBarSlimOverlay => ExperimentNavigationBarSlim24Overlay}/res/values-de/strings.xml (100%) rename packages/overlays/{ExperimentNavigationBarSlimOverlay => ExperimentNavigationBarSlim24Overlay}/res/values-el/strings.xml (100%) rename packages/overlays/{ExperimentNavigationBarSlimOverlay => ExperimentNavigationBarSlim24Overlay}/res/values-en-rAU/strings.xml (100%) rename packages/overlays/{ExperimentNavigationBarSlimOverlay => ExperimentNavigationBarSlim24Overlay}/res/values-en-rCA/strings.xml (100%) rename packages/overlays/{ExperimentNavigationBarSlimOverlay => ExperimentNavigationBarSlim24Overlay}/res/values-en-rGB/strings.xml (100%) rename packages/overlays/{ExperimentNavigationBarSlimOverlay => ExperimentNavigationBarSlim24Overlay}/res/values-en-rIN/strings.xml (100%) rename packages/overlays/{ExperimentNavigationBarSlimOverlay => ExperimentNavigationBarSlim24Overlay}/res/values-en-rXC/strings.xml (100%) rename packages/overlays/{ExperimentNavigationBarSlimOverlay => ExperimentNavigationBarSlim24Overlay}/res/values-es-rUS/strings.xml (100%) rename packages/overlays/{ExperimentNavigationBarSlimOverlay => ExperimentNavigationBarSlim24Overlay}/res/values-es/strings.xml (100%) rename packages/overlays/{ExperimentNavigationBarSlimOverlay => ExperimentNavigationBarSlim24Overlay}/res/values-et/strings.xml (100%) rename packages/overlays/{ExperimentNavigationBarSlimOverlay => ExperimentNavigationBarSlim24Overlay}/res/values-eu/strings.xml (100%) rename packages/overlays/{ExperimentNavigationBarSlimOverlay => ExperimentNavigationBarSlim24Overlay}/res/values-fa/strings.xml (100%) rename packages/overlays/{ExperimentNavigationBarSlimOverlay => ExperimentNavigationBarSlim24Overlay}/res/values-fi/strings.xml (100%) rename packages/overlays/{ExperimentNavigationBarSlimOverlay => ExperimentNavigationBarSlim24Overlay}/res/values-fr-rCA/strings.xml (100%) rename packages/overlays/{ExperimentNavigationBarSlimOverlay => ExperimentNavigationBarSlim24Overlay}/res/values-fr/strings.xml (100%) rename packages/overlays/{ExperimentNavigationBarSlimOverlay => ExperimentNavigationBarSlim24Overlay}/res/values-gl/strings.xml (100%) rename packages/overlays/{ExperimentNavigationBarSlimOverlay => ExperimentNavigationBarSlim24Overlay}/res/values-hi/strings.xml (100%) rename packages/overlays/{ExperimentNavigationBarSlimOverlay => ExperimentNavigationBarSlim24Overlay}/res/values-hr/strings.xml (100%) rename packages/overlays/{ExperimentNavigationBarSlimOverlay => ExperimentNavigationBarSlim24Overlay}/res/values-hu/strings.xml (100%) rename packages/overlays/{ExperimentNavigationBarSlimOverlay => ExperimentNavigationBarSlim24Overlay}/res/values-hy/strings.xml (100%) rename packages/overlays/{ExperimentNavigationBarSlimOverlay => ExperimentNavigationBarSlim24Overlay}/res/values-in/strings.xml (100%) rename packages/overlays/{ExperimentNavigationBarSlimOverlay => ExperimentNavigationBarSlim24Overlay}/res/values-is/strings.xml (100%) rename packages/overlays/{ExperimentNavigationBarSlimOverlay => ExperimentNavigationBarSlim24Overlay}/res/values-it/strings.xml (100%) rename packages/overlays/{ExperimentNavigationBarSlimOverlay => ExperimentNavigationBarSlim24Overlay}/res/values-iw/strings.xml (100%) rename packages/overlays/{ExperimentNavigationBarSlimOverlay => ExperimentNavigationBarSlim24Overlay}/res/values-ja/strings.xml (100%) rename packages/overlays/{ExperimentNavigationBarSlimOverlay => ExperimentNavigationBarSlim24Overlay}/res/values-ka/strings.xml (100%) rename packages/overlays/{ExperimentNavigationBarSlimOverlay => ExperimentNavigationBarSlim24Overlay}/res/values-kk/strings.xml (100%) rename packages/overlays/{ExperimentNavigationBarSlimOverlay => ExperimentNavigationBarSlim24Overlay}/res/values-km/strings.xml (100%) rename packages/overlays/{ExperimentNavigationBarSlimOverlay => ExperimentNavigationBarSlim24Overlay}/res/values-ko/strings.xml (100%) rename packages/overlays/{ExperimentNavigationBarSlimOverlay => ExperimentNavigationBarSlim24Overlay}/res/values-ky/strings.xml (100%) rename packages/overlays/{ExperimentNavigationBarSlimOverlay => ExperimentNavigationBarSlim24Overlay}/res/values-lo/strings.xml (100%) rename packages/overlays/{ExperimentNavigationBarSlimOverlay => ExperimentNavigationBarSlim24Overlay}/res/values-lt/strings.xml (100%) rename packages/overlays/{ExperimentNavigationBarSlimOverlay => ExperimentNavigationBarSlim24Overlay}/res/values-lv/strings.xml (100%) rename packages/overlays/{ExperimentNavigationBarSlimOverlay => ExperimentNavigationBarSlim24Overlay}/res/values-mk/strings.xml (100%) rename packages/overlays/{ExperimentNavigationBarSlimOverlay => ExperimentNavigationBarSlim24Overlay}/res/values-mn/strings.xml (100%) rename packages/overlays/{ExperimentNavigationBarSlimOverlay => ExperimentNavigationBarSlim24Overlay}/res/values-mr/strings.xml (100%) rename packages/overlays/{ExperimentNavigationBarSlimOverlay => ExperimentNavigationBarSlim24Overlay}/res/values-ms/strings.xml (100%) rename packages/overlays/{ExperimentNavigationBarSlimOverlay => ExperimentNavigationBarSlim24Overlay}/res/values-my/strings.xml (100%) rename packages/overlays/{ExperimentNavigationBarSlimOverlay => ExperimentNavigationBarSlim24Overlay}/res/values-nb/strings.xml (100%) rename packages/overlays/{ExperimentNavigationBarSlimOverlay => ExperimentNavigationBarSlim24Overlay}/res/values-nl/strings.xml (100%) rename packages/overlays/{ExperimentNavigationBarSlimOverlay => ExperimentNavigationBarSlim24Overlay}/res/values-pl/strings.xml (100%) rename packages/overlays/{ExperimentNavigationBarSlimOverlay => ExperimentNavigationBarSlim24Overlay}/res/values-pt-rBR/strings.xml (100%) rename packages/overlays/{ExperimentNavigationBarSlimOverlay => ExperimentNavigationBarSlim24Overlay}/res/values-pt-rPT/strings.xml (100%) rename packages/overlays/{ExperimentNavigationBarSlimOverlay => ExperimentNavigationBarSlim24Overlay}/res/values-pt/strings.xml (100%) rename packages/overlays/{ExperimentNavigationBarSlimOverlay => ExperimentNavigationBarSlim24Overlay}/res/values-ro/strings.xml (100%) rename packages/overlays/{ExperimentNavigationBarSlimOverlay => ExperimentNavigationBarSlim24Overlay}/res/values-ru/strings.xml (100%) rename packages/overlays/{ExperimentNavigationBarSlimOverlay => ExperimentNavigationBarSlim24Overlay}/res/values-sk/strings.xml (100%) rename packages/overlays/{ExperimentNavigationBarSlimOverlay => ExperimentNavigationBarSlim24Overlay}/res/values-sl/strings.xml (100%) rename packages/overlays/{ExperimentNavigationBarSlimOverlay => ExperimentNavigationBarSlim24Overlay}/res/values-sq/strings.xml (100%) rename packages/overlays/{ExperimentNavigationBarSlimOverlay => ExperimentNavigationBarSlim24Overlay}/res/values-sr/strings.xml (100%) rename packages/overlays/{ExperimentNavigationBarSlimOverlay => ExperimentNavigationBarSlim24Overlay}/res/values-sv/strings.xml (100%) rename packages/overlays/{ExperimentNavigationBarSlimOverlay => ExperimentNavigationBarSlim24Overlay}/res/values-sw/strings.xml (100%) rename packages/overlays/{ExperimentNavigationBarSlimOverlay => ExperimentNavigationBarSlim24Overlay}/res/values-th/strings.xml (100%) rename packages/overlays/{ExperimentNavigationBarSlimOverlay => ExperimentNavigationBarSlim24Overlay}/res/values-tl/strings.xml (100%) rename packages/overlays/{ExperimentNavigationBarSlimOverlay => ExperimentNavigationBarSlim24Overlay}/res/values-tr/strings.xml (100%) rename packages/overlays/{ExperimentNavigationBarSlimOverlay => ExperimentNavigationBarSlim24Overlay}/res/values-uk/strings.xml (100%) rename packages/overlays/{ExperimentNavigationBarSlimOverlay => ExperimentNavigationBarSlim24Overlay}/res/values-ur/strings.xml (100%) rename packages/overlays/{ExperimentNavigationBarSlimOverlay => ExperimentNavigationBarSlim24Overlay}/res/values-uz/strings.xml (100%) rename packages/overlays/{ExperimentNavigationBarSlimOverlay => ExperimentNavigationBarSlim24Overlay}/res/values-vi/strings.xml (100%) rename packages/overlays/{ExperimentNavigationBarSlimOverlay => ExperimentNavigationBarSlim24Overlay}/res/values-zh-rCN/strings.xml (100%) rename packages/overlays/{ExperimentNavigationBarSlimOverlay => ExperimentNavigationBarSlim24Overlay}/res/values-zh-rHK/strings.xml (100%) rename packages/overlays/{ExperimentNavigationBarSlimOverlay => ExperimentNavigationBarSlim24Overlay}/res/values-zh-rTW/strings.xml (100%) rename packages/overlays/{ExperimentNavigationBarSlimOverlay => ExperimentNavigationBarSlim24Overlay}/res/values-zu/strings.xml (100%) rename packages/overlays/{ExperimentNavigationBarSlimOverlay => ExperimentNavigationBarSlim24Overlay}/res/values/config.xml (81%) rename packages/overlays/{ExperimentNavigationBarSlimOverlay => ExperimentNavigationBarSlim24Overlay}/res/values/strings.xml (94%) create mode 100644 packages/overlays/ExperimentNavigationBarSlim32Overlay/Android.mk rename packages/overlays/{ExperimentNavigationBarSlimOverlay/res/values-bn/strings.xml => ExperimentNavigationBarSlim32Overlay/AndroidManifest.xml} (57%) create mode 100644 packages/overlays/ExperimentNavigationBarSlim32Overlay/res/values/config.xml rename packages/overlays/{ExperimentNavigationBarSlimOverlay/res/values-si => ExperimentNavigationBarSlim32Overlay/res/values}/strings.xml (63%) create mode 100644 packages/overlays/ExperimentNavigationBarSlim40Overlay/Android.mk create mode 100644 packages/overlays/ExperimentNavigationBarSlim40Overlay/AndroidManifest.xml create mode 100644 packages/overlays/ExperimentNavigationBarSlim40Overlay/res/values/config.xml rename packages/overlays/{ExperimentNavigationBarSlimOverlay/res/values-ml => ExperimentNavigationBarSlim40Overlay/res/values}/strings.xml (63%) delete mode 100644 packages/overlays/ExperimentNavigationBarSlimOverlay/res/values-kn/strings.xml delete mode 100644 packages/overlays/ExperimentNavigationBarSlimOverlay/res/values-ne/strings.xml delete mode 100644 packages/overlays/ExperimentNavigationBarSlimOverlay/res/values-or/strings.xml delete mode 100644 packages/overlays/ExperimentNavigationBarSlimOverlay/res/values-pa/strings.xml delete mode 100644 packages/overlays/ExperimentNavigationBarSlimOverlay/res/values-ta/strings.xml delete mode 100644 packages/overlays/ExperimentNavigationBarSlimOverlay/res/values-te/strings.xml diff --git a/CleanSpec.mk b/CleanSpec.mk index 6deda0caa9aaa..478e4fe86d3b2 100644 --- a/CleanSpec.mk +++ b/CleanSpec.mk @@ -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 # ****************************************************************** diff --git a/packages/overlays/ExperimentNavigationBarDefaultOverlay/Android.mk b/packages/overlays/ExperimentNavigationBarDefaultOverlay/Android.mk new file mode 100644 index 0000000000000..ecad42097738b --- /dev/null +++ b/packages/overlays/ExperimentNavigationBarDefaultOverlay/Android.mk @@ -0,0 +1,30 @@ +# +# 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 diff --git a/packages/overlays/ExperimentNavigationBarDefaultOverlay/AndroidManifest.xml b/packages/overlays/ExperimentNavigationBarDefaultOverlay/AndroidManifest.xml new file mode 100644 index 0000000000000..1639fc5fc3022 --- /dev/null +++ b/packages/overlays/ExperimentNavigationBarDefaultOverlay/AndroidManifest.xml @@ -0,0 +1,27 @@ + + + + + + \ No newline at end of file diff --git a/packages/overlays/ExperimentNavigationBarSlimOverlay/res/values-as/strings.xml b/packages/overlays/ExperimentNavigationBarDefaultOverlay/res/values/config.xml similarity index 62% rename from packages/overlays/ExperimentNavigationBarSlimOverlay/res/values-as/strings.xml rename to packages/overlays/ExperimentNavigationBarDefaultOverlay/res/values/config.xml index 8cce57046c371..d8b69cde863b4 100644 --- a/packages/overlays/ExperimentNavigationBarSlimOverlay/res/values-as/strings.xml +++ b/packages/overlays/ExperimentNavigationBarDefaultOverlay/res/values/config.xml @@ -1,5 +1,5 @@ - - - - - "লাহী নেভিগে’শ্বন বাৰ সম্পৰীক্ষা" - +--> + + + 48dp + + 48dp + \ No newline at end of file diff --git a/packages/overlays/ExperimentNavigationBarSlimOverlay/res/values-gu/strings.xml b/packages/overlays/ExperimentNavigationBarDefaultOverlay/res/values/strings.xml similarity index 63% rename from packages/overlays/ExperimentNavigationBarSlimOverlay/res/values-gu/strings.xml rename to packages/overlays/ExperimentNavigationBarDefaultOverlay/res/values/strings.xml index 96418aec29bc7..c9332903be2ed 100644 --- a/packages/overlays/ExperimentNavigationBarSlimOverlay/res/values-gu/strings.xml +++ b/packages/overlays/ExperimentNavigationBarDefaultOverlay/res/values/strings.xml @@ -1,5 +1,5 @@ - - - - - "સ્લિમ નૅવિગેશન બારનો પ્રયોગ" - +--> + + + Default Navigation Bar Experiment (48dp) + \ No newline at end of file diff --git a/packages/overlays/ExperimentNavigationBarFloatingOverlay/AndroidManifest.xml b/packages/overlays/ExperimentNavigationBarFloatingOverlay/AndroidManifest.xml index b4b2b161ad71c..b4cc34f15af77 100644 --- a/packages/overlays/ExperimentNavigationBarFloatingOverlay/AndroidManifest.xml +++ b/packages/overlays/ExperimentNavigationBarFloatingOverlay/AndroidManifest.xml @@ -16,7 +16,7 @@ */ --> 0dp 0dp - - 48dp - - 48dp \ No newline at end of file diff --git a/packages/overlays/ExperimentNavigationBarSlimOverlay/Android.mk b/packages/overlays/ExperimentNavigationBarSlim24Overlay/Android.mk similarity index 85% rename from packages/overlays/ExperimentNavigationBarSlimOverlay/Android.mk rename to packages/overlays/ExperimentNavigationBarSlim24Overlay/Android.mk index e642a68f1a3a5..58cf134fd04d9 100644 --- a/packages/overlays/ExperimentNavigationBarSlimOverlay/Android.mk +++ b/packages/overlays/ExperimentNavigationBarSlim24Overlay/Android.mk @@ -17,14 +17,14 @@ LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) -LOCAL_RRO_THEME := ExperimentNavigationBarSlim +LOCAL_RRO_THEME := ExperimentNavigationBarSlim24 LOCAL_CERTIFICATE := platform LOCAL_SRC_FILES := $(call all-subdir-java-files) LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res -LOCAL_PACKAGE_NAME := ExperimentNavigationBarSlimOverlay +LOCAL_PACKAGE_NAME := ExperimentNavigationBarSlimOverlay24 LOCAL_SDK_VERSION := current include $(BUILD_RRO_PACKAGE) \ No newline at end of file diff --git a/packages/overlays/ExperimentNavigationBarSlimOverlay/AndroidManifest.xml b/packages/overlays/ExperimentNavigationBarSlim24Overlay/AndroidManifest.xml similarity index 92% rename from packages/overlays/ExperimentNavigationBarSlimOverlay/AndroidManifest.xml rename to packages/overlays/ExperimentNavigationBarSlim24Overlay/AndroidManifest.xml index a1bd58274fc0b..aee543a0b23b6 100644 --- a/packages/overlays/ExperimentNavigationBarSlimOverlay/AndroidManifest.xml +++ b/packages/overlays/ExperimentNavigationBarSlim24Overlay/AndroidManifest.xml @@ -16,11 +16,11 @@ */ --> diff --git a/packages/overlays/ExperimentNavigationBarSlimOverlay/res/values-af/strings.xml b/packages/overlays/ExperimentNavigationBarSlim24Overlay/res/values-af/strings.xml similarity index 100% rename from packages/overlays/ExperimentNavigationBarSlimOverlay/res/values-af/strings.xml rename to packages/overlays/ExperimentNavigationBarSlim24Overlay/res/values-af/strings.xml diff --git a/packages/overlays/ExperimentNavigationBarSlimOverlay/res/values-am/strings.xml b/packages/overlays/ExperimentNavigationBarSlim24Overlay/res/values-am/strings.xml similarity index 100% rename from packages/overlays/ExperimentNavigationBarSlimOverlay/res/values-am/strings.xml rename to packages/overlays/ExperimentNavigationBarSlim24Overlay/res/values-am/strings.xml diff --git a/packages/overlays/ExperimentNavigationBarSlimOverlay/res/values-ar/strings.xml b/packages/overlays/ExperimentNavigationBarSlim24Overlay/res/values-ar/strings.xml similarity index 100% rename from packages/overlays/ExperimentNavigationBarSlimOverlay/res/values-ar/strings.xml rename to packages/overlays/ExperimentNavigationBarSlim24Overlay/res/values-ar/strings.xml diff --git a/packages/overlays/ExperimentNavigationBarSlimOverlay/res/values-az/strings.xml b/packages/overlays/ExperimentNavigationBarSlim24Overlay/res/values-az/strings.xml similarity index 100% rename from packages/overlays/ExperimentNavigationBarSlimOverlay/res/values-az/strings.xml rename to packages/overlays/ExperimentNavigationBarSlim24Overlay/res/values-az/strings.xml diff --git a/packages/overlays/ExperimentNavigationBarSlimOverlay/res/values-b+sr+Latn/strings.xml b/packages/overlays/ExperimentNavigationBarSlim24Overlay/res/values-b+sr+Latn/strings.xml similarity index 100% rename from packages/overlays/ExperimentNavigationBarSlimOverlay/res/values-b+sr+Latn/strings.xml rename to packages/overlays/ExperimentNavigationBarSlim24Overlay/res/values-b+sr+Latn/strings.xml diff --git a/packages/overlays/ExperimentNavigationBarSlimOverlay/res/values-be/strings.xml b/packages/overlays/ExperimentNavigationBarSlim24Overlay/res/values-be/strings.xml similarity index 100% rename from packages/overlays/ExperimentNavigationBarSlimOverlay/res/values-be/strings.xml rename to packages/overlays/ExperimentNavigationBarSlim24Overlay/res/values-be/strings.xml diff --git a/packages/overlays/ExperimentNavigationBarSlimOverlay/res/values-bg/strings.xml b/packages/overlays/ExperimentNavigationBarSlim24Overlay/res/values-bg/strings.xml similarity index 100% rename from packages/overlays/ExperimentNavigationBarSlimOverlay/res/values-bg/strings.xml rename to packages/overlays/ExperimentNavigationBarSlim24Overlay/res/values-bg/strings.xml diff --git a/packages/overlays/ExperimentNavigationBarSlimOverlay/res/values-bs/strings.xml b/packages/overlays/ExperimentNavigationBarSlim24Overlay/res/values-bs/strings.xml similarity index 100% rename from packages/overlays/ExperimentNavigationBarSlimOverlay/res/values-bs/strings.xml rename to packages/overlays/ExperimentNavigationBarSlim24Overlay/res/values-bs/strings.xml diff --git a/packages/overlays/ExperimentNavigationBarSlimOverlay/res/values-ca/strings.xml b/packages/overlays/ExperimentNavigationBarSlim24Overlay/res/values-ca/strings.xml similarity index 100% rename from packages/overlays/ExperimentNavigationBarSlimOverlay/res/values-ca/strings.xml rename to packages/overlays/ExperimentNavigationBarSlim24Overlay/res/values-ca/strings.xml diff --git a/packages/overlays/ExperimentNavigationBarSlimOverlay/res/values-cs/strings.xml b/packages/overlays/ExperimentNavigationBarSlim24Overlay/res/values-cs/strings.xml similarity index 100% rename from packages/overlays/ExperimentNavigationBarSlimOverlay/res/values-cs/strings.xml rename to packages/overlays/ExperimentNavigationBarSlim24Overlay/res/values-cs/strings.xml diff --git a/packages/overlays/ExperimentNavigationBarSlimOverlay/res/values-da/strings.xml b/packages/overlays/ExperimentNavigationBarSlim24Overlay/res/values-da/strings.xml similarity index 100% rename from packages/overlays/ExperimentNavigationBarSlimOverlay/res/values-da/strings.xml rename to packages/overlays/ExperimentNavigationBarSlim24Overlay/res/values-da/strings.xml diff --git a/packages/overlays/ExperimentNavigationBarSlimOverlay/res/values-de/strings.xml b/packages/overlays/ExperimentNavigationBarSlim24Overlay/res/values-de/strings.xml similarity index 100% rename from packages/overlays/ExperimentNavigationBarSlimOverlay/res/values-de/strings.xml rename to packages/overlays/ExperimentNavigationBarSlim24Overlay/res/values-de/strings.xml diff --git a/packages/overlays/ExperimentNavigationBarSlimOverlay/res/values-el/strings.xml b/packages/overlays/ExperimentNavigationBarSlim24Overlay/res/values-el/strings.xml similarity index 100% rename from packages/overlays/ExperimentNavigationBarSlimOverlay/res/values-el/strings.xml rename to packages/overlays/ExperimentNavigationBarSlim24Overlay/res/values-el/strings.xml diff --git a/packages/overlays/ExperimentNavigationBarSlimOverlay/res/values-en-rAU/strings.xml b/packages/overlays/ExperimentNavigationBarSlim24Overlay/res/values-en-rAU/strings.xml similarity index 100% rename from packages/overlays/ExperimentNavigationBarSlimOverlay/res/values-en-rAU/strings.xml rename to packages/overlays/ExperimentNavigationBarSlim24Overlay/res/values-en-rAU/strings.xml diff --git a/packages/overlays/ExperimentNavigationBarSlimOverlay/res/values-en-rCA/strings.xml b/packages/overlays/ExperimentNavigationBarSlim24Overlay/res/values-en-rCA/strings.xml similarity index 100% rename from packages/overlays/ExperimentNavigationBarSlimOverlay/res/values-en-rCA/strings.xml rename to packages/overlays/ExperimentNavigationBarSlim24Overlay/res/values-en-rCA/strings.xml diff --git a/packages/overlays/ExperimentNavigationBarSlimOverlay/res/values-en-rGB/strings.xml b/packages/overlays/ExperimentNavigationBarSlim24Overlay/res/values-en-rGB/strings.xml similarity index 100% rename from packages/overlays/ExperimentNavigationBarSlimOverlay/res/values-en-rGB/strings.xml rename to packages/overlays/ExperimentNavigationBarSlim24Overlay/res/values-en-rGB/strings.xml diff --git a/packages/overlays/ExperimentNavigationBarSlimOverlay/res/values-en-rIN/strings.xml b/packages/overlays/ExperimentNavigationBarSlim24Overlay/res/values-en-rIN/strings.xml similarity index 100% rename from packages/overlays/ExperimentNavigationBarSlimOverlay/res/values-en-rIN/strings.xml rename to packages/overlays/ExperimentNavigationBarSlim24Overlay/res/values-en-rIN/strings.xml diff --git a/packages/overlays/ExperimentNavigationBarSlimOverlay/res/values-en-rXC/strings.xml b/packages/overlays/ExperimentNavigationBarSlim24Overlay/res/values-en-rXC/strings.xml similarity index 100% rename from packages/overlays/ExperimentNavigationBarSlimOverlay/res/values-en-rXC/strings.xml rename to packages/overlays/ExperimentNavigationBarSlim24Overlay/res/values-en-rXC/strings.xml diff --git a/packages/overlays/ExperimentNavigationBarSlimOverlay/res/values-es-rUS/strings.xml b/packages/overlays/ExperimentNavigationBarSlim24Overlay/res/values-es-rUS/strings.xml similarity index 100% rename from packages/overlays/ExperimentNavigationBarSlimOverlay/res/values-es-rUS/strings.xml rename to packages/overlays/ExperimentNavigationBarSlim24Overlay/res/values-es-rUS/strings.xml diff --git a/packages/overlays/ExperimentNavigationBarSlimOverlay/res/values-es/strings.xml b/packages/overlays/ExperimentNavigationBarSlim24Overlay/res/values-es/strings.xml similarity index 100% rename from packages/overlays/ExperimentNavigationBarSlimOverlay/res/values-es/strings.xml rename to packages/overlays/ExperimentNavigationBarSlim24Overlay/res/values-es/strings.xml diff --git a/packages/overlays/ExperimentNavigationBarSlimOverlay/res/values-et/strings.xml b/packages/overlays/ExperimentNavigationBarSlim24Overlay/res/values-et/strings.xml similarity index 100% rename from packages/overlays/ExperimentNavigationBarSlimOverlay/res/values-et/strings.xml rename to packages/overlays/ExperimentNavigationBarSlim24Overlay/res/values-et/strings.xml diff --git a/packages/overlays/ExperimentNavigationBarSlimOverlay/res/values-eu/strings.xml b/packages/overlays/ExperimentNavigationBarSlim24Overlay/res/values-eu/strings.xml similarity index 100% rename from packages/overlays/ExperimentNavigationBarSlimOverlay/res/values-eu/strings.xml rename to packages/overlays/ExperimentNavigationBarSlim24Overlay/res/values-eu/strings.xml diff --git a/packages/overlays/ExperimentNavigationBarSlimOverlay/res/values-fa/strings.xml b/packages/overlays/ExperimentNavigationBarSlim24Overlay/res/values-fa/strings.xml similarity index 100% rename from packages/overlays/ExperimentNavigationBarSlimOverlay/res/values-fa/strings.xml rename to packages/overlays/ExperimentNavigationBarSlim24Overlay/res/values-fa/strings.xml diff --git a/packages/overlays/ExperimentNavigationBarSlimOverlay/res/values-fi/strings.xml b/packages/overlays/ExperimentNavigationBarSlim24Overlay/res/values-fi/strings.xml similarity index 100% rename from packages/overlays/ExperimentNavigationBarSlimOverlay/res/values-fi/strings.xml rename to packages/overlays/ExperimentNavigationBarSlim24Overlay/res/values-fi/strings.xml diff --git a/packages/overlays/ExperimentNavigationBarSlimOverlay/res/values-fr-rCA/strings.xml b/packages/overlays/ExperimentNavigationBarSlim24Overlay/res/values-fr-rCA/strings.xml similarity index 100% rename from packages/overlays/ExperimentNavigationBarSlimOverlay/res/values-fr-rCA/strings.xml rename to packages/overlays/ExperimentNavigationBarSlim24Overlay/res/values-fr-rCA/strings.xml diff --git a/packages/overlays/ExperimentNavigationBarSlimOverlay/res/values-fr/strings.xml b/packages/overlays/ExperimentNavigationBarSlim24Overlay/res/values-fr/strings.xml similarity index 100% rename from packages/overlays/ExperimentNavigationBarSlimOverlay/res/values-fr/strings.xml rename to packages/overlays/ExperimentNavigationBarSlim24Overlay/res/values-fr/strings.xml diff --git a/packages/overlays/ExperimentNavigationBarSlimOverlay/res/values-gl/strings.xml b/packages/overlays/ExperimentNavigationBarSlim24Overlay/res/values-gl/strings.xml similarity index 100% rename from packages/overlays/ExperimentNavigationBarSlimOverlay/res/values-gl/strings.xml rename to packages/overlays/ExperimentNavigationBarSlim24Overlay/res/values-gl/strings.xml diff --git a/packages/overlays/ExperimentNavigationBarSlimOverlay/res/values-hi/strings.xml b/packages/overlays/ExperimentNavigationBarSlim24Overlay/res/values-hi/strings.xml similarity index 100% rename from packages/overlays/ExperimentNavigationBarSlimOverlay/res/values-hi/strings.xml rename to packages/overlays/ExperimentNavigationBarSlim24Overlay/res/values-hi/strings.xml diff --git a/packages/overlays/ExperimentNavigationBarSlimOverlay/res/values-hr/strings.xml b/packages/overlays/ExperimentNavigationBarSlim24Overlay/res/values-hr/strings.xml similarity index 100% rename from packages/overlays/ExperimentNavigationBarSlimOverlay/res/values-hr/strings.xml rename to packages/overlays/ExperimentNavigationBarSlim24Overlay/res/values-hr/strings.xml diff --git a/packages/overlays/ExperimentNavigationBarSlimOverlay/res/values-hu/strings.xml b/packages/overlays/ExperimentNavigationBarSlim24Overlay/res/values-hu/strings.xml similarity index 100% rename from packages/overlays/ExperimentNavigationBarSlimOverlay/res/values-hu/strings.xml rename to packages/overlays/ExperimentNavigationBarSlim24Overlay/res/values-hu/strings.xml diff --git a/packages/overlays/ExperimentNavigationBarSlimOverlay/res/values-hy/strings.xml b/packages/overlays/ExperimentNavigationBarSlim24Overlay/res/values-hy/strings.xml similarity index 100% rename from packages/overlays/ExperimentNavigationBarSlimOverlay/res/values-hy/strings.xml rename to packages/overlays/ExperimentNavigationBarSlim24Overlay/res/values-hy/strings.xml diff --git a/packages/overlays/ExperimentNavigationBarSlimOverlay/res/values-in/strings.xml b/packages/overlays/ExperimentNavigationBarSlim24Overlay/res/values-in/strings.xml similarity index 100% rename from packages/overlays/ExperimentNavigationBarSlimOverlay/res/values-in/strings.xml rename to packages/overlays/ExperimentNavigationBarSlim24Overlay/res/values-in/strings.xml diff --git a/packages/overlays/ExperimentNavigationBarSlimOverlay/res/values-is/strings.xml b/packages/overlays/ExperimentNavigationBarSlim24Overlay/res/values-is/strings.xml similarity index 100% rename from packages/overlays/ExperimentNavigationBarSlimOverlay/res/values-is/strings.xml rename to packages/overlays/ExperimentNavigationBarSlim24Overlay/res/values-is/strings.xml diff --git a/packages/overlays/ExperimentNavigationBarSlimOverlay/res/values-it/strings.xml b/packages/overlays/ExperimentNavigationBarSlim24Overlay/res/values-it/strings.xml similarity index 100% rename from packages/overlays/ExperimentNavigationBarSlimOverlay/res/values-it/strings.xml rename to packages/overlays/ExperimentNavigationBarSlim24Overlay/res/values-it/strings.xml diff --git a/packages/overlays/ExperimentNavigationBarSlimOverlay/res/values-iw/strings.xml b/packages/overlays/ExperimentNavigationBarSlim24Overlay/res/values-iw/strings.xml similarity index 100% rename from packages/overlays/ExperimentNavigationBarSlimOverlay/res/values-iw/strings.xml rename to packages/overlays/ExperimentNavigationBarSlim24Overlay/res/values-iw/strings.xml diff --git a/packages/overlays/ExperimentNavigationBarSlimOverlay/res/values-ja/strings.xml b/packages/overlays/ExperimentNavigationBarSlim24Overlay/res/values-ja/strings.xml similarity index 100% rename from packages/overlays/ExperimentNavigationBarSlimOverlay/res/values-ja/strings.xml rename to packages/overlays/ExperimentNavigationBarSlim24Overlay/res/values-ja/strings.xml diff --git a/packages/overlays/ExperimentNavigationBarSlimOverlay/res/values-ka/strings.xml b/packages/overlays/ExperimentNavigationBarSlim24Overlay/res/values-ka/strings.xml similarity index 100% rename from packages/overlays/ExperimentNavigationBarSlimOverlay/res/values-ka/strings.xml rename to packages/overlays/ExperimentNavigationBarSlim24Overlay/res/values-ka/strings.xml diff --git a/packages/overlays/ExperimentNavigationBarSlimOverlay/res/values-kk/strings.xml b/packages/overlays/ExperimentNavigationBarSlim24Overlay/res/values-kk/strings.xml similarity index 100% rename from packages/overlays/ExperimentNavigationBarSlimOverlay/res/values-kk/strings.xml rename to packages/overlays/ExperimentNavigationBarSlim24Overlay/res/values-kk/strings.xml diff --git a/packages/overlays/ExperimentNavigationBarSlimOverlay/res/values-km/strings.xml b/packages/overlays/ExperimentNavigationBarSlim24Overlay/res/values-km/strings.xml similarity index 100% rename from packages/overlays/ExperimentNavigationBarSlimOverlay/res/values-km/strings.xml rename to packages/overlays/ExperimentNavigationBarSlim24Overlay/res/values-km/strings.xml diff --git a/packages/overlays/ExperimentNavigationBarSlimOverlay/res/values-ko/strings.xml b/packages/overlays/ExperimentNavigationBarSlim24Overlay/res/values-ko/strings.xml similarity index 100% rename from packages/overlays/ExperimentNavigationBarSlimOverlay/res/values-ko/strings.xml rename to packages/overlays/ExperimentNavigationBarSlim24Overlay/res/values-ko/strings.xml diff --git a/packages/overlays/ExperimentNavigationBarSlimOverlay/res/values-ky/strings.xml b/packages/overlays/ExperimentNavigationBarSlim24Overlay/res/values-ky/strings.xml similarity index 100% rename from packages/overlays/ExperimentNavigationBarSlimOverlay/res/values-ky/strings.xml rename to packages/overlays/ExperimentNavigationBarSlim24Overlay/res/values-ky/strings.xml diff --git a/packages/overlays/ExperimentNavigationBarSlimOverlay/res/values-lo/strings.xml b/packages/overlays/ExperimentNavigationBarSlim24Overlay/res/values-lo/strings.xml similarity index 100% rename from packages/overlays/ExperimentNavigationBarSlimOverlay/res/values-lo/strings.xml rename to packages/overlays/ExperimentNavigationBarSlim24Overlay/res/values-lo/strings.xml diff --git a/packages/overlays/ExperimentNavigationBarSlimOverlay/res/values-lt/strings.xml b/packages/overlays/ExperimentNavigationBarSlim24Overlay/res/values-lt/strings.xml similarity index 100% rename from packages/overlays/ExperimentNavigationBarSlimOverlay/res/values-lt/strings.xml rename to packages/overlays/ExperimentNavigationBarSlim24Overlay/res/values-lt/strings.xml diff --git a/packages/overlays/ExperimentNavigationBarSlimOverlay/res/values-lv/strings.xml b/packages/overlays/ExperimentNavigationBarSlim24Overlay/res/values-lv/strings.xml similarity index 100% rename from packages/overlays/ExperimentNavigationBarSlimOverlay/res/values-lv/strings.xml rename to packages/overlays/ExperimentNavigationBarSlim24Overlay/res/values-lv/strings.xml diff --git a/packages/overlays/ExperimentNavigationBarSlimOverlay/res/values-mk/strings.xml b/packages/overlays/ExperimentNavigationBarSlim24Overlay/res/values-mk/strings.xml similarity index 100% rename from packages/overlays/ExperimentNavigationBarSlimOverlay/res/values-mk/strings.xml rename to packages/overlays/ExperimentNavigationBarSlim24Overlay/res/values-mk/strings.xml diff --git a/packages/overlays/ExperimentNavigationBarSlimOverlay/res/values-mn/strings.xml b/packages/overlays/ExperimentNavigationBarSlim24Overlay/res/values-mn/strings.xml similarity index 100% rename from packages/overlays/ExperimentNavigationBarSlimOverlay/res/values-mn/strings.xml rename to packages/overlays/ExperimentNavigationBarSlim24Overlay/res/values-mn/strings.xml diff --git a/packages/overlays/ExperimentNavigationBarSlimOverlay/res/values-mr/strings.xml b/packages/overlays/ExperimentNavigationBarSlim24Overlay/res/values-mr/strings.xml similarity index 100% rename from packages/overlays/ExperimentNavigationBarSlimOverlay/res/values-mr/strings.xml rename to packages/overlays/ExperimentNavigationBarSlim24Overlay/res/values-mr/strings.xml diff --git a/packages/overlays/ExperimentNavigationBarSlimOverlay/res/values-ms/strings.xml b/packages/overlays/ExperimentNavigationBarSlim24Overlay/res/values-ms/strings.xml similarity index 100% rename from packages/overlays/ExperimentNavigationBarSlimOverlay/res/values-ms/strings.xml rename to packages/overlays/ExperimentNavigationBarSlim24Overlay/res/values-ms/strings.xml diff --git a/packages/overlays/ExperimentNavigationBarSlimOverlay/res/values-my/strings.xml b/packages/overlays/ExperimentNavigationBarSlim24Overlay/res/values-my/strings.xml similarity index 100% rename from packages/overlays/ExperimentNavigationBarSlimOverlay/res/values-my/strings.xml rename to packages/overlays/ExperimentNavigationBarSlim24Overlay/res/values-my/strings.xml diff --git a/packages/overlays/ExperimentNavigationBarSlimOverlay/res/values-nb/strings.xml b/packages/overlays/ExperimentNavigationBarSlim24Overlay/res/values-nb/strings.xml similarity index 100% rename from packages/overlays/ExperimentNavigationBarSlimOverlay/res/values-nb/strings.xml rename to packages/overlays/ExperimentNavigationBarSlim24Overlay/res/values-nb/strings.xml diff --git a/packages/overlays/ExperimentNavigationBarSlimOverlay/res/values-nl/strings.xml b/packages/overlays/ExperimentNavigationBarSlim24Overlay/res/values-nl/strings.xml similarity index 100% rename from packages/overlays/ExperimentNavigationBarSlimOverlay/res/values-nl/strings.xml rename to packages/overlays/ExperimentNavigationBarSlim24Overlay/res/values-nl/strings.xml diff --git a/packages/overlays/ExperimentNavigationBarSlimOverlay/res/values-pl/strings.xml b/packages/overlays/ExperimentNavigationBarSlim24Overlay/res/values-pl/strings.xml similarity index 100% rename from packages/overlays/ExperimentNavigationBarSlimOverlay/res/values-pl/strings.xml rename to packages/overlays/ExperimentNavigationBarSlim24Overlay/res/values-pl/strings.xml diff --git a/packages/overlays/ExperimentNavigationBarSlimOverlay/res/values-pt-rBR/strings.xml b/packages/overlays/ExperimentNavigationBarSlim24Overlay/res/values-pt-rBR/strings.xml similarity index 100% rename from packages/overlays/ExperimentNavigationBarSlimOverlay/res/values-pt-rBR/strings.xml rename to packages/overlays/ExperimentNavigationBarSlim24Overlay/res/values-pt-rBR/strings.xml diff --git a/packages/overlays/ExperimentNavigationBarSlimOverlay/res/values-pt-rPT/strings.xml b/packages/overlays/ExperimentNavigationBarSlim24Overlay/res/values-pt-rPT/strings.xml similarity index 100% rename from packages/overlays/ExperimentNavigationBarSlimOverlay/res/values-pt-rPT/strings.xml rename to packages/overlays/ExperimentNavigationBarSlim24Overlay/res/values-pt-rPT/strings.xml diff --git a/packages/overlays/ExperimentNavigationBarSlimOverlay/res/values-pt/strings.xml b/packages/overlays/ExperimentNavigationBarSlim24Overlay/res/values-pt/strings.xml similarity index 100% rename from packages/overlays/ExperimentNavigationBarSlimOverlay/res/values-pt/strings.xml rename to packages/overlays/ExperimentNavigationBarSlim24Overlay/res/values-pt/strings.xml diff --git a/packages/overlays/ExperimentNavigationBarSlimOverlay/res/values-ro/strings.xml b/packages/overlays/ExperimentNavigationBarSlim24Overlay/res/values-ro/strings.xml similarity index 100% rename from packages/overlays/ExperimentNavigationBarSlimOverlay/res/values-ro/strings.xml rename to packages/overlays/ExperimentNavigationBarSlim24Overlay/res/values-ro/strings.xml diff --git a/packages/overlays/ExperimentNavigationBarSlimOverlay/res/values-ru/strings.xml b/packages/overlays/ExperimentNavigationBarSlim24Overlay/res/values-ru/strings.xml similarity index 100% rename from packages/overlays/ExperimentNavigationBarSlimOverlay/res/values-ru/strings.xml rename to packages/overlays/ExperimentNavigationBarSlim24Overlay/res/values-ru/strings.xml diff --git a/packages/overlays/ExperimentNavigationBarSlimOverlay/res/values-sk/strings.xml b/packages/overlays/ExperimentNavigationBarSlim24Overlay/res/values-sk/strings.xml similarity index 100% rename from packages/overlays/ExperimentNavigationBarSlimOverlay/res/values-sk/strings.xml rename to packages/overlays/ExperimentNavigationBarSlim24Overlay/res/values-sk/strings.xml diff --git a/packages/overlays/ExperimentNavigationBarSlimOverlay/res/values-sl/strings.xml b/packages/overlays/ExperimentNavigationBarSlim24Overlay/res/values-sl/strings.xml similarity index 100% rename from packages/overlays/ExperimentNavigationBarSlimOverlay/res/values-sl/strings.xml rename to packages/overlays/ExperimentNavigationBarSlim24Overlay/res/values-sl/strings.xml diff --git a/packages/overlays/ExperimentNavigationBarSlimOverlay/res/values-sq/strings.xml b/packages/overlays/ExperimentNavigationBarSlim24Overlay/res/values-sq/strings.xml similarity index 100% rename from packages/overlays/ExperimentNavigationBarSlimOverlay/res/values-sq/strings.xml rename to packages/overlays/ExperimentNavigationBarSlim24Overlay/res/values-sq/strings.xml diff --git a/packages/overlays/ExperimentNavigationBarSlimOverlay/res/values-sr/strings.xml b/packages/overlays/ExperimentNavigationBarSlim24Overlay/res/values-sr/strings.xml similarity index 100% rename from packages/overlays/ExperimentNavigationBarSlimOverlay/res/values-sr/strings.xml rename to packages/overlays/ExperimentNavigationBarSlim24Overlay/res/values-sr/strings.xml diff --git a/packages/overlays/ExperimentNavigationBarSlimOverlay/res/values-sv/strings.xml b/packages/overlays/ExperimentNavigationBarSlim24Overlay/res/values-sv/strings.xml similarity index 100% rename from packages/overlays/ExperimentNavigationBarSlimOverlay/res/values-sv/strings.xml rename to packages/overlays/ExperimentNavigationBarSlim24Overlay/res/values-sv/strings.xml diff --git a/packages/overlays/ExperimentNavigationBarSlimOverlay/res/values-sw/strings.xml b/packages/overlays/ExperimentNavigationBarSlim24Overlay/res/values-sw/strings.xml similarity index 100% rename from packages/overlays/ExperimentNavigationBarSlimOverlay/res/values-sw/strings.xml rename to packages/overlays/ExperimentNavigationBarSlim24Overlay/res/values-sw/strings.xml diff --git a/packages/overlays/ExperimentNavigationBarSlimOverlay/res/values-th/strings.xml b/packages/overlays/ExperimentNavigationBarSlim24Overlay/res/values-th/strings.xml similarity index 100% rename from packages/overlays/ExperimentNavigationBarSlimOverlay/res/values-th/strings.xml rename to packages/overlays/ExperimentNavigationBarSlim24Overlay/res/values-th/strings.xml diff --git a/packages/overlays/ExperimentNavigationBarSlimOverlay/res/values-tl/strings.xml b/packages/overlays/ExperimentNavigationBarSlim24Overlay/res/values-tl/strings.xml similarity index 100% rename from packages/overlays/ExperimentNavigationBarSlimOverlay/res/values-tl/strings.xml rename to packages/overlays/ExperimentNavigationBarSlim24Overlay/res/values-tl/strings.xml diff --git a/packages/overlays/ExperimentNavigationBarSlimOverlay/res/values-tr/strings.xml b/packages/overlays/ExperimentNavigationBarSlim24Overlay/res/values-tr/strings.xml similarity index 100% rename from packages/overlays/ExperimentNavigationBarSlimOverlay/res/values-tr/strings.xml rename to packages/overlays/ExperimentNavigationBarSlim24Overlay/res/values-tr/strings.xml diff --git a/packages/overlays/ExperimentNavigationBarSlimOverlay/res/values-uk/strings.xml b/packages/overlays/ExperimentNavigationBarSlim24Overlay/res/values-uk/strings.xml similarity index 100% rename from packages/overlays/ExperimentNavigationBarSlimOverlay/res/values-uk/strings.xml rename to packages/overlays/ExperimentNavigationBarSlim24Overlay/res/values-uk/strings.xml diff --git a/packages/overlays/ExperimentNavigationBarSlimOverlay/res/values-ur/strings.xml b/packages/overlays/ExperimentNavigationBarSlim24Overlay/res/values-ur/strings.xml similarity index 100% rename from packages/overlays/ExperimentNavigationBarSlimOverlay/res/values-ur/strings.xml rename to packages/overlays/ExperimentNavigationBarSlim24Overlay/res/values-ur/strings.xml diff --git a/packages/overlays/ExperimentNavigationBarSlimOverlay/res/values-uz/strings.xml b/packages/overlays/ExperimentNavigationBarSlim24Overlay/res/values-uz/strings.xml similarity index 100% rename from packages/overlays/ExperimentNavigationBarSlimOverlay/res/values-uz/strings.xml rename to packages/overlays/ExperimentNavigationBarSlim24Overlay/res/values-uz/strings.xml diff --git a/packages/overlays/ExperimentNavigationBarSlimOverlay/res/values-vi/strings.xml b/packages/overlays/ExperimentNavigationBarSlim24Overlay/res/values-vi/strings.xml similarity index 100% rename from packages/overlays/ExperimentNavigationBarSlimOverlay/res/values-vi/strings.xml rename to packages/overlays/ExperimentNavigationBarSlim24Overlay/res/values-vi/strings.xml diff --git a/packages/overlays/ExperimentNavigationBarSlimOverlay/res/values-zh-rCN/strings.xml b/packages/overlays/ExperimentNavigationBarSlim24Overlay/res/values-zh-rCN/strings.xml similarity index 100% rename from packages/overlays/ExperimentNavigationBarSlimOverlay/res/values-zh-rCN/strings.xml rename to packages/overlays/ExperimentNavigationBarSlim24Overlay/res/values-zh-rCN/strings.xml diff --git a/packages/overlays/ExperimentNavigationBarSlimOverlay/res/values-zh-rHK/strings.xml b/packages/overlays/ExperimentNavigationBarSlim24Overlay/res/values-zh-rHK/strings.xml similarity index 100% rename from packages/overlays/ExperimentNavigationBarSlimOverlay/res/values-zh-rHK/strings.xml rename to packages/overlays/ExperimentNavigationBarSlim24Overlay/res/values-zh-rHK/strings.xml diff --git a/packages/overlays/ExperimentNavigationBarSlimOverlay/res/values-zh-rTW/strings.xml b/packages/overlays/ExperimentNavigationBarSlim24Overlay/res/values-zh-rTW/strings.xml similarity index 100% rename from packages/overlays/ExperimentNavigationBarSlimOverlay/res/values-zh-rTW/strings.xml rename to packages/overlays/ExperimentNavigationBarSlim24Overlay/res/values-zh-rTW/strings.xml diff --git a/packages/overlays/ExperimentNavigationBarSlimOverlay/res/values-zu/strings.xml b/packages/overlays/ExperimentNavigationBarSlim24Overlay/res/values-zu/strings.xml similarity index 100% rename from packages/overlays/ExperimentNavigationBarSlimOverlay/res/values-zu/strings.xml rename to packages/overlays/ExperimentNavigationBarSlim24Overlay/res/values-zu/strings.xml diff --git a/packages/overlays/ExperimentNavigationBarSlimOverlay/res/values/config.xml b/packages/overlays/ExperimentNavigationBarSlim24Overlay/res/values/config.xml similarity index 81% rename from packages/overlays/ExperimentNavigationBarSlimOverlay/res/values/config.xml rename to packages/overlays/ExperimentNavigationBarSlim24Overlay/res/values/config.xml index 4c3571a1e7d45..58c653d23e445 100644 --- a/packages/overlays/ExperimentNavigationBarSlimOverlay/res/values/config.xml +++ b/packages/overlays/ExperimentNavigationBarSlim24Overlay/res/values/config.xml @@ -18,11 +18,11 @@ --> - 36dp + 24dp - 36dp + 24dp - 36dp + 24dp - 36dp + 24dp \ No newline at end of file diff --git a/packages/overlays/ExperimentNavigationBarSlimOverlay/res/values/strings.xml b/packages/overlays/ExperimentNavigationBarSlim24Overlay/res/values/strings.xml similarity index 94% rename from packages/overlays/ExperimentNavigationBarSlimOverlay/res/values/strings.xml rename to packages/overlays/ExperimentNavigationBarSlim24Overlay/res/values/strings.xml index 5ca9d155cb089..670bc5538474c 100644 --- a/packages/overlays/ExperimentNavigationBarSlimOverlay/res/values/strings.xml +++ b/packages/overlays/ExperimentNavigationBarSlim24Overlay/res/values/strings.xml @@ -18,5 +18,5 @@ --> - Slim Navigation Bar Experiment + Slim Navigation Bar Experiment (24dp) \ No newline at end of file diff --git a/packages/overlays/ExperimentNavigationBarSlim32Overlay/Android.mk b/packages/overlays/ExperimentNavigationBarSlim32Overlay/Android.mk new file mode 100644 index 0000000000000..7ebbb74589224 --- /dev/null +++ b/packages/overlays/ExperimentNavigationBarSlim32Overlay/Android.mk @@ -0,0 +1,30 @@ +# +# 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 := ExperimentNavigationBarSlim32 +LOCAL_CERTIFICATE := platform + +LOCAL_SRC_FILES := $(call all-subdir-java-files) + +LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res + +LOCAL_PACKAGE_NAME := ExperimentNavigationBarSlimOverlay32 +LOCAL_SDK_VERSION := current + +include $(BUILD_RRO_PACKAGE) \ No newline at end of file diff --git a/packages/overlays/ExperimentNavigationBarSlimOverlay/res/values-bn/strings.xml b/packages/overlays/ExperimentNavigationBarSlim32Overlay/AndroidManifest.xml similarity index 57% rename from packages/overlays/ExperimentNavigationBarSlimOverlay/res/values-bn/strings.xml rename to packages/overlays/ExperimentNavigationBarSlim32Overlay/AndroidManifest.xml index c0ab3b1b321d9..10cf6a15a7824 100644 --- a/packages/overlays/ExperimentNavigationBarSlimOverlay/res/values-bn/strings.xml +++ b/packages/overlays/ExperimentNavigationBarSlim32Overlay/AndroidManifest.xml @@ -1,5 +1,4 @@ - - +--> + + - - "স্লিম নেভিগেশন বার সম্পর্কিত পরীক্ষা" - + + \ No newline at end of file diff --git a/packages/overlays/ExperimentNavigationBarSlim32Overlay/res/values/config.xml b/packages/overlays/ExperimentNavigationBarSlim32Overlay/res/values/config.xml new file mode 100644 index 0000000000000..00dd8fecbf8cc --- /dev/null +++ b/packages/overlays/ExperimentNavigationBarSlim32Overlay/res/values/config.xml @@ -0,0 +1,28 @@ + + + + + 32dp + + 32dp + + 32dp + + 32dp + \ No newline at end of file diff --git a/packages/overlays/ExperimentNavigationBarSlimOverlay/res/values-si/strings.xml b/packages/overlays/ExperimentNavigationBarSlim32Overlay/res/values/strings.xml similarity index 63% rename from packages/overlays/ExperimentNavigationBarSlimOverlay/res/values-si/strings.xml rename to packages/overlays/ExperimentNavigationBarSlim32Overlay/res/values/strings.xml index a1abb64fbf47e..b48661c387ab0 100644 --- a/packages/overlays/ExperimentNavigationBarSlimOverlay/res/values-si/strings.xml +++ b/packages/overlays/ExperimentNavigationBarSlim32Overlay/res/values/strings.xml @@ -1,5 +1,5 @@ - - - - - "සිහින් සංචාලන තීරු අත්දැකීම" - +--> + + + Slim Navigation Bar Experiment (32dp) + \ No newline at end of file diff --git a/packages/overlays/ExperimentNavigationBarSlim40Overlay/Android.mk b/packages/overlays/ExperimentNavigationBarSlim40Overlay/Android.mk new file mode 100644 index 0000000000000..28354e3a3473d --- /dev/null +++ b/packages/overlays/ExperimentNavigationBarSlim40Overlay/Android.mk @@ -0,0 +1,30 @@ +# +# 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 := ExperimentNavigationBarSlim40 +LOCAL_CERTIFICATE := platform + +LOCAL_SRC_FILES := $(call all-subdir-java-files) + +LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res + +LOCAL_PACKAGE_NAME := ExperimentNavigationBarSlimOverlay40 +LOCAL_SDK_VERSION := current + +include $(BUILD_RRO_PACKAGE) \ No newline at end of file diff --git a/packages/overlays/ExperimentNavigationBarSlim40Overlay/AndroidManifest.xml b/packages/overlays/ExperimentNavigationBarSlim40Overlay/AndroidManifest.xml new file mode 100644 index 0000000000000..ce8133f3ed40e --- /dev/null +++ b/packages/overlays/ExperimentNavigationBarSlim40Overlay/AndroidManifest.xml @@ -0,0 +1,27 @@ + + + + + + \ No newline at end of file diff --git a/packages/overlays/ExperimentNavigationBarSlim40Overlay/res/values/config.xml b/packages/overlays/ExperimentNavigationBarSlim40Overlay/res/values/config.xml new file mode 100644 index 0000000000000..4e65f33991149 --- /dev/null +++ b/packages/overlays/ExperimentNavigationBarSlim40Overlay/res/values/config.xml @@ -0,0 +1,28 @@ + + + + + 40dp + + 40dp + + 40dp + + 40dp + \ No newline at end of file diff --git a/packages/overlays/ExperimentNavigationBarSlimOverlay/res/values-ml/strings.xml b/packages/overlays/ExperimentNavigationBarSlim40Overlay/res/values/strings.xml similarity index 63% rename from packages/overlays/ExperimentNavigationBarSlimOverlay/res/values-ml/strings.xml rename to packages/overlays/ExperimentNavigationBarSlim40Overlay/res/values/strings.xml index b65afe35950c1..8fe3a5c17bba5 100644 --- a/packages/overlays/ExperimentNavigationBarSlimOverlay/res/values-ml/strings.xml +++ b/packages/overlays/ExperimentNavigationBarSlim40Overlay/res/values/strings.xml @@ -1,5 +1,5 @@ - - - - - "സ്ലിം നാവിഗേഷൻ ബാർ പരീക്ഷണം" - +--> + + + Slim Navigation Bar Experiment (40dp) + \ No newline at end of file diff --git a/packages/overlays/ExperimentNavigationBarSlimOverlay/res/values-kn/strings.xml b/packages/overlays/ExperimentNavigationBarSlimOverlay/res/values-kn/strings.xml deleted file mode 100644 index ccdddea95afaa..0000000000000 --- a/packages/overlays/ExperimentNavigationBarSlimOverlay/res/values-kn/strings.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - "ಸ್ಲಿಮ್ ನ್ಯಾವಿಗೇಷನ್ ಬಾರ್ ಪ್ರಯೋಗ" - diff --git a/packages/overlays/ExperimentNavigationBarSlimOverlay/res/values-ne/strings.xml b/packages/overlays/ExperimentNavigationBarSlimOverlay/res/values-ne/strings.xml deleted file mode 100644 index 6022b7f495d42..0000000000000 --- a/packages/overlays/ExperimentNavigationBarSlimOverlay/res/values-ne/strings.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - "पातलो नेभिगेसन पट्टीको परीक्षण" - diff --git a/packages/overlays/ExperimentNavigationBarSlimOverlay/res/values-or/strings.xml b/packages/overlays/ExperimentNavigationBarSlimOverlay/res/values-or/strings.xml deleted file mode 100644 index 1db9783d45039..0000000000000 --- a/packages/overlays/ExperimentNavigationBarSlimOverlay/res/values-or/strings.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - "ସ୍ଲିମ୍‍ ନାଭିଗେସନ୍‍ ବାର୍‍‍‍‍‍ର ପ୍ରୟୋଗ" - diff --git a/packages/overlays/ExperimentNavigationBarSlimOverlay/res/values-pa/strings.xml b/packages/overlays/ExperimentNavigationBarSlimOverlay/res/values-pa/strings.xml deleted file mode 100644 index a782f46b2e233..0000000000000 --- a/packages/overlays/ExperimentNavigationBarSlimOverlay/res/values-pa/strings.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - "ਸਲਿਮ ਦਿਸ਼ਾ-ਨਿਰਦੇਸ਼ ਪੱਟੀ ਪ੍ਰਯੋਗ" - diff --git a/packages/overlays/ExperimentNavigationBarSlimOverlay/res/values-ta/strings.xml b/packages/overlays/ExperimentNavigationBarSlimOverlay/res/values-ta/strings.xml deleted file mode 100644 index 9e95c38721554..0000000000000 --- a/packages/overlays/ExperimentNavigationBarSlimOverlay/res/values-ta/strings.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - "மெலிதான வழிசெலுத்துதல் பட்டி சோதனை" - diff --git a/packages/overlays/ExperimentNavigationBarSlimOverlay/res/values-te/strings.xml b/packages/overlays/ExperimentNavigationBarSlimOverlay/res/values-te/strings.xml deleted file mode 100644 index d273ab744d9b7..0000000000000 --- a/packages/overlays/ExperimentNavigationBarSlimOverlay/res/values-te/strings.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - "సన్నని నావిగేషన్ పట్టీ ప్రయోగం" -