Skip to content

Support AOSP build #12

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
eugenesan wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Support AOSP build #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
207bdb7
Add makefile for inclusion in AOSP builds
eugenesan Sep 9, 2015
b7ea48c
Fix strings to allow AOSP build
eugenesan Sep 11, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions Android.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS)

LOCAL_MODULE_TAGS := optional

LOCAL_SRC_FILES := $(call all-subdir-java-files)

LOCAL_PROGUARD_ENABLED := disabled

LOCAL_PACKAGE_NAME := CryptfsPasswordManager


include $(BUILD_PACKAGE)

include $(call all-makefiles-under,$(LOCAL_PATH))
8 changes: 4 additions & 4 deletions res/layout/activity_main.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
android:id="@+id/currentPasswdLabel"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="Current password:" />
android:text="@string/current_passwd_pmt" />

<EditText
android:id="@+id/currentPasswdText"
Expand All @@ -46,7 +46,7 @@
android:id="@+id/newPasswdLabel"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="New password:" />
android:text="@string/new_passwd_pmt" />

<EditText
android:id="@+id/newPasswordText"
Expand All @@ -60,7 +60,7 @@
android:id="@+id/newPasswdConfirmLabel"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="Confirm new password:" />
android:text="@string/confirm_passwd_pmt" />

<EditText
android:id="@+id/confirmNewPasswdText"
Expand All @@ -75,6 +75,6 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/control_margin"
android:text="Change password" />
android:text="@string/change_passwd_btn" />

</LinearLayout>
4 changes: 4 additions & 0 deletions res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,13 @@
to set the password manually BEFORE rebooting.</string>
<string name="successfuly_changed_password">Successfuly changed device encryption password.</string>
<string name="password_mismatch">Passwords don\'t match.</string>
<string name="confirm_passwd_pmt">Confirm password:</string>
<string name="confirmation_passwd_required">Confirmation password is required.</string>
<string name="new_passwd_required">New password is required.</string>
<string name="current_passwd_required">Current password is required.</string>
<string name="current_passwd_pmt">Current password:</string>
<string name="new_passwd_pmt">New password:</string>
<string name="change_passwd_btn">Change password</string>
<string name="cannot_get_su">Cannot get superuser access, exiting.</string>
<string name="no_su_apk">No superuser package found, exiting.</string>
<string name="device_not_encrypted">This device is not encrypted, exiting.</string>
Expand Down