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

Commit a3501ed0 authored by Matthew Ng's avatar Matthew Ng Committed by Android (Google) Code Review
Browse files

Merge "Experiment to be able to change the navigation bar thickness (1/2)"

parents 420c3578 605ea474
Loading
Loading
Loading
Loading
+14 −0
Original line number Diff line number Diff line
@@ -47,6 +47,20 @@
    <dimen name="navigation_bar_height_landscape">48dp</dimen>
    <!-- Width of the navigation bar when it is placed vertically on the screen -->
    <dimen name="navigation_bar_width">48dp</dimen>

    <!-- EXPERIMENT BEGIN -->
    <!-- Height of the bottom navigation bar frame; this is different than navigation_bar_height
         where that is the height reported to all the other windows to resize themselves around the
         navigation bar window but navigation_bar_frame_height is reported to SystemUI navigation
         bar view's window -->
    <dimen name="navigation_bar_frame_height">@dimen/navigation_bar_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>
    <!-- EXPERIMENT END-->

    <!-- Height of the bottom navigation / system bar in car mode. -->
    <dimen name="navigation_bar_height_car_mode">96dp</dimen>
    <!-- Height of the bottom navigation bar in portrait; often the same as
+2 −0
Original line number Diff line number Diff line
@@ -1681,6 +1681,8 @@
  <java-symbol type="dimen" name="navigation_bar_height" />
  <java-symbol type="dimen" name="navigation_bar_height_landscape" />
  <java-symbol type="dimen" name="navigation_bar_width" />
  <java-symbol type="dimen" name="navigation_bar_frame_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" />
+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 := ExperimentNavigationBarFloating
LOCAL_CERTIFICATE := platform

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

LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res

LOCAL_PACKAGE_NAME := ExperimentNavigationBarFloatingOverlay
LOCAL_SDK_VERSION := current

include $(BUILD_RRO_PACKAGE)
 No newline at end of file
+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.floating"
        android:versionCode="1"
        android:versionName="1.0">
    <overlay android:targetPackage="android"
        android:category="com.android.internal.experiment_navbar_floating"
        android:priority="1"/>

    <application android:label="@string/experiment_navigationbar_overlay" android:hasCode="false"/>
</manifest>
 No newline at end of file
+28 −0
Original line number Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>
<!--
/**
 * 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.
 */
-->
<resources>
    <!-- Height of the bottom navigation / system bar. -->
    <dimen name="navigation_bar_height">0dp</dimen>
    <!-- Width of the navigation bar when it is placed vertically on the screen -->
    <dimen name="navigation_bar_width">0dp</dimen>
    <!-- Height of the bottom navigation / system bar frame; navigation buttons height. -->
    <dimen name="navigation_bar_frame_height">48dp</dimen>
    <!-- Width of the navigation bar frame when it is placed vertically on the screen -->
    <dimen name="navigation_bar_frame_width">48dp</dimen>
</resources>
 No newline at end of file
Loading