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

Commit 2b305844 authored by David van Tonder's avatar David van Tonder Committed by Gerrit Code Review
Browse files

Merge "Make navigation bar ready for per-user configuration." into cm-10.1

parents 163009b8 c2d2a695
Loading
Loading
Loading
Loading
+44 −0
Original line number Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>
<!--
/*
** Copyright 2010, 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.
*/
-->

<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
    android:layout_width="match_parent"
    android:layout_height="wrap_content"
    android:orientation="horizontal">

    <ImageView
        android:id="@+id/key_icon"
        android:layout_width="80dip"
        android:layout_height="match_parent"
        android:padding="4dip"
        android:scaleType="centerInside"/>

    <TextView
        android:id="@+id/key_text"
        android:layout_width="0dip"
        android:layout_height="wrap_content"
        android:layout_weight="1"
        android:minHeight="?android:attr/listPreferredItemHeightSmall"
        android:textAppearance="?android:attr/textAppearanceListItemSmall"
        android:textColor="?android:attr/textColorAlertDialogListItem"
        android:gravity="center_vertical"
        android:paddingEnd="16dip"
        android:ellipsize="marquee"/>

</LinearLayout>
+5 −0
Original line number Diff line number Diff line
@@ -97,6 +97,11 @@ public class NavigationButtons {
            sideResource = sR;
            this.key = key;
        }

        @Override
        public String toString() {
            return "ButtonInfo[" + key + "]";
        }
    }

    // Available buttons string constants
Loading