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

Remove CryptKeeper

Browse Source 
Since Android 10, new devices have been required to use FBE (File Based
Encryption) instead of FDE (Full Disk Encryption).  FDE support was
already removed from system components such as init and vold.
Therefore, the CryptKeeper activity is no longer needed.  Remove it.

Note: this CL only removes CryptKeeper itself, i.e. the activity which
runs at boot time on devices that are using FDE or are being encrypted
with FDE in-place.  Later CLs will remove FDE-specific code from the
Settings app.

Bug: 208476087
Change-Id: I4aaf795e8cee1ff3cdd55a41c975273c8faeefa9
This commit is contained in:
Eric Biggers
2022-01-11 17:01:21 -08:00
parent 277976811d
commit 43616ed3b6
27 changed files with 0 additions and 2040 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
AndroidManifest.xml
View File

@@ -2857,25 +2857,6 @@
android:value="@string/menu_key_accounts"/>
</activity>
<activity android:name=".CryptKeeper"
androidprv:systemUserOnly="true"
android:immersive="true"
android:launchMode="singleTop"
android:excludeFromRecents="true"
android:theme="@style/Theme.CryptKeeper"
android:configChanges="mnc|mcc|keyboard|keyboardHidden|uiMode"
android:windowSoftInputMode="adjustResize"
android:screenOrientation="nosensor"
android:taskAffinity="com.android.settings.CryptKeeper"
android:exported="true"
android:process=":CryptKeeper">
<intent-filter android:priority="10">
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.HOME" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
</activity>
<!-- Triggered when user-selected home app isn't encryption aware -->
<activity android:name=".FallbackHome"
android:excludeFromRecents="true"
@@ -2891,12 +2872,6 @@
</intent-filter>
</activity>
<activity android:name=".CryptKeeper$FadeToBlack"
android:immersive="true"
android:launchMode="singleTop"
android:theme="@style/CryptKeeperBlankTheme"
/>
<activity android:name=".CryptKeeperConfirm$Blank"
android:immersive="true"
android:launchMode="singleTop"

144
color-check-baseline.xml
View File

@@ -77,22 +77,6 @@
column="5"/>
</issue>
<issue
id="HardCodedColor"
severity="Error"
message="Avoid using hardcoded color"
category="Correctness"
priority="4"
summary="Using hardcoded color"
explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
errorLine1=" &lt;color name=&quot;crypt_keeper_clock_background&quot;>#ff9a9a9a&lt;/color>"
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
<location
file="res/values/colors.xml"
line="20"
column="5"/>
</issue>
<issue
id="HardCodedColor"
severity="Error"
@@ -109,22 +93,6 @@
column="5"/>
</issue>
<issue
id="HardCodedColor"
severity="Error"
message="Avoid using hardcoded color"
category="Correctness"
priority="4"
summary="Using hardcoded color"
explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
errorLine1=" &lt;color name=&quot;crypt_keeper_clock_foreground&quot;>#ff666666&lt;/color>"
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
<location
file="res/values/colors.xml"
line="21"
column="5"/>
</issue>
<issue
id="HardCodedColor"
severity="Error"
@@ -141,38 +109,6 @@
column="5"/>
</issue>
<issue
id="HardCodedColor"
severity="Error"
message="Avoid using hardcoded color"
category="Correctness"
priority="4"
summary="Using hardcoded color"
explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
errorLine1=" &lt;color name=&quot;crypt_keeper_clock_am_pm&quot;>#ff9a9a9a&lt;/color>"
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
<location
file="res/values/colors.xml"
line="22"
column="5"/>
</issue>
<issue
id="HardCodedColor"
severity="Error"
message="Avoid using hardcoded color"
category="Correctness"
priority="4"
summary="Using hardcoded color"
explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
errorLine1=" &lt;color name=&quot;crypt_keeper_password_background&quot;>#70606060&lt;/color>"
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
<location
file="res/values/colors.xml"
line="23"
column="5"/>
</issue>
<issue
id="HardCodedColor"
severity="Error"
@@ -2141,86 +2077,6 @@
column="8"/>
</issue>
<issue
id="HardCodedColor"
severity="Error"
message="Avoid using hardcoded color"
category="Correctness"
priority="4"
summary="Using hardcoded color"
explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
errorLine1=" android:textColor=&quot;#FFFFFF&quot;"
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
<location
file="res/layout/crypt_keeper_emergency_button.xml"
line="35"
column="9"/>
</issue>
<issue
id="HardCodedColor"
severity="Error"
message="Avoid using hardcoded color"
category="Correctness"
priority="4"
summary="Using hardcoded color"
explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
errorLine1=" android:background=&quot;@color/crypt_keeper_password_background&quot;>"
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
<location
file="res/layout/crypt_keeper_password_entry.xml"
line="34"
column="9"/>
</issue>
<issue
id="HardCodedColor"
severity="Error"
message="Avoid using hardcoded color"
category="Correctness"
priority="4"
summary="Using hardcoded color"
explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
errorLine1=" android:background=&quot;@color/lock_pattern_background&quot; />"
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
<location
file="res/layout/crypt_keeper_pattern_field.xml"
line="27"
column="8"/>
</issue>
<issue
id="HardCodedColor"
severity="Error"
message="Avoid using hardcoded color"
category="Correctness"
priority="4"
summary="Using hardcoded color"
explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
errorLine1=" android:background=&quot;@color/crypt_keeper_password_background&quot;>"
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
<location
file="res/layout/crypt_keeper_pin_entry.xml"
line="34"
column="9"/>
</issue>
<issue
id="HardCodedColor"
severity="Error"
message="Avoid using hardcoded color"
category="Correctness"
priority="4"
summary="Using hardcoded color"
explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
errorLine1=" android:textColor=&quot;#B3FFFFFF&quot;"
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
<location
file="res/layout/crypt_keeper_status.xml"
line="55"
column="9"/>
</issue>
<issue
id="HardCodedColor"
severity="Error"

