diff options
| author | Steve Kondik <steve@cyngn.com> | 2016-03-10 18:13:45 -0800 |
|---|---|---|
| committer | Steve Kondik <steve@cyngn.com> | 2016-03-10 18:13:45 -0800 |
| commit | 0a521f6d93206567c14bbacdc13819bf4baf82d3 (patch) | |
| tree | 2e11b47c9856368387b394b6831726f2526bf6dd /samples/Support4Demos/res/values | |
| parent | 171957c0bdc547ae6013daddffc03c8ec3ac2e3e (diff) | |
| parent | adce814038b96c87ea66fc1e5bfd85ab28d80590 (diff) | |
| download | android_development-0a521f6d93206567c14bbacdc13819bf4baf82d3.tar.gz android_development-0a521f6d93206567c14bbacdc13819bf4baf82d3.tar.bz2 android_development-0a521f6d93206567c14bbacdc13819bf4baf82d3.zip | |
Merge tag 'android-6.0.1_r22' of https://android.googlesource.com/platform/development into cm-13.0staging/cm-13.0+r22stable/cm-13.0-ZNH2KBstable/cm-13.0-ZNH2K
Android 6.0.1 release 22
Diffstat (limited to 'samples/Support4Demos/res/values')
| -rw-r--r-- | samples/Support4Demos/res/values/strings.xml | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/samples/Support4Demos/res/values/strings.xml b/samples/Support4Demos/res/values/strings.xml index 0c388b2b8..1d9f129df 100644 --- a/samples/Support4Demos/res/values/strings.xml +++ b/samples/Support4Demos/res/values/strings.xml @@ -156,18 +156,7 @@ <string name="sample_transport_controller_activity">Media/TransportController</string> - <string name="drawer_layout_support">Widget/Drawer layout</string> - - <string name="drawer_layout_summary">This activity illustrates the use of sliding drawers. The drawer may be pulled out from the starting edge, which is left on left-to-right locales, with an edge swipe. If this demo is running on Ice Cream Sandwich or newer you may tap the icon at the starting side of the action bar to open the drawer as well.</string> - - <!-- Title of the navigation drawer, used by accessibility to announce state changes. --> - <string name="drawer_title">Navigation</string> - - <!-- Description of the icon that opens the navigation drawer, used by accessibility. --> - <string name="drawer_open">Open navigation drawer</string> - - <!-- Description of the icon that closes the navigation drawer, used by accessibility. --> - <string name="drawer_close">Close navigation drawer</string> + <string name="view_pager_layout_support">View/View pager</string> <string name="sliding_pane_layout_support">Widget/Sliding pane layout</string> @@ -191,4 +180,7 @@ <string name="regular">regular</string> <string name="round">round</string> + <string name="drawable_compat_no_tint">Not tint</string> + <string name="drawable_compat_color_tint">Color tint</string> + <string name="drawable_compat_color_list_tint">Color state list</string> </resources> |