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

Commit 7ae20e3c authored by Paul Lawrence's avatar Paul Lawrence
Browse files

Allow CryptKeeper dialogs to rotate on tablets 

Tablets may be used in docking stations thus need to support landscape mode.
Phones will not be, and having them rotate is both ugly and annoying.
Also this matches lock screen behavior.

The attribute screenOrientation is not themeable, so the only way of doing
this is programmatic.

Test for truth of bool which is only set for sw600dp devices and
clear the nosensor setting from the manifest if set.

Bug: 16405551
Change-Id: I5b3f945b89402e5aa39642c2c06e98f9ca1ce298
parent 59c3da23

res/layout-land/crypt_keeper_password_entry.xml

deleted100644 → 0
+0 −62
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_marginStart="8dip"

            android:layout_marginEnd="8dip"

            android:orientation="horizontal"

        >

            <include layout="@layout/crypt_keeper_password_field" />

        </LinearLayout>





    </LinearLayout>

</ScrollView>

res/layout-land/crypt_keeper_pattern_entry.xml

deleted100644 → 0
+0 −56
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

**

** Copyright 2014, 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="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_marginTop="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_marginStart="8dip"

        android:layout_marginEnd="8dip"

        android:orientation="horizontal"

    >

        <include layout="@layout/crypt_keeper_pattern_field" />

    </LinearLayout>



</LinearLayout>

res/values-sw600dp/bools.xml

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

<!-- Copyright (C) 2011 The Android Open Source Project

<!-- Copyright (C) 2014 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.
@@ -17,5 +17,8 @@ 
<resources>

    <!-- Whether there is a silent mode checkbox  -->

    <bool name="has_silent_mode">false</bool>



    <!-- CryptKeeper allow rotation -->

    <bool name="crypt_keeper_allow_rotation">true</bool>

</resources>

src/com/android/settings/CryptKeeper.java

+9 −0
Original line number Diff line number Diff line
@@ -21,7 +21,9 @@ import android.app.StatusBarManager; 
import android.content.ComponentName;

import android.content.Context;

import android.content.Intent;

import android.content.pm.ActivityInfo;

import android.content.pm.PackageManager;

import android.content.res.Resources.NotFoundException;

import android.media.AudioManager;

import android.os.AsyncTask;

import android.os.Bundle;
@@ -339,6 +341,13 @@ public class CryptKeeper extends Activity implements TextView.OnEditorActionList 
            return;

        }



        try {

            if (getResources().getBoolean(R.bool.crypt_keeper_allow_rotation)) {

                setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED);

            }

        } catch (NotFoundException e) {

        }



        // Disable the status bar, but do NOT disable back because the user needs a way to go

        // from keyboard settings and back to the password screen.

        mStatusBar = (StatusBarManager) getSystemService(Context.STATUS_BAR_SERVICE);