diff options
| author | Fabrice Di Meglio <fdimeglio@google.com> | 2012-07-19 13:29:25 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-07-19 13:29:25 -0700 |
| commit | 7a36ef347905b083924e95653494f37406ae868a (patch) | |
| tree | 2458cc3d71bbab74bd975e05d2ab8f6d97549ae5 /samples | |
| parent | d13daae46433af51d480f1ab0160312dd235ada6 (diff) | |
| parent | 161859ee8419afc46e41e56d92e8f17022e27947 (diff) | |
| download | android_development-7a36ef347905b083924e95653494f37406ae868a.tar.gz android_development-7a36ef347905b083924e95653494f37406ae868a.tar.bz2 android_development-7a36ef347905b083924e95653494f37406ae868a.zip | |
Merge "Update ApiDemos for ActionBar"
Diffstat (limited to 'samples')
| -rw-r--r-- | samples/ApiDemos/AndroidManifest.xml | 5 | ||||
| -rw-r--r-- | samples/ApiDemos/src/com/example/android/apis/app/ActionBarDisplayOptions.java | 12 |
2 files changed, 9 insertions, 8 deletions
diff --git a/samples/ApiDemos/AndroidManifest.xml b/samples/ApiDemos/AndroidManifest.xml index 54e972323..817b23ac1 100644 --- a/samples/ApiDemos/AndroidManifest.xml +++ b/samples/ApiDemos/AndroidManifest.xml @@ -36,7 +36,7 @@ <!-- For android.media.audiofx.Visualizer --> <uses-permission android:name="android.permission.RECORD_AUDIO" /> - <uses-sdk android:minSdkVersion="4" android:targetSdkVersion="14" /> + <uses-sdk android:minSdkVersion="4" android:targetSdkVersion="16" /> <!-- We will request access to the camera, saying we require a camera of some sort but not one with autofocus capability. --> @@ -47,7 +47,8 @@ <application android:name="ApiDemosApplication" android:label="@string/activity_sample_code" android:icon="@drawable/app_sample_code" - android:hardwareAccelerated="true"> + android:hardwareAccelerated="true" + android:supportsRtl="true"> <!-- This is how we can request a library but still allow the app to be installed if it doesn't exist. --> diff --git a/samples/ApiDemos/src/com/example/android/apis/app/ActionBarDisplayOptions.java b/samples/ApiDemos/src/com/example/android/apis/app/ActionBarDisplayOptions.java index 5585c91a3..257f0cd44 100644 --- a/samples/ApiDemos/src/com/example/android/apis/app/ActionBarDisplayOptions.java +++ b/samples/ApiDemos/src/com/example/android/apis/app/ActionBarDisplayOptions.java @@ -93,18 +93,18 @@ public class ActionBarDisplayOptions extends Activity case R.id.cycle_custom_gravity: ActionBar.LayoutParams lp = (ActionBar.LayoutParams) mCustomView.getLayoutParams(); int newGravity = 0; - switch (lp.gravity & Gravity.HORIZONTAL_GRAVITY_MASK) { - case Gravity.LEFT: + switch (lp.gravity & Gravity.RELATIVE_HORIZONTAL_GRAVITY_MASK) { + case Gravity.START: newGravity = Gravity.CENTER_HORIZONTAL; break; case Gravity.CENTER_HORIZONTAL: - newGravity = Gravity.RIGHT; + newGravity = Gravity.END; break; - case Gravity.RIGHT: - newGravity = Gravity.LEFT; + case Gravity.END: + newGravity = Gravity.START; break; } - lp.gravity = lp.gravity & ~Gravity.HORIZONTAL_GRAVITY_MASK | newGravity; + lp.gravity = lp.gravity & ~Gravity.RELATIVE_HORIZONTAL_GRAVITY_MASK | newGravity; bar.setCustomView(mCustomView, lp); return; } |