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

am 1cb84db2: Merge "Add RTL support in Support4Demos manifest, fix DrawerLayout sample" into jb-mr2-ub-dev

Browse Source 
* commit '1cb84db2c9279dc82d9580c6c4f8542f77515c96':
  Add RTL support in Support4Demos manifest, fix DrawerLayout sample
This commit is contained in:
Alan Viverette
2013-08-06 11:13:20 -07:00
committed by Android Git Automerger
parent 73a124536a 1cb84db2c9
commit 19142864e8
4 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
samples/Support4Demos/AndroidManifest.xml
View File

@@ -36,7 +36,8 @@
<application android:label="@string/activity_sample_code"
android:icon="@drawable/app_sample_code"
android:hardwareAccelerated="true">
android:hardwareAccelerated="true"
android:supportsRtl="true">
<activity android:name="Support4Demos">
<intent-filter>

14
samples/Support4Demos/res/layout/drawer_layout.xml
View File

@@ -37,15 +37,15 @@
android:text="@string/drawer_layout_summary"
android:textAppearance="?android:attr/textAppearanceMedium"/>
</ScrollView>
<!-- android:layout_gravity="left" tells DrawerLayout to treat
this as a sliding drawer on the left side. 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/left_drawer"
<!-- 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="left"
android:layout_gravity="start"
android:background="#ff333333"/>
</android.support.v4.widget.DrawerLayout>

2
samples/Support4Demos/res/values/strings.xml
View File

@@ -158,7 +158,7 @@
<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 left edge with an edge swipe. If this demo is running on Ice Cream Sandwich or newer you may tap the icon at the left side of the action bar to open the drawer as well.</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>
<string name="drawer_open">Open navigation drawer</string>
<string name="drawer_close">Close navigation drawer</string>

2
samples/Support4Demos/src/com/example/android/supportv4/widget/DrawerLayoutActivity.java
View File

@@ -83,7 +83,7 @@ public class DrawerLayoutActivity extends Activity {
setContentView(R.layout.drawer_layout);
mDrawerLayout = (DrawerLayout) findViewById(R.id.drawer_layout);
mDrawer = (ListView) findViewById(R.id.left_drawer);
mDrawer = (ListView) findViewById(R.id.start_drawer);
mContent = (TextView) findViewById(R.id.content_text);
mDrawerLayout.setDrawerListener(new DemoDrawerListener());