BIN
res/drawable-hdpi/encroid_waiting.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 24 KiB

BIN
res/drawable-mdpi/encroid_waiting.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 14 KiB

BIN
res/drawable-xhdpi/encroid_waiting.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 35 KiB

86
res/layout-land/crypt_keeper_progress.xml
View File

@@ -1,86 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 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.
-->
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:padding="16dip"
android:orientation="vertical"
>
<TextView
android:id="@+id/title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:minHeight="48dip"
android:layout_alignParentStart="true"
android:layout_centerVertical="true"
android:textSize="30dip"
android:textColor="@color/title_color"
android:text="@string/crypt_keeper_setup_title"
android:gravity="bottom"
/>
<!-- Divider -->
<RelativeLayout
android:id="@+id/top_divider"
android:layout_width="match_parent"
android:layout_height="wrap_content"
>
<ProgressBar
android:id="@+id/progress_bar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
style="?android:attr/progressBarStyleHorizontal"
/>
</RelativeLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="0dip"
android:layout_weight="1"
android:orientation="horizontal"
>
<TextView
android:id="@+id/status"
android:textAppearance="?android:attr/textAppearanceMedium"
android:layout_width="0dip"
android:layout_height="wrap_content"
android:layout_weight="1"
/>
<ImageView
android:id="@+id/encroid"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/encroid_waiting"
android:contentDescription="@null"
/>
<Button
android:id="@+id/factory_reset"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="32dip"
android:text="@string/main_clear_button_text"
android:visibility="gone"
/>
</LinearLayout>
</LinearLayout>

41
res/layout-sw600dp/crypt_keeper_pattern_entry.xml
View File

@@ -1,41 +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"
android:layout_marginTop="@dimen/crypt_keeper_pattern_top_margin">
<include layout="@layout/crypt_keeper_status" />
<LinearLayout
android:layout_width="@dimen/crypt_keeper_pattern_size"
android:layout_height="@dimen/crypt_keeper_pattern_size"
android:orientation="horizontal"
android:layout_gravity="center_horizontal"
android:layout_marginTop="@dimen/crypt_keeper_pattern_separator">
<include layout="@layout/crypt_keeper_pattern_field" />
</LinearLayout>
<include layout="@layout/crypt_keeper_emergency_button" />
</LinearLayout>

108
res/layout-sw600dp/crypt_keeper_progress.xml
View File

