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

Commit be4fa0bf authored by Ben Komalo's avatar Ben Komalo Committed by Android (Google) Code Review
Browse files

Merge "Misc fixes to CryptKeeper"

parents f38534f4 9fcb6a7f
Loading
Loading
Loading
Loading
+2 −1
Original line number Diff line number Diff line
@@ -1148,7 +1148,8 @@
                  android:immersive="true"
                  android:launchMode="singleTop"
                  android:theme="@android:style/Theme.Holo.NoActionBar"
                  android:windowSoftInputMode="stateAlwaysHidden">
                  android:configChanges="mcc|mnc|keyboard|keyboardHidden|uiMode"
                  android:windowSoftInputMode="stateVisible|adjustResize">
            <intent-filter android:priority="10">
                <action android:name="android.intent.action.MAIN" />
                <category android:name="android.intent.category.HOME" />
+202 B
Loading image diff...
+157 B
Loading image diff...
+217 B
Loading image diff...
+62 −0
Original line number Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>
<!--
**
** Copyright 2011, 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.
*/
-->

<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
    android:layout_width="match_parent"
    android:layout_height="match_parent"
>
    <LinearLayout
        android:layout_width="match_parent"
        android:layout_height="match_parent"
        android:orientation="vertical"
    >
        <LinearLayout
            android:layout_height="wrap_content"
            android:layout_width="match_parent"
            android:orientation="horizontal"
            android:gravity="center_vertical"
        >
            <include layout="@layout/crypt_keeper_status" />

            <!-- Emergency call button.
                 Text and icon are set by CryptKeeper.updateEmergencyCallButtonState() -->
            <Button android:id="@+id/emergencyCallButton"
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:layout_gravity="center"
                android:layout_margin="16dip"
                style="@*android:style/Widget.Button.Transparent"
                android:textSize="14sp"
                android:drawablePadding="6dip"
            />
        </LinearLayout>

        <LinearLayout
            android:layout_height="wrap_content"
            android:layout_width="match_parent"
            android:layout_marginLeft="8dip"
            android:layout_marginRight="8dip"
            android:orientation="horizontal"
        >
            <include layout="@layout/crypt_keeper_password_field" />
        </LinearLayout>


    </LinearLayout>
</ScrollView>
Loading