diff options
| author | Trevor Johns <trevorjohns@google.com> | 2014-12-10 03:38:07 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-12-10 03:38:07 +0000 |
| commit | 2452c0880d904d9e042e290b75acbe6f49b5208f (patch) | |
| tree | 358c8cfffdbcb47c558be290cbea4d21ea7fc541 /samples/browseable/BasicAndroidKeyStore/src/com.example.android.basicandroidkeystore/MainActivity.java | |
| parent | b0bedfe4b75af178609525834710a89137dca988 (diff) | |
| parent | 82365c20f22bbc07d4b195ac13ab468022bd6f0d (diff) | |
am 82365c20: am abededd8: Docs: Sync browseable samples for lmp-docs
* commit '82365c20f22bbc07d4b195ac13ab468022bd6f0d':
Docs: Sync browseable samples for lmp-docs
Diffstat (limited to 'samples/browseable/BasicAndroidKeyStore/src/com.example.android.basicandroidkeystore/MainActivity.java')
| -rw-r--r-- | samples/browseable/BasicAndroidKeyStore/src/com.example.android.basicandroidkeystore/MainActivity.java | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/samples/browseable/BasicAndroidKeyStore/src/com.example.android.basicandroidkeystore/MainActivity.java b/samples/browseable/BasicAndroidKeyStore/src/com.example.android.basicandroidkeystore/MainActivity.java index 7fd9466e2..f322af57f 100644 --- a/samples/browseable/BasicAndroidKeyStore/src/com.example.android.basicandroidkeystore/MainActivity.java +++ b/samples/browseable/BasicAndroidKeyStore/src/com.example.android.basicandroidkeystore/MainActivity.java @@ -19,6 +19,8 @@ package com.example.android.basicandroidkeystore; import android.graphics.Color; import android.os.Bundle; import android.support.v4.app.FragmentTransaction; +import android.text.Html; +import android.widget.TextView; import android.view.Menu; import com.example.android.common.activities.SampleActivityBase; @@ -41,6 +43,8 @@ public class MainActivity extends SampleActivityBase { protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_main); + TextView sampleOutput = (TextView) findViewById(R.id.sample_output); + sampleOutput.setText(Html.fromHtml(getString(R.string.intro_message))); FragmentTransaction transaction = getSupportFragmentManager().beginTransaction(); BasicAndroidKeyStoreFragment fragment = new BasicAndroidKeyStoreFragment(); @@ -75,4 +79,4 @@ public class MainActivity extends SampleActivityBase { Log.i(TAG, "Ready"); } -}
\ No newline at end of file +} |