@@ -1,108 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 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.
-->
<FrameLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
>
<RelativeLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:padding="64dip"
>
<ImageView
android:id="@+id/encroid"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
android:layout_alignParentBottom="true"
android:paddingEnd="65dip"
android:src="@drawable/encroid_waiting"
android:contentDescription="@null"
/>
<TextView
android:id="@+id/title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:minHeight="48dip"
android:layout_alignParentTop="true"
android:layout_alignParentStart="true"
android:layout_marginStart="16dip"
android:layout_marginEnd="16dip"
android:textSize="30dip"
android:textColor="@color/title_color"
android:text="@string/crypt_keeper_setup_title"
android:gravity="bottom"
/>
<!-- Divider -->
<RelativeLayout
android:id="@+id/top_divider"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/title"
>
<ProgressBar
android:id="@+id/progress_bar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
style="?android:attr/progressBarStyleHorizontal"
/>
</RelativeLayout>
<TextView
android:id="@+id/status"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/top_divider"
android:paddingTop="21dip"
android:layout_marginStart="16dip"
android:layout_marginEnd="16dip"
android:textAppearance="?android:attr/textAppearanceMedium"
/>
<!-- Divider -->
<RelativeLayout
android:id="@+id/bottom_divider"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_above="@+id/factory_reset"
android:visibility="gone"
>
<ProgressBar
android:layout_width="match_parent"
android:layout_height="wrap_content"
style="?android:attr/progressBarStyleHorizontal"
/>
</RelativeLayout>
<Button
android:id="@+id/factory_reset"
android:layout_width="208dip"
android:layout_height="48dip"
android:layout_alignParentEnd="true"
android:layout_alignParentBottom="true"
android:layout_marginBottom="80dip"
android:layout_marginEnd="16dip"
android:text="@string/main_clear_button_text"
android:visibility="gone"
/>
</RelativeLayout>
</FrameLayout>

38
res/layout/crypt_keeper_emergency_button.xml
View File

@@ -1,38 +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.
*/
-->
<!-- Emergency call button.
Text is set by CryptKeeper.updateEmergencyCallButtonState() -->
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"
android:orientation="vertical">
<Button
android:id="@+id/emergencyCallButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:textSize="14sp"
android:fontFamily="sans-serif"
android:textColor="#FFFFFF"
style="?android:attr/borderlessButtonStyle" />
</LinearLayout>

42
res/layout/crypt_keeper_password_entry.xml
View File

@@ -1,42 +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"
android:layout_marginTop="@dimen/crypt_keeper_password_top_margin">
<include layout="@layout/crypt_keeper_status" />
<LinearLayout
android:layout_width="@dimen/crypt_keeper_password_width"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:layout_marginTop="16dip"
android:layout_gravity="center_horizontal"
android:background="@color/crypt_keeper_password_background">
<include layout="@layout/crypt_keeper_password_field" />
</LinearLayout>
<include layout="@layout/crypt_keeper_emergency_button" />
</LinearLayout>

38
res/layout/crypt_keeper_password_field.xml
View File

@@ -1,38 +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.
*/
-->
<!-- Contents of the password entry field for CryptKeeper. Comes with an IME
switcher, if necessary. Assumed to be in a horizontal LinearLayout. -->
<merge xmlns:android="http://schemas.android.com/apk/res/android">
<!-- Note that crypt_keeper_pin_field.xml also has ImeAwareEditText with the same ID. -->
<ImeAwareEditText android:id="@+id/passwordEntry"
android:layout_height="wrap_content"
android:layout_width="0dip"
android:layout_weight="1"
android:inputType="textPassword"
android:imeOptions="flagForceAscii"
android:textSize="16sp"
android:padding="10sp"
android:maxLength="500"
style="@style/TextAppearance.CryptKeeper_PasswordEntry" />
<include layout="@layout/crypt_keeper_switch_input_method" />
</merge>

41
res/layout/crypt_keeper_pattern_entry.xml
View File

@@ -1,41 +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"
android:layout_marginTop="@dimen/crypt_keeper_pattern_top_margin">
<include layout="@layout/crypt_keeper_status" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/crypt_keeper_pattern_margin"
android:layout_marginEnd="@dimen/crypt_keeper_pattern_margin"
android:orientation="horizontal">
<include layout="@layout/crypt_keeper_pattern_field" />
</LinearLayout>
<include layout="@layout/crypt_keeper_emergency_button" />
</LinearLayout>

