From 6a89a9ead09875a6b508ffb9a8b10f5bd3db13c5 Mon Sep 17 00:00:00 2001
From: Adam Powell <adamp@google.com>
Date: Fri, 29 Oct 2010 10:46:05 -0700
Subject: [PATCH] Added demo for ActionBar display options

Change-Id: Ib916c36c0d3f8866b4f7f3a616fe15dcf0ca007f
---
 samples/ApiDemos/AndroidManifest.xml          |   9 ++
 .../res/drawable-hdpi/apidemo_androidlogo.png | Bin 0 -> 2642 bytes
 .../res/drawable-mdpi/apidemo_androidlogo.png | Bin 0 -> 1983 bytes
 .../res/layout/action_bar_display_options.xml |  48 +++++++
 .../action_bar_display_options_custom.xml     |  17 +++
 .../res/menu/display_options_actions.xml      |  19 +++
 samples/ApiDemos/res/values/strings.xml       |  12 ++
 .../apis/app/ActionBarDisplayOptions.java     | 128 ++++++++++++++++++
 .../android/apis/app/ActionBarUsage.java      |   8 +-
 9 files changed, 237 insertions(+), 4 deletions(-)
 create mode 100644 samples/ApiDemos/res/drawable-hdpi/apidemo_androidlogo.png
 create mode 100644 samples/ApiDemos/res/drawable-mdpi/apidemo_androidlogo.png
 create mode 100644 samples/ApiDemos/res/layout/action_bar_display_options.xml
 create mode 100644 samples/ApiDemos/res/layout/action_bar_display_options_custom.xml
 create mode 100644 samples/ApiDemos/res/menu/display_options_actions.xml
 create mode 100644 samples/ApiDemos/src/com/example/android/apis/app/ActionBarDisplayOptions.java

diff --git a/samples/ApiDemos/AndroidManifest.xml b/samples/ApiDemos/AndroidManifest.xml
index cad8dd780..dbcbdab1f 100644
--- a/samples/ApiDemos/AndroidManifest.xml
+++ b/samples/ApiDemos/AndroidManifest.xml
@@ -686,6 +686,15 @@
             </intent-filter>
         </activity>
 
+        <activity android:name=".app.ActionBarDisplayOptions"
+                  android:label="@string/action_bar_display_options"
+                  android:logo="@drawable/apidemo_androidlogo">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.SAMPLE_CODE" />
+            </intent-filter>
+        </activity>
+
         <!-- ************************************* -->
         <!--       PREFERENCE PACKAGE SAMPLES      -->
         <!-- ************************************* -->
diff --git a/samples/ApiDemos/res/drawable-hdpi/apidemo_androidlogo.png b/samples/ApiDemos/res/drawable-hdpi/apidemo_androidlogo.png
new file mode 100644
index 0000000000000000000000000000000000000000..088181b9102665cc94f2e3629a7ffbce7abbf8d4
GIT binary patch
literal 2642
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

literal 0
HcmV?d00001

