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

Commit ccf163bf authored by Matthew Ng's avatar Matthew Ng Committed by android-build-merger
Browse files

Merge "Removing left over experimental overlays and frame width (1/2)" into qt-dev 

am: 8d9eae6e

Change-Id: Id9f0a66728f994691ae9b6011c7468b8ecdd412d
parents 2c0da579 8d9eae6e

CleanSpec.mk

+0 −3
Original line number Diff line number Diff line
@@ -248,9 +248,6 @@ $(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)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/priv-app/SystemUI)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/media/audio)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/priv-app/DynamicAndroidInstallationService)

core/res/res/values/dimens.xml

+0 −5
Original line number Diff line number Diff line
@@ -58,11 +58,6 @@ 
    <dimen name="navigation_bar_frame_height">@dimen/navigation_bar_height</dimen>

    <!-- Height of the bottom navigation bar frame in landscape -->

    <dimen name="navigation_bar_frame_height_landscape">@dimen/navigation_bar_frame_height</dimen>

    <!-- Width of the left/right navigation bar frame; this is different than navigation_bar_width

         where that is the width reported to all the other windows to resize themselves around the

         navigation bar window but navigation_bar_frame_width is reported to SystemUI navigation

         bar view's window -->

    <dimen name="navigation_bar_frame_width">@dimen/navigation_bar_width</dimen>



    <!-- The height of the navigation gesture area; if the size is larger than the navigation bar

        frame width/height, then the difference is the spacing from the navigation bar window to

core/res/res/values/symbols.xml

+0 −1
Original line number Diff line number Diff line
@@ -1748,7 +1748,6 @@ 
  <java-symbol type="dimen" name="navigation_bar_frame_height" />

  <java-symbol type="dimen" name="navigation_bar_frame_height_landscape" />

  <java-symbol type="dimen" name="navigation_bar_gesture_height" />

  <java-symbol type="dimen" name="navigation_bar_frame_width" />

  <java-symbol type="dimen" name="navigation_bar_height_car_mode" />

  <java-symbol type="dimen" name="navigation_bar_height_landscape_car_mode" />

  <java-symbol type="dimen" name="navigation_bar_width_car_mode" />

packages/overlays/ExperimentNavigationBarDefaultOverlay/Android.mk

deleted100644 → 0
+0 −30
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

deleted100644 → 0
+0 −27
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