31
res/layout/crypt_keeper_pattern_field.xml
View File

@@ -1,31 +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.
*/
-->
<!-- Contents of the password entry field for CryptKeeper. Comes with an IME
switcher, if necessary. Assumed to be in a horizontal LinearLayout. -->
<merge xmlns:android="http://schemas.android.com/apk/res/android">
<com.android.internal.widget.LockPatternView android:id="@+id/lockPattern"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/lock_pattern_background" />
<include layout="@layout/crypt_keeper_switch_input_method" />
</merge>

42
res/layout/crypt_keeper_pin_entry.xml
View File

@@ -1,42 +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"
android:layout_marginTop="@dimen/crypt_keeper_password_top_margin">
<include layout="@layout/crypt_keeper_status" />
<LinearLayout
android:layout_width="@dimen/crypt_keeper_password_width"
android:layout_height="wrap_content"
android:layout_marginTop="16dip"
android:orientation="horizontal"
android:layout_gravity="center_horizontal"
android:background="@color/crypt_keeper_password_background">
<include layout="@layout/crypt_keeper_pin_field" />
</LinearLayout>
<include layout="@layout/crypt_keeper_emergency_button" />
</LinearLayout>

37
res/layout/crypt_keeper_pin_field.xml
View File

@@ -1,37 +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.
*/
-->
<!-- Contents of the password entry field for CryptKeeper. Comes with an IME
switcher, if necessary. Assumed to be in a horizontal LinearLayout. -->
<merge xmlns:android="http://schemas.android.com/apk/res/android">
<!-- Note that crypt_keeper_password_field.xml also has ImeAwareEditText with the same ID. -->
<ImeAwareEditText android:id="@+id/passwordEntry"
android:layout_height="wrap_content"
android:layout_width="0dip"
android:layout_weight="1"
android:inputType="numberPassword"
android:textSize="28sp"
android:padding="4sp"
android:maxLength="500"
style="@style/TextAppearance.CryptKeeper_PasswordEntry" />
<include layout="@layout/crypt_keeper_switch_input_method" />
</merge>

80
res/layout/crypt_keeper_progress.xml
View File

@@ -1,80 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 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.
-->
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:padding="16dip"
android:orientation="vertical"
>
<TextView
android:id="@+id/title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:minHeight="48dip"
android:layout_alignParentStart="true"
android:layout_centerVertical="true"
android:textSize="30dip"
android:textColor="@color/title_color"
android:text="@string/crypt_keeper_setup_title"
android:gravity="bottom"
/>
<!-- Divider -->
<RelativeLayout
android:id="@+id/top_divider"
android:layout_width="match_parent"
android:layout_height="wrap_content"
>
<ProgressBar
android:id="@+id/progress_bar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
style="?android:attr/progressBarStyleHorizontal"
/>
</RelativeLayout>
<TextView
android:id="@+id/status"
android:textAppearance="?android:attr/textAppearanceMedium"
android:layout_width="match_parent"
android:layout_height="wrap_content"
/>
<ImageView
android:id="@+id/encroid"
android:layout_width="wrap_content"
android:layout_height="0dip"
android:layout_weight="1"
android:layout_gravity="bottom|end"
android:src="@drawable/encroid_waiting"
android:contentDescription="@null"
/>
<Button
android:id="@+id/factory_reset"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="32dip"
android:layout_gravity="center"
android:text="@string/main_clear_button_text"
android:visibility="gone"
/>
</LinearLayout>

58
res/layout/crypt_keeper_status.xml
View File

@@ -1,58 +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.
*/
-->
<!-- Status to show on the left side of lock screen -->
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal">
<!-- We need android:gravity="center_horizontal" to make multi line
status strings look good -->
<TextView
android:id="@+id/status"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="8dip"
android:layout_marginEnd="8dip"
android:textSize="16sp"
android:fontFamily="sans-serif"
android:textColor="@android:color/white"
android:text="@string/enter_password"
android:layout_gravity="center_horizontal"
android:gravity="center_horizontal" />
<TextView
android:id="@+id/owner_info"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10dip"
android:layout_marginStart="8dip"
android:layout_marginEnd="8dip"
android:singleLine="true"
android:ellipsize="marquee"
android:marqueeRepeatLimit ="marquee_forever"
android:textSize="16sp"
android:fontFamily="sans-serif"
android:textColor="#B3FFFFFF"
android:gravity="center_horizontal" />
</LinearLayout>

