diff options
| author | Vladislav Kaznacheev <kaznacheev@google.com> | 2017-01-19 11:05:47 -0800 |
|---|---|---|
| committer | Vladislav Kaznacheev <kaznacheev@google.com> | 2017-01-19 11:05:47 -0800 |
| commit | 0f87eb452fb079f6182585039a0c8a287763720a (patch) | |
| tree | b4b3f69b2ca0598cecbeb7063b6a8cf8f0198f7c /samples/ApiDemos | |
| parent | 7fb7f2bca10d17f1e88bb2900ef5f79ab3bcf596 (diff) | |
| download | android_development-0f87eb452fb079f6182585039a0c8a287763720a.tar.gz android_development-0f87eb452fb079f6182585039a0c8a287763720a.tar.bz2 android_development-0f87eb452fb079f6182585039a0c8a287763720a.zip | |
Rename View.setTooltip/getTooltip to setTooltipText/getTooltipText
Bug: 34454987
Test: adb shell am start -n com.example.android.apis/.view.Tooltips
Change-Id: I16156e5b928202f50f7290ff30ad36aa80d615d2
Diffstat (limited to 'samples/ApiDemos')
| -rw-r--r-- | samples/ApiDemos/res/layout/tooltips.xml | 16 | ||||
| -rw-r--r-- | samples/ApiDemos/src/com/example/android/apis/view/Tooltips.java | 2 |
2 files changed, 9 insertions, 9 deletions
diff --git a/samples/ApiDemos/res/layout/tooltips.xml b/samples/ApiDemos/res/layout/tooltips.xml index c7d46bf09..e0d7e3708 100644 --- a/samples/ApiDemos/res/layout/tooltips.xml +++ b/samples/ApiDemos/res/layout/tooltips.xml @@ -25,7 +25,7 @@ android:layout_weight="0.5" android:gravity="center_horizontal" android:orientation="vertical" - android:tooltip="@string/tooltips_container_tooltip"> + android:tooltipText="@string/tooltips_container_tooltip"> <TextView android:layout_width="wrap_content" @@ -52,7 +52,7 @@ android:padding="10dp" android:textSize="16sp" android:text="@string/tooltips_resource_label" - android:tooltip="@string/tooltips_resource_tooltip" /> + android:tooltipText="@string/tooltips_resource_tooltip" /> <TextView android:background="#ccc" @@ -62,7 +62,7 @@ android:padding="10dp" android:textSize="16sp" android:text="@string/tooltips_long_label" - android:tooltip="@string/tooltips_long_tooltip" /> + android:tooltipText="@string/tooltips_long_tooltip" /> <TextView android:background="#ccc" @@ -73,7 +73,7 @@ android:padding="10dp" android:textSize="16sp" android:text="@string/tooltips_edge_label" - android:tooltip="@string/tooltips_edge_tooltip" /> + android:tooltipText="@string/tooltips_edge_tooltip" /> <View android:layout_width="1dp" @@ -88,7 +88,7 @@ android:padding="10dp" android:textSize="16sp" android:text="@string/tooltips_above_label" - android:tooltip="@string/tooltips_above_tooltip" /> + android:tooltipText="@string/tooltips_above_tooltip" /> </LinearLayout> <LinearLayout @@ -106,7 +106,7 @@ android:gravity="center" android:textSize="16sp" android:text="@string/tooltips_wide_label" - android:tooltip="@string/tooltips_wide_tooltip" /> + android:tooltipText="@string/tooltips_wide_tooltip" /> <LinearLayout android:layout_width="match_parent" @@ -123,7 +123,7 @@ android:gravity="center" android:textSize="16sp" android:text="@string/tooltips_tall_label" - android:tooltip="@string/tooltips_tall_tooltip" /> + android:tooltipText="@string/tooltips_tall_tooltip" /> <TextView android:background="#ccc" @@ -135,7 +135,7 @@ android:gravity="center" android:textSize="16sp" android:text="@string/tooltips_large_label" - android:tooltip="@string/tooltips_large_tooltip" /> + android:tooltipText="@string/tooltips_large_tooltip" /> </LinearLayout> </LinearLayout> </LinearLayout> diff --git a/samples/ApiDemos/src/com/example/android/apis/view/Tooltips.java b/samples/ApiDemos/src/com/example/android/apis/view/Tooltips.java index 2b3493b8e..511c44d8d 100644 --- a/samples/ApiDemos/src/com/example/android/apis/view/Tooltips.java +++ b/samples/ApiDemos/src/com/example/android/apis/view/Tooltips.java @@ -31,6 +31,6 @@ public class Tooltips extends Activity { super.onCreate(savedInstanceState); setContentView(R.layout.tooltips); - findViewById(R.id.tooltips_code).setTooltip("This tooltip is set in code"); + findViewById(R.id.tooltips_code).setTooltipText("This tooltip is set in code"); } } |