LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Fix keystore demo layout for Nexus 7" into mnc-dev

Browse Source
This commit is contained in:
Robin Lee
2015-05-13 18:28:21 +00:00
committed by Android (Google) Code Review
parent 5b1f58dd24 d72e5b22bb
commit f5ded1c643
2 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
samples/ApiDemos/res/layout/keystore_usage.xml
View File

@@ -83,12 +83,12 @@
<EditText <EditText
android:id="@+id/plaintext" android:id="@+id/plaintext"
android:layout_width="fill_parent" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignBaseline="@+id/plaintext_label" android:layout_alignBaseline="@+id/plaintext_label"
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
android:layout_below="@+id/key_ops_header" android:layout_toRightOf="@+id/plaintext_label"
android:layout_toRightOf="@id/plaintext_label" android:layout_marginBottom="12dp"
android:ems="10" android:ems="10"
android:maxLines="1" /> android:maxLines="1" />
@@ -102,12 +102,12 @@
<EditText <EditText
android:id="@+id/ciphertext" android:id="@+id/ciphertext"
android:layout_width="fill_parent" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignBaseline="@+id/ciphertext_label" android:layout_alignBaseline="@+id/ciphertext_label"
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
android:layout_below="@+id/plaintext" android:layout_toRightOf="@+id/ciphertext_label"
android:layout_toRightOf="@id/ciphertext_label" android:layout_marginBottom="12dp"
android:maxLines="1" /> android:maxLines="1" />
<LinearLayout <LinearLayout
@@ -189,4 +189,4 @@
android:ems="10" /> android:ems="10" />
</RelativeLayout> </RelativeLayout>
</LinearLayout> </LinearLayout>

3
samples/ApiDemos/src/com/example/android/apis/security/KeyStoreUsage.java
View File

@@ -129,6 +129,7 @@ public class KeyStoreUsage extends Activity {
ListView lv = (ListView) findViewById(R.id.entries_list); ListView lv = (ListView) findViewById(R.id.entries_list);
mAdapter = new AliasAdapter(getApplicationContext()); mAdapter = new AliasAdapter(getApplicationContext());
lv.setAdapter(mAdapter); lv.setAdapter(mAdapter);
lv.setChoiceMode(ListView.CHOICE_MODE_SINGLE);
lv.setOnItemClickListener(new OnItemClickListener() { lv.setOnItemClickListener(new OnItemClickListener() {
@Override @Override
public void onItemClick(AdapterView<?> parent, View view, int position, long id) { public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
@@ -250,6 +251,8 @@ public class KeyStoreUsage extends Activity {
* enabled or disabled. * enabled or disabled.
*/ */
private void setKeyActionButtonsEnabled(boolean enabled) { private void setKeyActionButtonsEnabled(boolean enabled) {
mPlainText.setEnabled(enabled);
mCipherText.setEnabled(enabled);
mSignButton.setEnabled(enabled); mSignButton.setEnabled(enabled);
mVerifyButton.setEnabled(enabled); mVerifyButton.setEnabled(enabled);
mDeleteButton.setEnabled(enabled); mDeleteButton.setEnabled(enabled);