31
res/layout/crypt_keeper_switch_input_method.xml
View File

@@ -1,31 +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.
*/
-->
<ImageView
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/switch_ime_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@*android:drawable/ic_lockscreen_ime"
android:clickable="true"
android:contentDescription="@string/crypt_keeper_switch_input_method"
android:padding="@dimen/crypt_keeper_edit_text_ime_padding"
android:layout_gravity="center"
android:background="?android:attr/selectableItemBackground"
android:visibility="gone" />

6
res/values-sw600dp-land/dimens.xml
View File

@@ -19,12 +19,6 @@
<dimen name="screen_margin_top">72dip</dimen>
<dimen name="screen_margin_bottom">48dip</dimen>
<!-- CryptKeeper top margin for password/pin screen -->
<dimen name="crypt_keeper_password_top_margin">116dip</dimen>
<!-- CryptKeeper top margin for pattern screen -->
<dimen name="crypt_keeper_pattern_top_margin">128dip</dimen>
<dimen name="captioning_preview_height">150dp</dimen>
<dimen name="confirm_credentials_top_padding">20dp</dimen>

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

@@ -17,8 +17,5 @@
<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>

13
res/values-sw600dp/dimens.xml
View File

@@ -23,24 +23,11 @@
<dimen name="screen_margin_bottom">48dip</dimen>
<dimen name="content_margin_left">16dip</dimen>
<dimen name="description_margin_top">26dip</dimen>
<dimen name="crypt_clock_size">120sp</dimen>
<!-- ActionBar contentInsetStart -->
<dimen name="actionbar_contentInsetStart">24dp</dimen>
<dimen name="actionbar_subsettings_contentInsetStart">80dp</dimen>
<!-- CryptKeeper top margin for password/pin screen -->
<dimen name="crypt_keeper_password_top_margin">256dip</dimen>
<!-- CryptKeeper top margin for pattern screen -->
<dimen name="crypt_keeper_pattern_top_margin">256dip</dimen>
<!-- CryptKeeper separation between status and pattern -->
<dimen name="crypt_keeper_pattern_separator">100dip</dimen>
<!-- CryptKeeper password/pin width -->
<dimen name="crypt_keeper_password_width">512dip</dimen>
<!-- SwitchBar margin start / end -->
<dimen name="switchbar_margin_start">24dp</dimen>
<dimen name="switchbar_margin_end">24dp</dimen>

5
res/values/colors.xml
View File

@@ -17,11 +17,6 @@
<resources
xmlns:androidprv="http://schemas.android.com/apk/prv/res/android">
<color name="crypt_keeper_clock_background">#ff9a9a9a</color>
<color name="crypt_keeper_clock_foreground">#ff666666</color>
<color name="crypt_keeper_clock_am_pm">#ff9a9a9a</color>
<color name="crypt_keeper_password_background">#70606060</color>
<color name="divider_color">#20ffffff</color>
<color name="title_color">@android:color/holo_blue_light</color>
<color name="setup_wizard_wifi_color_dark">#89ffffff</color>

23
res/values/dimens.xml
View File

