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

am c0e099c6: am 3a7f2659: Merge "Add more text samples to ApiDemos, move to Views/Text" into mnc-dev

Browse Source 
* commit 'c0e099c603c79f1689094b2c7b75721892e81be2':
  Add more text samples to ApiDemos, move to Views/Text
This commit is contained in:
James Cook
2015-06-08 20:32:49 +00:00
committed by Android Git Automerger
parent 046e8dcd83 c0e099c603
commit 6eb5babc63
5 changed files with 248 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

77
samples/ApiDemos/AndroidManifest.xml
View File

@@ -1549,12 +1549,6 @@
<!-- VIEW/WIDGET PACKAGE SAMPLES -->
<!-- ************************************* -->
<activity android:name=".view.TextClockDemo" android:label="Views/TextClock">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.SAMPLE_CODE" />
</intent-filter>
</activity>
<activity android:name=".view.ChronometerDemo" android:label="Views/Chronometer">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -2130,8 +2124,56 @@
</intent-filter>
</activity>
<activity android:name=".view.EditTextDemo"
android:label="Views/Text/EditText">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.SAMPLE_CODE" />
</intent-filter>
</activity>
<activity android:name=".text.Link"
android:label="Views/Text/Linkify">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.SAMPLE_CODE" />
</intent-filter>
</activity>
<activity android:name=".text.LogTextBox1"
android:label="Views/Text/LogTextBox">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.SAMPLE_CODE" />
</intent-filter>
</activity>
<activity android:name=".text.Marquee"
android:label="Views/Text/Marquee">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.SAMPLE_CODE" />
</intent-filter>
</activity>
<activity android:name=".view.TextClockDemo"
android:label="Views/Text/TextClock">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.SAMPLE_CODE" />
</intent-filter>
</activity>
<activity android:name=".view.TextSwitcher1"
android:label="Views/TextSwitcher">
android:label="Views/Text/TextSwitcher">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.SAMPLE_CODE" />
</intent-filter>
</activity>
<activity android:name=".view.TextViewDemo"
android:label="Views/Text/TextView">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.SAMPLE_CODE" />
@@ -3097,27 +3139,6 @@
<!-- OTHER SAMPLES -->
<!-- ************************************* -->
<activity android:name=".text.Link" android:label="Text/Linkify">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.SAMPLE_CODE" />
</intent-filter>
</activity>
<activity android:name=".text.Marquee" android:label="Text/Marquee">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.SAMPLE_CODE" />
</intent-filter>
</activity>
<activity android:name=".text.LogTextBox1" android:label="Text/LogTextBox">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.SAMPLE_CODE" />
</intent-filter>
</activity>
<activity android:name=".nfc.ForegroundDispatch" android:label="NFC/ForegroundDispatch">
<intent-filter>
<action android:name="android.intent.action.MAIN" />

52
samples/ApiDemos/res/layout/edit_text_demo.xml Normal file
View File

@@ -0,0 +1,52 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (C) 2015 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"
android:orientation="vertical" >
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical" >
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="EditText imeOptions=flagNoFullscreen" />
<EditText
android:id="@+id/edit0"
android:imeOptions="flagNoFullscreen"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="EditText imeOptions=actionSearch" />
<EditText
android:id="@+id/edit1"
android:imeOptions="actionSearch"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
</LinearLayout>
</ScrollView>

73
samples/ApiDemos/res/layout/text_view_demo.xml Normal file
View File

@@ -0,0 +1,73 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (C) 2015 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="wrap_content"
android:orientation="vertical" >
<TextView
android:id="@+id/text_small"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:text="Small"
android:textAppearance="?android:attr/textAppearanceSmall" />
<TextView
android:id="@+id/text_medium"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:text="Medium"
android:textAppearance="?android:attr/textAppearanceMedium" />
<TextView
android:id="@+id/text_large"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:text="Large"
android:textAppearance="?android:attr/textAppearanceLarge" />
<!-- The TextView must have an id to maintain selection on device rotation. -->
<TextView
android:id="@+id/text_selectable"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:text="Selectable"
android:textAppearance="?android:attr/textAppearanceLarge"
android:textIsSelectable="true" />
<TextView
android:id="@+id/text_invisible"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:text="Invisibible"
android:textAppearance="?android:attr/textAppearanceLarge"
android:visibility="invisible" />
<TextView
android:id="@+id/text_background_color"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:text="View background color"
android:textAppearance="?android:attr/textAppearanceLarge"
android:background="#ff00ff00" />
</LinearLayout>

37
samples/ApiDemos/src/com/example/android/apis/view/EditTextDemo.java Normal file
View File

@@ -0,0 +1,37 @@
/*
* Copyright (C) 2015 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.
*/
package com.example.android.apis.view;
import android.app.Activity;
import android.os.Bundle;
// Need the following import to get access to the app resources, since this
// class is in a sub-package.
import com.example.android.apis.R;
/**
* Demonstrates the {@link android.widget.EditText} widget.
*/
public class EditTextDemo extends Activity {
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.edit_text_demo);
}
}

37
samples/ApiDemos/src/com/example/android/apis/view/TextViewDemo.java Normal file
View File

@@ -0,0 +1,37 @@
/*
* Copyright (C) 2015 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.
*/
package com.example.android.apis.view;
import android.app.Activity;
import android.os.Bundle;
// Need the following import to get access to the app resources, since this
// class is in a sub-package.
import com.example.android.apis.R;
/**
* Demonstrates the {@link android.widget.TextView} widget.
*/
public class TextViewDemo extends Activity {
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.text_view_demo);
}
}