summaryrefslogtreecommitdiffstats
path: root/samples/Support7Demos/res
diff options
context:
space:
mode:
Diffstat (limited to 'samples/Support7Demos/res')
-rw-r--r--samples/Support7Demos/res/drawable-hdpi/drawer_shadow.9.pngbin0 -> 171 bytes
-rwxr-xr-xsamples/Support7Demos/res/drawable-hdpi/ic_android.pngbin0 -> 358 bytes
-rw-r--r--samples/Support7Demos/res/drawable-mdpi/drawer_shadow.9.pngbin0 -> 158 bytes
-rwxr-xr-xsamples/Support7Demos/res/drawable-mdpi/ic_android.pngbin0 -> 226 bytes
-rw-r--r--samples/Support7Demos/res/drawable-xhdpi/drawer_shadow.9.pngbin0 -> 182 bytes
-rw-r--r--samples/Support7Demos/res/layout/action_bar_drawer_layout.xml50
-rw-r--r--samples/Support7Demos/res/layout/animated_recycler_view.xml4
-rw-r--r--samples/Support7Demos/res/layout/drawer_layout.xml75
-rw-r--r--samples/Support7Demos/res/layout/sample_media_router.xml6
-rw-r--r--samples/Support7Demos/res/layout/selectable_item.xml20
-rw-r--r--samples/Support7Demos/res/values/colors.xml2
-rw-r--r--samples/Support7Demos/res/values/strings.xml31
-rw-r--r--samples/Support7Demos/res/values/styles.xml43
13 files changed, 142 insertions, 89 deletions
diff --git a/samples/Support7Demos/res/drawable-hdpi/drawer_shadow.9.png b/samples/Support7Demos/res/drawable-hdpi/drawer_shadow.9.png
new file mode 100644
index 000000000..224cc4ff4
--- /dev/null
+++ b/samples/Support7Demos/res/drawable-hdpi/drawer_shadow.9.png
Binary files differ
diff --git a/samples/Support7Demos/res/drawable-hdpi/ic_android.png b/samples/Support7Demos/res/drawable-hdpi/ic_android.png
new file mode 100755
index 000000000..94b8fb1fa
--- /dev/null
+++ b/samples/Support7Demos/res/drawable-hdpi/ic_android.png
Binary files differ
diff --git a/samples/Support7Demos/res/drawable-mdpi/drawer_shadow.9.png b/samples/Support7Demos/res/drawable-mdpi/drawer_shadow.9.png
new file mode 100644
index 000000000..3797f99c0
--- /dev/null
+++ b/samples/Support7Demos/res/drawable-mdpi/drawer_shadow.9.png
Binary files differ
diff --git a/samples/Support7Demos/res/drawable-mdpi/ic_android.png b/samples/Support7Demos/res/drawable-mdpi/ic_android.png
new file mode 100755
index 000000000..afc43dbdd
--- /dev/null
+++ b/samples/Support7Demos/res/drawable-mdpi/ic_android.png
Binary files differ
diff --git a/samples/Support7Demos/res/drawable-xhdpi/drawer_shadow.9.png b/samples/Support7Demos/res/drawable-xhdpi/drawer_shadow.9.png
new file mode 100644
index 000000000..fa3d853e9
--- /dev/null
+++ b/samples/Support7Demos/res/drawable-xhdpi/drawer_shadow.9.png
Binary files differ
diff --git a/samples/Support7Demos/res/layout/action_bar_drawer_layout.xml b/samples/Support7Demos/res/layout/action_bar_drawer_layout.xml
deleted file mode 100644
index a68fdb40d..000000000
--- a/samples/Support7Demos/res/layout/action_bar_drawer_layout.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2014 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.
--->
-
-<!--
- A DrawerLayout is indended to be used as the top-level content view
- using match_parent for both width and height to consume the full space available.
--->
-<android.support.v4.widget.DrawerLayout
- xmlns:android="http://schemas.android.com/apk/res/android"
- android:id="@+id/drawer_layout"
- android:layout_width="match_parent"
- android:layout_height="match_parent">
- <!-- As the main content view, the view below consumes the entire
- space available using match_parent in both dimensions. -->
- <ScrollView
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:paddingLeft="16dp"
- android:paddingRight="16dp"
- android:scrollbarStyle="outsideOverlay">
- <TextView android:id="@+id/content_text"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:text="@string/drawer_layout_summary"
- android:textAppearance="?android:attr/textAppearanceMedium"/>
- </ScrollView>
- <!-- android:layout_gravity="start" tells DrawerLayout to treat
- this as a sliding drawer on the starting side, which is
- left for left-to-right locales. The drawer is given a fixed
- width in dp and extends the full height of the container. A
- solid background is used for contrast with the content view. -->
- <ListView android:id="@+id/start_drawer"
- android:layout_width="300dp"
- android:layout_height="match_parent"
- android:layout_gravity="start"
- android:background="#ff333333"/>
-</android.support.v4.widget.DrawerLayout>
diff --git a/samples/Support7Demos/res/layout/animated_recycler_view.xml b/samples/Support7Demos/res/layout/animated_recycler_view.xml
index 29a23e26a..e5ff03760 100644
--- a/samples/Support7Demos/res/layout/animated_recycler_view.xml
+++ b/samples/Support7Demos/res/layout/animated_recycler_view.xml
@@ -26,9 +26,9 @@
android:layout_height="wrap_content"/>
<CheckBox
- android:id="@+id/enableChangeAnimations"
+ android:id="@+id/enableInPlaceChange"
android:checked="false"
- android:text="@string/enableChangeAnimations"
+ android:text="@string/enableInPlaceChange"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
diff --git a/samples/Support7Demos/res/layout/drawer_layout.xml b/samples/Support7Demos/res/layout/drawer_layout.xml
new file mode 100644
index 000000000..c110af75f
--- /dev/null
+++ b/samples/Support7Demos/res/layout/drawer_layout.xml
@@ -0,0 +1,75 @@
+<?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.
+-->
+
+<!--
+ A DrawerLayout is indended to be used as the top-level content view
+ using match_parent for both width and height to consume the full space available.
+-->
+<android.support.v4.widget.DrawerLayout
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/drawer_layout"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:fitsSystemWindows="true">
+ <!-- As the main content view, the view below consumes the entire
+ space available using match_parent in both dimensions. Note that
+ this child does not specify android:layout_gravity attribute. -->
+ <FrameLayout
+ android:id="@+id/content"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent">
+ <!-- This will be set as the support action bar of the activity at runtime.
+ It needs to be a dynamic runtime call for correct vertical layering of
+ the drawer and the toolbar. -->
+ <android.support.v7.widget.Toolbar
+ android:id="@+id/toolbar"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content" />
+ <!-- Note layout_marginTop attribute with action bar height as the value.
+ This "pushes" down the main content so that it doesn't overlap with
+ the toolbar. -->
+ <ScrollView
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_marginTop="?attr/actionBarSize"
+ android:scrollbarStyle="outsideOverlay">
+ <TextView
+ android:id="@+id/content_text"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:text="@string/drawer_layout_summary"
+ android:textAppearance="?android:attr/textAppearanceMedium"
+ android:padding="16dp"/>
+ </ScrollView>
+ </FrameLayout>
+
+ <!-- android:layout_gravity="start" tells DrawerLayout to treat
+ this as a sliding drawer on the starting side, which is
+ left for left-to-right locales. The drawer is given a fixed
+ width in dp and extends the full height of the container. A
+ solid background is used for contrast with the content view.
+ android:fitsSystemWindows="true" tells the system to have
+ DrawerLayout span the full height of the screen, including the
+ system status bar on Lollipop+ versions of the plaform. -->
+ <ListView
+ android:id="@+id/start_drawer"
+ android:layout_width="300dp"
+ android:layout_height="match_parent"
+ android:layout_gravity="start"
+ android:background="#ff333333"
+ android:fitsSystemWindows="true"/>
+</android.support.v4.widget.DrawerLayout>
+
diff --git a/samples/Support7Demos/res/layout/sample_media_router.xml b/samples/Support7Demos/res/layout/sample_media_router.xml
index e2f7008df..618a8e40f 100644
--- a/samples/Support7Demos/res/layout/sample_media_router.xml
+++ b/samples/Support7Demos/res/layout/sample_media_router.xml
@@ -76,6 +76,12 @@
</TabHost>
<!-- Control buttons for the currently selected route. -->
+ <CheckBox android:id="@+id/custom_control_view_checkbox"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:text="@string/use_default_media_control"
+ android:checked="true"
+ android:visibility="gone"/>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
diff --git a/samples/Support7Demos/res/layout/selectable_item.xml b/samples/Support7Demos/res/layout/selectable_item.xml
index 3cab6fb0c..90aa080e0 100644
--- a/samples/Support7Demos/res/layout/selectable_item.xml
+++ b/samples/Support7Demos/res/layout/selectable_item.xml
@@ -5,27 +5,13 @@
android:onClick="itemClicked"
android:layout_width="match_parent"
android:layout_height="match_parent">
-
<CheckBox
android:id="@+id/selected"
android:onClick="checkboxClicked"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
-
- <LinearLayout
- android:orientation="vertical"
+ <TextView
+ android:id="@+id/text"
android:layout_width="match_parent"
- android:layout_height="wrap_content">
- <TextView
- android:id="@+id/text"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"/>
-
- <TextView
- android:id="@+id/expandedText"
- android:visibility="gone"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"/>
- </LinearLayout>
-
+ android:layout_height="wrap_content"/>
</LinearLayout> \ No newline at end of file
diff --git a/samples/Support7Demos/res/values/colors.xml b/samples/Support7Demos/res/values/colors.xml
index c8c67a0a2..8667546b0 100644
--- a/samples/Support7Demos/res/values/colors.xml
+++ b/samples/Support7Demos/res/values/colors.xml
@@ -21,4 +21,6 @@
<color name="card_classic">#BAB7A9</color>
<color name="card_sunbrite">#F9D6AC</color>
<color name="card_tropical">#56C4E8</color>
+
+ <color name="drawer_sample_metal_blue">#FF505080</color>
</resources>
diff --git a/samples/Support7Demos/res/values/strings.xml b/samples/Support7Demos/res/values/strings.xml
index accf739d1..5479a0346 100644
--- a/samples/Support7Demos/res/values/strings.xml
+++ b/samples/Support7Demos/res/values/strings.xml
@@ -27,6 +27,9 @@
<string name="media_route_menu_title">Play on...</string>
<string name="sample_media_route_settings_activity">Sample route settings</string>
+ <string name="use_default_media_control">Use default media control</string>
+ <string name="my_media_control_text">My Media Control</string>
+
<string name="library_tab_text">Library</string>
<string name="playlist_tab_text">Playlist</string>
<string name="info_tab_text">Route Info</string>
@@ -36,6 +39,8 @@
<string name="variable_volume_basic_route_name">Variable Volume (Basic) Remote Playback Route</string>
<string name="variable_volume_queuing_route_name">Variable Volume (Queuing) Remote Playback Route</string>
<string name="variable_volume_session_route_name">Variable Volume (Session) Remote Playback Route</string>
+ <string name="variable_volume_route_group_name">Variable Volume Route Group</string>
+ <string name="mixed_volume_route_group_name">Mixed Volume Route Group</string>
<string name="sample_route_description">Sample route from Support7Demos</string>
<!-- GridLayout -->
@@ -99,24 +104,6 @@
<string name="action_bar_fragment_has_options_menu">Set has options menu to true</string>
<string name="action_bar_fragment_menu_visibility">Set menu visibility to true</string>
- <!-- actionbar w/ drawer layout -->
- <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="sliding_pane_layout_support">Widget/Sliding pane layout</string>
<string name="sliding_pane_layout_summary">This activity illustrates the use of sliding panes.
@@ -155,7 +142,7 @@
<string name="checkbox_stack_from_end">Stack From End</string>
<string name="enableAnimations">Animate</string>
<string name="enablePredictiveAnimations">Predictive</string>
- <string name="enableChangeAnimations">Change Anims</string>
+ <string name="enableInPlaceChange">In Place Change</string>
<string name="add_item">Add</string>
<string name="delete_item">Del</string>
<string name="add_delete_item">A+D</string>
@@ -195,4 +182,10 @@
<string name="swipe">swipe me</string>
<string name="swiping">swiping</string>
<string name="vertical">vertical</string>
+
+ <string name="drawer_layout_activity">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. You can tap the hamburger (three horizontal lines) icon at the starting side of the action bar to open the drawer as well.</string>
+ <string name="drawer_title">Navigation</string>
+ <string name="drawer_open">Open navigation drawer</string>
+ <string name="drawer_close">Close navigation drawer</string>
</resources>
diff --git a/samples/Support7Demos/res/values/styles.xml b/samples/Support7Demos/res/values/styles.xml
index 26a9f70de..250b4bf9c 100644
--- a/samples/Support7Demos/res/values/styles.xml
+++ b/samples/Support7Demos/res/values/styles.xml
@@ -29,8 +29,49 @@
<item name="colorAccent">#ffff00</item>
</style>
+ <style name="Theme.SampleMediaRouter" parent="Theme.AppCompat">
+ <item name="colorPrimary">#fff44336</item>
+ <item name="colorPrimaryDark">#d32f2f</item>
+ <item name="alertDialogTheme">@style/Theme.SampleMediaRouter.Dialog.Alert</item>
+ </style>
+
+ <style name="Theme.SampleMediaRouter.Light" parent="Theme.AppCompat.Light">
+ <item name="colorPrimary">#ffff9800</item>
+ <item name="colorPrimaryDark">#f57c00</item>
+ <item name="alertDialogTheme">@style/Theme.SampleMediaRouter.Light.Dialog.Alert</item>
+ </style>
+
+ <style name="Theme.SampleMediaRouter.Light.DarkActionBar" parent="Theme.AppCompat.Light.DarkActionBar">
+ <item name="colorPrimary">#ff2196f3</item>
+ <item name="colorPrimaryDark">#1976d2</item>
+ <item name="alertDialogTheme">@style/Theme.SampleMediaRouter.Light.DarkActionBar.Dialog.Alert</item>
+ </style>
+
+ <style name="Theme.SampleMediaRouter.Dialog.Alert" parent="Theme.AppCompat.Dialog.Alert">
+ <item name="colorPrimary">#fff44336</item>
+ <item name="colorPrimaryDark">#d32f2f</item>
+ </style>
+
+ <style name="Theme.SampleMediaRouter.Light.Dialog.Alert" parent="Theme.AppCompat.Light.Dialog.Alert">
+ <item name="colorPrimary">#ffff9800</item>
+ <item name="colorPrimaryDark">#f57c00</item>
+ </style>
+
+ <style name="Theme.SampleMediaRouter.Light.DarkActionBar.Dialog.Alert" parent="Theme.AppCompat.Light.Dialog.Alert">
+ <item name="colorPrimary">#ff2196f3</item>
+ <item name="colorPrimaryDark">#1976d2</item>
+ </style>
+
<style name="SortedListItem" parent="@android:style/TextAppearance.Medium">
<item name="android:minHeight">35dp</item>
</style>
-</resources> \ No newline at end of file
+ <style name="Theme.SampleDrawerLayout" parent="Theme.AppCompat.NoActionBar">
+ <!-- Tell SystemUI that our activity window will draw the background for the status bar. -->
+ <item name="android:windowDrawsSystemBarBackgrounds">true</item>
+ <!-- Set the status bar to be translucent black. -->
+ <item name="android:statusBarColor">#30000000</item>
+ <item name="windowActionModeOverlay">true</item>
+ <item name="android:windowContentOverlay">@null</item>
+ </style>
+</resources>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-24 23:58:05 +0000