@@ -41,8 +41,6 @@
<dimen name="balance_seekbar_center_marker_height">14dp</dimen>
<dimen name="balance_seekbar_center_marker_width">1dp</dimen>
<dimen name="crypt_clock_size">100sp</dimen>
<dimen name="divider_height">3dip</dimen>
<dimen name="divider_margin_top">6dip</dimen>
<dimen name="divider_margin_bottom">7dip</dimen>
@@ -154,27 +152,6 @@
<dimen name="wifi_assistant_image_top">32dp</dimen>
<dimen name="wifi_assistant_image_start">24dp</dimen>
<!-- CryptKeeper top margin for password/pin screen -->
<dimen name="crypt_keeper_password_top_margin">88dip</dimen>
<!-- CryptKeeper top margin for pattern screen -->
<dimen name="crypt_keeper_pattern_top_margin">88dip</dimen>
<!-- CryptKeeper password/pin width -->
<dimen name="crypt_keeper_password_width">280dip</dimen>
<!-- CryptKeeper emergency call button dimensions -->
<dimen name="crypt_keeper_emergency_call_space_above">16dip</dimen>
<!-- CryptKeeper edit text ime icon padding -->
<dimen name="crypt_keeper_edit_text_ime_padding">8dip</dimen>
<!-- CryptKeeper pattern margin on phone -->
<dimen name="crypt_keeper_pattern_margin">8dip</dimen>
<!-- CryptKeeper pattern size for tablet -->
<dimen name="crypt_keeper_pattern_size">354dip</dimen>
<!-- SIM Dialog Margin top -->
<dimen name="sim_dialog_margin_top">8dip</dimen>
<!-- SIM Dialog Margin bottom -->

97
res/values/strings.xml
View File

@@ -1339,78 +1339,6 @@
Encryption takes an hour or more, during which the phone will restart several times.
</string>
<!-- Title of the progress screen while encrypting the device -->
<string name="crypt_keeper_setup_title">Encrypting</string>
<!-- Informational text on the progress screen while encrypting the device -->
<string name="crypt_keeper_setup_description" product="tablet">Wait while your tablet
is being encrypted. <xliff:g id="percent" example="50">^1</xliff:g>% complete.</string>
<!-- Informational text on the progress screen while encrypting the device -->
<string name="crypt_keeper_setup_description" product="default">Wait while your phone
is being encrypted. <xliff:g id="percent" example="50">^1</xliff:g>% complete.</string>
<string name="crypt_keeper_setup_time_remaining" product="tablet">Wait while your tablet
is being encrypted. Time remaining: <xliff:g id="duration" example="1:23">^1</xliff:g></string>
<string name="crypt_keeper_setup_time_remaining" product="default">Wait while your phone
is being encrypted. Time remaining: <xliff:g id="duration" example="1:23">^1</xliff:g></string>
<string name="crypt_keeper_force_power_cycle" product="tablet">To unlock your tablet, turn it off and then on.</string>
<string name="crypt_keeper_force_power_cycle" product="default">To unlock your phone, turn it off and then on.</string>
<!-- Warn user their device will be wiped if they make x more failed attempts -->
<string name="crypt_keeper_warn_wipe">Warning: Your device will be wiped after
<xliff:g id="count" example="7">^1</xliff:g> more failed attempts to be unlocked!
</string>
<!-- Informational text on the password entry screen prompting the user for their password -->
<string name="crypt_keeper_enter_password">Type your password</string>
<!-- Title of the encryption screen when encrypting the device failed -->
<string name="crypt_keeper_failed_title">Encryption unsuccessful</string>
<!-- Informational text when encryption fails -->
<string name="crypt_keeper_failed_summary" product="tablet">
Encryption was interrupted and can\u2019t complete. As a result, the data on
your tablet is no longer accessible.
\n\n
To resume using your tablet, you need to perform a factory reset.
When you set up your tablet after the reset, you\u2019ll have an opportunity
to restore any data that was backed up to your Google Account.
</string>
<!-- Informational text when encryption fails -->
<string name="crypt_keeper_failed_summary" product="default">
Encryption was interrupted and can\u2019t complete. As a result, the data on
your phone is no longer accessible.
\n\nTo resume using your phone, you need to perform a factory reset.
When you set up your phone after the reset, you\u2019ll have an opportunity
to restore any data that was backed up to your Google Account.
</string>
<!-- Title of the encryption screen when decrypting the device failed -->
<string name="crypt_keeper_data_corrupt_title">Decryption unsuccessful</string>
<!-- Informational text when encryption fails -->
<string name="crypt_keeper_data_corrupt_summary" product="tablet">
The password you entered is correct, but unfortunately your data is
corrupt.
\n\nTo resume using your tablet, you need to perform a factory reset.
When you set up your tablet after the reset, you\u2019ll have an opportunity
to restore any data that was backed up to your Google Account.
</string>
<!-- Informational text when encryption fails -->
<string name="crypt_keeper_data_corrupt_summary" product="default">
The password you entered is correct, but unfortunately your data is
corrupt.
\n\nTo resume using your phone, you need to perform a factory reset.
When you set up your phone after the reset, you\u2019ll have an opportunity
to restore any data that was backed up to your Google Account.
</string>
<!-- Image button description to switch input method -->
<string name="crypt_keeper_switch_input_method">Switch input method</string>
<!-- Unlock Picker Settings --><skip />
<!-- Security Picker --><skip />
@@ -7169,26 +7097,6 @@
<!-- Messaage shown in dialog when you can't manually sync -->
<string name="cant_sync_dialog_message">Sync for this item is currently disabled. To change this setting, temporarily turn on background data and automatic sync.</string>
<!-- This is displayed to the user when the device needs to be decrypted -->
<string name="enter_password">To start Android, enter your password</string>
<!-- Informational text on the pin entry screen prompting the user for their pin -->
<string name="enter_pin">To start Android, enter your PIN</string>
<!-- Informational text on the pattern entry screen prompting the user for their pattern -->
<string name="enter_pattern">To start Android, draw your pattern</string>
<!-- Message shown when user enters wrong pattern -->
<string name="cryptkeeper_wrong_pattern">Wrong Pattern</string>
<!-- Message shown when user enters wrong password -->
<string name="cryptkeeper_wrong_password">Wrong Password</string>
<!-- Message shown when user enters wrong PIN -->
<string name="cryptkeeper_wrong_pin">Wrong PIN</string>
<!-- Shown when a password has been entered, and we're checking it -->
<string name="checking_decryption">Checking\u2026</string>
<!-- Shown when password is correct, and we're starting Android -->
<string name="starting_android">Starting Android\u2026</string>
<!-- the following are for Settings Storage screen -->
<!-- Menu item/button 'delete' -->
<string name="delete">Delete</string>
@@ -7402,11 +7310,6 @@
<!-- Disclaimer string for data usage measured by device. [CHAR LIMIT=80] -->
<string name="data_usage_disclaimer">Carrier data accounting may differ from your device.</string>
<!-- Button at the bottom of the CryptKeeper screen to make an emergency call. -->
<string name="cryptkeeper_emergency_call">Emergency call</string>
<!-- Button at the bottom of the CryptKeeper screen that lets the user return to a call -->
<string name="cryptkeeper_return_to_call">Return to call</string>
<!-- Input label for the name of a VPN profile. [CHAR LIMIT=40] -->
<string name="vpn_name">Name</string>
<!-- Input label for the type of a VPN profile. [CHAR LIMIT=40] -->