diff --git a/samples/ApiDemos/res/drawable-mdpi/apidemo_androidlogo.png b/samples/ApiDemos/res/drawable-mdpi/apidemo_androidlogo.png
new file mode 100644
index 0000000000000000000000000000000000000000..11cb47b2848619023bfbe3a7b53c54ff6031cd5d
GIT binary patch
literal 1983
zcmV;w2SE6VP)<h;3K|Lk000e1NJLTq006rH001Be1ONa4;5fly00002VoOIv0RM-N
z%)bBt010qNS#tmY07w7;07w8v$!k6U000Sga6xAP006rH001BW@LPHv000KZNkl<Z
zXx{CbYiw0T5XXPDq)40At|@}j0D>ASFQo>QV1f#w1VxE}BEAT;iXnngN)%9|##b=q
z)kNfBEW`p51k|FU5+4vi2ns@^5wwDWH4IvT(onBo&e^l)o=5LJx73*2f4}VP&g{%i
zcV~CzTu390G}1VS$T(LMOCDE{4>a(TI{aTRGtkOQ=t?$FPmMa>dU^xhE;;n&GR_Z?
zZBTFfN@g*FJ18>dKE_5?sbjv}gSgUn_C|hTmy$sHiYX2lic!n<U`b291EU$n#YWdb
zK4gumZ${f{duHjzkO2L^vQHff)9&kb>B)m!Pn&SV5jE7O^E#e#Eyi)<GM1^c9{w^$
z2Wp71i%RvCuksQ~LTqcInuV$^!0<MdFrF-*p?WHKSH(iKjZp`!z9GCEV!=<WWSwgC
zA3V>aAX{ef7B@8ObpHjFFwfWNkVPpKl9$wU85C14^Q3*!hGa5=cf|KRNCAtP;OlhA
zrHt34U6i%Qp(|yql79Y!ac-CPEMsKUh%XOQ5-Qt|g%OrCkV@$h!JK^NdgUaaMf3`l
z8%()G+H@WiQX#kd4Y=Gcxm3_Sst&oHi3WLuN@g>I1$<-l7BM5j)CE*XVFbDJd0sMI
zHfHb&osEv;Y~)RrvWb&MZ!u+2y%2{s%#vZ=Zr9$FmyJuJk!rr87EhexS?dyX#dc}O
zS_&+pf!A55n)FyNX46fxKB~4Eas~JYo{scqB)OVC!2RaUAPN<*)I3HpTvN}e4-Ba>
zOxMH-=JA1TrL<!#lV}@YrC)5%p+kWFKHSEonr>j6stt6z3}l`rb~95Q^<R~|VcqI(
zw~uG4Rx?TMkCVw}A-yePuX>P#Ai0!rizds}^2FpoCQ)iNx2h?+w;k*CKdY9>@hg-f
z7V1r~U)>k(_E7y9jAM$vAGfQ??r}57Owz4wJRIcoK-{TYFU30@)G4N8Kh1i{<%vzH
z>eWnEYw`ifN=yz|ifw-%qj#uwdIQtED^&ZLp-*>_^i9$O=1eiQf~WOd{Uz=;(QcQ{
zdN<ZH)BDg1hZNGqYSx&C+AyS!DotFM#ME>6(Vl{V2`{^e@2zHzaXsFkTW_nMedV_E
zu@847s83m`i4pEGXSZLgTUE`a8a{Ad3?BvZRO?nz62_lpv5$?-Bioq4hP|<3tPPY~
z<Kd2uCD^*-Hk#vh=iq-9LBWN(^+OPgs^yf2I}v=LjZZK*fppYar7lcJF8NloHYkw-
zzQay&Iz{k<d&R;odoK6G*>St`W=P=5@E~8e8bi3wL^A#iN9<-I{E{hysL<)qCOzN;
zn?FLdoz+jt3!+#X2j>NIk=gB+7Mw>@bF;NF?9E|3X60sX4&ctAuXg%LBb+#^3UR1p
z>N?clEoeFXV|F`kcj|9F*wfN}O9hgPohq53p(}$E5Pm_~Ck6GFoUl%1ceyaI-q;&E
z9MqCJ?64T)ceC61Z#Xe|SV9xF9){}d;)kT<Vw9^-Ts`)7%HXa*sZqMMH&w%>P?sSN
zDOZ4X+`dI0;Zf2#!FgK&l4Il(UneCx-;-W#)~)gWYm{raRTH15Z2T0xVd5;;ZdY~K
z1=cKHOR`dU&LC}g5xf3)m>tH@Z|scw+lRYWK2G9aOdn%Ejk75iPiikkys8~lqjslg
z`vcr$HDkQz9y71hMGUf(cBfLFNmXs?kS;uDR0|iGb#S$T4Icgsu4W?rEwX^8c)}c4
zr)7!m>CAGOZ`5SkGL}-KCNn=J%X4|u2xQgq$(iAHwO^{Z$09nhSia>;=hcg-o#({0
zJ@BtB7BG+jIQ7G=M!FRM6=N5ZWde2uWUyQnw|Q1_BX$j3F`GwZ2Zza|3j>TNG^|%!
znzg(`Kth#6ABK?QFj5}R;(kER<#MjkRA0=h#7<pYYFUg7`MTtwmRa6!KK@WkrGPOO
zF`C`3v6z&x#3=o?H)@sUTEo5@+31}RR|8LaUrnxhyE@CXB(JU3!2wFui6r<JU~><0
z*V{n}rR)op{*tMxk(NO{kNE}bxUWm<G*g*NLyI{qbu>}MLm|n$57a5_hhvUW=eI}e
zn8;fJ+4M=~@VGkNLbh+?UjNYS$x>B}N_n5V86NOWv^61YVnw8%d+gPrt0Og@H8!$9
zR&x(ST^}kAQO(*2Wk5fiVH>N})}Y~#FP~D#rR3{WxlV1i`irgFNTd2f^Y+v~yVxAO
zGv#*crJ&~m>F4_yv5`Odg@cL4bB`wHy4&ObLlI+*c{K4CHDM=8y6IE1Rh`tb{snB|
zC<j_BOr?=V8fm2QKf%8$Q}s&MSh^?x001R)MObuXVRU6WV{&C-bY%cCFflMKF)%GM
zI8-q>IyEplF*YqQH##sd>Yf`|0000bbVXQnWMOn=I&E)cX=Zr<GB7bPEio`HGB{K*
zI65^jIx#jaFgH3dFq^}p<NyEw8FWQhbW?9;ba!ELWdK2BZ(?O2No`?gWm08fWO;GP
RWjp`?002ovPDHLkV1kf{qptt}

literal 0
HcmV?d00001

diff --git a/samples/ApiDemos/res/layout/action_bar_display_options.xml b/samples/ApiDemos/res/layout/action_bar_display_options.xml
new file mode 100644
index 000000000..1718fdbc2
--- /dev/null
+++ b/samples/ApiDemos/res/layout/action_bar_display_options.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2010 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.
+-->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:layout_width="match_parent"
+              android:layout_height="match_parent"
+              android:orientation="vertical">
+    <Button android:id="@+id/toggle_home_as_up"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/toggle_home_as_up" />
+    <Button android:id="@+id/toggle_show_home"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/toggle_show_home" />
+    <Button android:id="@+id/toggle_use_logo"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/toggle_use_logo" />
+    <Button android:id="@+id/toggle_show_title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/toggle_show_title" />
+    <Button android:id="@+id/toggle_show_custom"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/toggle_show_custom" />
+    <Button android:id="@+id/toggle_navigation"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/toggle_navigation" />
+    <Button android:id="@+id/cycle_custom_gravity"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/cycle_custom_gravity" />
+</LinearLayout>
diff --git a/samples/ApiDemos/res/layout/action_bar_display_options_custom.xml b/samples/ApiDemos/res/layout/action_bar_display_options_custom.xml
new file mode 100644
index 000000000..b7f5bd952
--- /dev/null
+++ b/samples/ApiDemos/res/layout/action_bar_display_options_custom.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2010 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.
+-->
+<Button xmlns:android="http://schemas.android.com/apk/res/android"
+        android:text="@string/display_options_custom_button" />
diff --git a/samples/ApiDemos/res/menu/display_options_actions.xml b/samples/ApiDemos/res/menu/display_options_actions.xml
new file mode 100644
index 000000000..7c72de4e3
--- /dev/null
+++ b/samples/ApiDemos/res/menu/display_options_actions.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2010 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.
+-->
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:id="@+id/simple_item"
+          android:title="@string/display_options_menu_item" />
+</menu>
diff --git a/samples/ApiDemos/res/values/strings.xml b/samples/ApiDemos/res/values/strings.xml
index 5e353a069..81b5a6de8 100644
--- a/samples/ApiDemos/res/values/strings.xml
+++ b/samples/ApiDemos/res/values/strings.xml
@@ -566,6 +566,18 @@
     <string name="action_bar_zoom">Zoom</string>
     <string name="action_bar_save">Save</string>
 
+    <string name="action_bar_display_options">App/Action Bar/Display Options</string>
+    <string name="toggle_home_as_up">DISPLAY_HOME_AS_UP</string>
+    <string name="toggle_show_home">DISPLAY_SHOW_HOME</string>
+    <string name="toggle_use_logo">DISPLAY_USE_LOGO</string>
+    <string name="toggle_show_title">DISPLAY_SHOW_TITLE</string>
+    <string name="toggle_show_custom">DISPLAY_SHOW_CUSTOM</string>
+    <string name="toggle_navigation">Navigation</string>
+    <string name="cycle_custom_gravity">Cycle Custom View Gravity</string>
+
+    <string name="display_options_custom_button">Custom View!</string>
+    <string name="display_options_menu_item">Menu Item</string>
+
     <!-- ============================ -->
     <!--  graphics examples strings  -->
     <!-- ============================ -->
diff --git a/samples/ApiDemos/src/com/example/android/apis/app/ActionBarDisplayOptions.java b/samples/ApiDemos/src/com/example/android/apis/app/ActionBarDisplayOptions.java
new file mode 100644
index 000000000..02904ce90
--- /dev/null
+++ b/samples/ApiDemos/src/com/example/android/apis/app/ActionBarDisplayOptions.java
@@ -0,0 +1,128 @@
+/*
+ * Copyright (C) 2010 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.
+ */
+package com.example.android.apis.app;
+
+import com.example.android.apis.R;
+
+import android.app.ActionBar;
+import android.app.ActionBar.Tab;
+import android.app.Activity;
+import android.app.FragmentTransaction;
+import android.os.Bundle;
+import android.view.Gravity;
+import android.view.Menu;
+import android.view.View;
+import android.view.ViewGroup.LayoutParams;
+
+/**
+ * This demo shows how various action bar display option flags can be combined and their effects.
+ */
+public class ActionBarDisplayOptions extends Activity
+        implements View.OnClickListener, ActionBar.TabListener {
+    private View mCustomView;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.action_bar_display_options);
+
+        findViewById(R.id.toggle_home_as_up).setOnClickListener(this);
+        findViewById(R.id.toggle_show_home).setOnClickListener(this);
+        findViewById(R.id.toggle_use_logo).setOnClickListener(this);
+        findViewById(R.id.toggle_show_title).setOnClickListener(this);
+        findViewById(R.id.toggle_show_custom).setOnClickListener(this);
+        findViewById(R.id.toggle_navigation).setOnClickListener(this);
+        findViewById(R.id.cycle_custom_gravity).setOnClickListener(this);
+
+        mCustomView = getLayoutInflater().inflate(R.layout.action_bar_display_options_custom, null);
+        // Configure several action bar elements that will be toggled by display options.
+        final ActionBar bar = getActionBar();
+        bar.setCustomView(mCustomView,
+                new ActionBar.LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT));
+
+        bar.addTab(bar.newTab().setText("Tab 1").setTabListener(this));
+        bar.addTab(bar.newTab().setText("Tab 2").setTabListener(this));
+        bar.addTab(bar.newTab().setText("Tab 3").setTabListener(this));
+    }
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        getMenuInflater().inflate(R.menu.display_options_actions, menu);
+        return true;
+    }
+
+    @Override
+    public void onClick(View v) {
+        final ActionBar bar = getActionBar();
+        int flags = 0;
+        switch (v.getId()) {
+            case R.id.toggle_home_as_up:
+                flags = ActionBar.DISPLAY_HOME_AS_UP;
+                break;
+            case R.id.toggle_show_home:
+                flags = ActionBar.DISPLAY_SHOW_HOME;
+                break;
+            case R.id.toggle_use_logo:
+                flags = ActionBar.DISPLAY_USE_LOGO;
+                break;
+            case R.id.toggle_show_title:
+                flags = ActionBar.DISPLAY_SHOW_TITLE;
+                break;
+            case R.id.toggle_show_custom:
+                flags = ActionBar.DISPLAY_SHOW_CUSTOM;
+                break;
+
+            case R.id.toggle_navigation:
+                bar.setNavigationMode(
+                        bar.getNavigationMode() == ActionBar.NAVIGATION_MODE_STANDARD
+                                ? ActionBar.NAVIGATION_MODE_TABS
+                                : ActionBar.NAVIGATION_MODE_STANDARD);
+                return;
+            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:
+                        newGravity = Gravity.CENTER_HORIZONTAL;
+                        break;
+                    case Gravity.CENTER_HORIZONTAL:
+                        newGravity = Gravity.RIGHT;
+                        break;
+                    case Gravity.RIGHT:
+                        newGravity = Gravity.LEFT;
+                        break;
+                }
+                lp.gravity = lp.gravity & ~Gravity.HORIZONTAL_GRAVITY_MASK | newGravity;
+                bar.setCustomView(mCustomView, lp);
+                return;
+        }
+
+        int change = bar.getDisplayOptions() ^ flags;
+        bar.setDisplayOptions(change, flags);
+    }
+
+    @Override
+    public void onTabSelected(Tab tab, FragmentTransaction ft) {
+    }
+
+    @Override
+    public void onTabUnselected(Tab tab, FragmentTransaction ft) {
+    }
+
+    @Override
+    public void onTabReselected(Tab tab, FragmentTransaction ft) {
+    }
+}
diff --git a/samples/ApiDemos/src/com/example/android/apis/app/ActionBarUsage.java b/samples/ApiDemos/src/com/example/android/apis/app/ActionBarUsage.java
index 9657558cd..698005080 100644
--- a/samples/ApiDemos/src/com/example/android/apis/app/ActionBarUsage.java
+++ b/samples/ApiDemos/src/com/example/android/apis/app/ActionBarUsage.java
@@ -24,10 +24,10 @@ import android.widget.Toast;
 import com.example.android.apis.R;
 
 /**
- * This demonstrates idiomatic usage of the Action Bar. The theme Theme.WithActionBar
- * is specified for this activity in AndroidManifest.xml and a menu resource is used
- * to populate the menu data itself. If you'd like to see how these things work under
- * the hood, see ActionBarMechanics.
+ * This demonstrates idiomatic usage of the Action Bar. The default Honeycomb theme
+ * includes the action bar by default and a menu resource is used to populate the
+ * menu data itself. If you'd like to see how these things work under the hood, see
+ * ActionBarMechanics.
  */
 public class ActionBarUsage extends Activity {
     @Override