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

Commit 5887ab48 authored by Danesh M's avatar Danesh M Committed by Steve Kondik
Browse files

SystemUI : NavigationBar fixes 

Change-Id: I332b7dd0e61c0ec63cc9fc633f736d347344c99b
parent 3965264d

packages/SystemUI/res/layout-sw600dp/mid_navigation_bar_land.xml

+44 −51
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

/*

** Copyright 2015 The CyanogenMod 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.

*/

-->

     Copyright 2015, The CyanogenMod 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.

-->

<LinearLayout

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

    xmlns:systemui="http://schemas.android.com/apk/res/com.android.systemui"
@@ -26,10 +23,6 @@ 
    android:clipChildren="false"

    android:clipToPadding="false"

    android:id="@+id/nav_buttons">



    <FrameLayout

        android:layout_width="match_parent"

        android:layout_height="wrap_content" >

    <com.android.systemui.statusbar.policy.KeyButtonView

        android:id="@+id/dpad_left"

        android:visibility="gone"
@@ -43,16 +36,7 @@ 
        android:layout_width="48dp"

        android:layout_height="match_parent"

        android:layout_weight="0"

            android:scaleType="centerInside" />

        <com.android.systemui.statusbar.policy.KeyButtonView

            android:id="@+id/ime_switcher"

            android:layout_width="match_parent"

            android:layout_height="@dimen/navigation_extra_key_width"

            android:src="@drawable/ic_ime_switcher_default"

            android:visibility="invisible"

            android:contentDescription="@string/accessibility_ime_switch_button"

            android:scaleType="centerInside" />

    </FrameLayout>

        android:scaleType="fitCenter" />

    <View

        android:layout_width="0dp"

        android:layout_height="match_parent"
@@ -97,8 +81,23 @@ 
        android:layout_height="match_parent"

        android:layout_weight="1" />

    <FrameLayout

        android:layout_width="match_parent"

        android:layout_height="wrap_content">

        android:layout_width="@dimen/navigation_extra_key_width"

        android:layout_height="match_parent"

        android:layout_weight="0"

        android:layout_marginEnd="2dp" >

        <com.android.systemui.statusbar.policy.KeyButtonView

            android:id="@+id/ime_switcher"

            android:layout_width="@dimen/navigation_extra_key_width"

            android:layout_height="match_parent"

            android:layout_marginEnd="2dp"

            android:scaleType="centerInside"

            android:src="@drawable/ic_ime_switcher_default"

            android:visibility="invisible"

            android:contentDescription="@string/accessibility_ime_switch_button" />

        <com.android.systemui.statusbar.policy.KeyButtonView

            android:id="@+id/six"

            android:layout_width="@dimen/navigation_extra_key_width"

            android:layout_height="match_parent" />

        <com.android.systemui.statusbar.policy.KeyButtonView

            android:id="@+id/dpad_right"

            android:visibility="gone"
@@ -107,11 +106,5 @@ 
            android:layout_weight="0"

            android:scaleType="fitCenter"

            systemui:keyRepeat="true"/>

        <com.android.systemui.statusbar.policy.KeyButtonView

            android:id="@+id/six"

            android:layout_width="48dp"

            android:layout_height="match_parent"

            android:layout_weight="0"

            android:scaleType="fitCenter"/>

    </FrameLayout>

</LinearLayout>

packages/SystemUI/res/layout-sw600dp/mid_navigation_bar_port.xml

+8 −0
Original line number Diff line number Diff line
@@ -38,6 +38,14 @@ 
            android:layout_weight="0"

            android:scaleType="fitCenter"

            systemui:keyRepeat="true" />

        <com.android.systemui.statusbar.policy.KeyButtonView

            android:id="@+id/dpad_left"

            android:visibility="gone"

            android:layout_width="48dp"

            android:layout_height="match_parent"

            android:layout_weight="0"

            android:scaleType="fitCenter"

            systemui:keyRepeat="true" />

        <com.android.systemui.statusbar.policy.KeyButtonView

            android:id="@+id/one"

            android:layout_width="@dimen/navigation_extra_key_width"