8
res/values/styles.xml
View File

@@ -281,14 +281,6 @@
<item name="android:textSize">24sp</item>
</style>
<style name="TextAppearance.CryptKeeper_PasswordEntry" parent="android:TextAppearance.DeviceDefault">
<item name="android:gravity">center_horizontal</item>
<item name="android:background">@null</item>
<item name="android:textCursorDrawable">@null</item>
<item name="android:singleLine">true</item>
<item name="android:imeOptions">flagForceAscii|actionDone</item>
</style>
<style name="TextAppearance.Medium" parent="@android:style/TextAppearance.DeviceDefault.Medium"/>
<style name="TextAppearance.Small" parent="@android:style/TextAppearance.DeviceDefault.Small"/>
<style name="TextAppearance.Switch"

9
res/values/themes.xml
View File

@@ -117,15 +117,6 @@
<item name="android:minWidth">@dimen/min_tap_target_size</item>
</style>
<style name="Theme.CryptKeeper" parent="@android:style/Theme.Material.NoActionBar">
<item name="android:windowTranslucentStatus">false</item>
<item name="android:windowTranslucentNavigation">false</item>
<item name="android:windowDrawsSystemBarBackgrounds">false</item>
<item name="android:background">@android:color/black</item>
<item name="*android:lockPatternStyle">@style/LockPatternStyle</item>
</style>
<style name="ThemeOverlay.AlertDialog" parent="@android:style/ThemeOverlay.Material.Dialog.Alert">
<item name="android:windowSoftInputMode">adjustResize</item>
</style>

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

File diff suppressed because it is too large Load Diff