PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 7ae20e3c: Allow CryptKeeper dialogs to rotate on tablets

Browse Source 
* commit '7ae20e3ce98543888cfccbef6b1254d060bc30ca':
  Allow CryptKeeper dialogs to rotate on tablets
This commit is contained in:
Paul Lawrence
2014-07-23 14:43:36 +00:00
committed by Android Git Automerger
parent 5f4ba1315e 7ae20e3ce9
commit ff3f9cf279
4 changed files with 13 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
res/layout-land/crypt_keeper_password_entry.xml
View File

@@ -1,62 +0,0 @@
<?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>

56
res/layout-land/crypt_keeper_pattern_entry.xml
View File

@@ -1,56 +0,0 @@
<?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>

5
res/values-sw600dp/bools.xml
View File

@@ -1,5 +1,5 @@
<?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>

9
src/com/android/settings/CryptKeeper.java
View File

@@ -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);