Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8868f979 authored by Adam Powell's avatar Adam Powell Committed by Android (Google) Code Review
Browse files

Merge "Fix bug 5011824 - New Holo overflow menu for physical menu key devices"

parents 30a6e387 dfee59af

core/java/android/view/IWindowManager.aidl

+7 −0
Original line number Original line Diff line number Diff line
@@ -184,6 +184,13 @@ interface IWindowManager 
     */

     */

    int watchRotation(IRotationWatcher watcher);

    int watchRotation(IRotationWatcher watcher);





    /**

     * Determine the preferred edge of the screen to pin the compact options menu against.

     * @return a Gravity value for the options menu panel

     * @hide

     */

    int getPreferredOptionsPanelGravity();



	/**

	/**

	 * Lock the device orientation to the current rotation. Sensor input will

	 * Lock the device orientation to the current rotation. Sensor input will

	 * be ignored until thawRotation() is called.

	 * be ignored until thawRotation() is called.

core/res/res/layout/expanded_menu_layout.xml

+1 −1
Original line number Original line Diff line number Diff line
@@ -16,5 +16,5 @@ 




<com.android.internal.view.menu.ExpandedMenuView xmlns:android="http://schemas.android.com/apk/res/android"

<com.android.internal.view.menu.ExpandedMenuView xmlns:android="http://schemas.android.com/apk/res/android"

	android:id="@+android:id/expanded_menu" 

	android:id="@+android:id/expanded_menu" 

	android:layout_width="296dip"

	android:layout_width="?android:attr/panelMenuListWidth"

	android:layout_height="wrap_content" />
 
	android:layout_height="wrap_content" />

core/res/res/layout/list_menu_item_layout.xml

+1 −1
Original line number Original line Diff line number Diff line
@@ -16,7 +16,7 @@ 




<com.android.internal.view.menu.ListMenuItemView xmlns:android="http://schemas.android.com/apk/res/android"

<com.android.internal.view.menu.ListMenuItemView xmlns:android="http://schemas.android.com/apk/res/android"

    android:layout_width="match_parent"

    android:layout_width="match_parent"

    android:layout_height="?android:attr/listPreferredItemHeight">

    android:layout_height="?android:attr/listPreferredItemHeightSmall">

    

    

    <!-- Icon will be inserted here. -->

    <!-- Icon will be inserted here. -->

core/res/res/values/attrs.xml

+4 −0
Original line number Original line Diff line number Diff line
@@ -439,6 +439,10 @@ 
        <!-- Default appearance of panel text. -->

        <!-- Default appearance of panel text. -->

        <attr name="panelTextAppearance" format="reference" />

        <attr name="panelTextAppearance" format="reference" />





        <attr name="panelMenuIsCompact" format="boolean" />

        <attr name="panelMenuListWidth" format="dimension" />

        <attr name="panelMenuListTheme" format="reference" />



        <!-- =================== -->

        <!-- =================== -->

        <!-- Other widget styles -->

        <!-- Other widget styles -->

        <!-- =================== -->

        <!-- =================== -->

core/res/res/values/themes.xml

+29 −2
Original line number Original line Diff line number Diff line
@@ -185,6 +185,9 @@ please see themes_device_defaults.xml. 
        <item name="panelColorForeground">?android:attr/textColorPrimary</item>

        <item name="panelColorForeground">?android:attr/textColorPrimary</item>

        <item name="panelTextAppearance">?android:attr/textAppearance</item>

        <item name="panelTextAppearance">?android:attr/textAppearance</item>





        <item name="panelMenuIsCompact">false</item>

        <item name="panelMenuListWidth">296dip</item>



        <!-- Scrollbar attributes -->

        <!-- Scrollbar attributes -->

        <item name="scrollbarFadeDuration">250</item>

        <item name="scrollbarFadeDuration">250</item>

        <item name="scrollbarDefaultDelayBeforeFade">300</item> 

        <item name="scrollbarDefaultDelayBeforeFade">300</item>
@@ -755,6 +758,22 @@ please see themes_device_defaults.xml. 
        <item name="android:background">@null</item>

        <item name="android:background">@null</item>

    </style>

    </style>





    <style name="Theme.Holo.CompactMenu">

        <!-- Menu/item attributes -->

        <item name="android:itemTextAppearance">?android:attr/textAppearanceMedium</item>

        <item name="android:listViewStyle">@android:style/Widget.Holo.ListView</item>

        <item name="android:windowAnimationStyle">@android:style/Animation.DropDownUp</item>

        <item name="android:background">@null</item>

    </style>



    <style name="Theme.Holo.Light.CompactMenu">

        <!-- Menu/item attributes -->

        <item name="android:itemTextAppearance">?android:attr/textAppearanceMedium</item>

        <item name="android:listViewStyle">@android:style/Widget.Holo.Light.ListView</item>

        <item name="android:windowAnimationStyle">@android:style/Animation.DropDownUp</item>

        <item name="android:background">@null</item>

    </style>



    <!-- @hide -->

    <!-- @hide -->

    <style name="Theme.Dialog.AppError" parent="Theme.Holo.Dialog">

    <style name="Theme.Dialog.AppError" parent="Theme.Holo.Dialog">

        <item name="windowFrame">@null</item>

        <item name="windowFrame">@null</item>
@@ -947,13 +966,17 @@ please see themes_device_defaults.xml. 
        <item name="toastFrameBackground">@android:drawable/toast_frame_holo</item>

        <item name="toastFrameBackground">@android:drawable/toast_frame_holo</item>

        

        

        <!-- Panel attributes -->

        <!-- Panel attributes -->

        <item name="panelBackground">@android:drawable/menu_background</item>

        <item name="panelBackground">@android:drawable/menu_dropdown_panel_holo_dark</item>

        <item name="panelFullBackground">@android:drawable/menu_background_fill_parent_width</item>

        <item name="panelFullBackground">@android:drawable/menu_background_fill_parent_width</item>

        <!-- These three attributes do not seems to be used by the framework. Declared public though -->

        <!-- These three attributes do not seems to be used by the framework. Declared public though -->

        <item name="panelColorBackground">#000</item>

        <item name="panelColorBackground">#000</item>

        <item name="panelColorForeground">?android:attr/textColorPrimary</item>

        <item name="panelColorForeground">?android:attr/textColorPrimary</item>

        <item name="panelTextAppearance">?android:attr/textAppearance</item>

        <item name="panelTextAppearance">?android:attr/textAppearance</item>





        <item name="panelMenuIsCompact">true</item>

        <item name="panelMenuListWidth">250dip</item>

        <item name="panelMenuListTheme">@android:style/Theme.Holo.CompactMenu</item>



        <!-- Scrollbar attributes -->

        <!-- Scrollbar attributes -->

        <item name="scrollbarFadeDuration">250</item>

        <item name="scrollbarFadeDuration">250</item>

        <item name="scrollbarDefaultDelayBeforeFade">300</item> 

        <item name="scrollbarDefaultDelayBeforeFade">300</item>
@@ -1244,13 +1267,17 @@ please see themes_device_defaults.xml. 
        <item name="toastFrameBackground">@android:drawable/toast_frame_holo</item>

        <item name="toastFrameBackground">@android:drawable/toast_frame_holo</item>

        

        

        <!-- Panel attributes -->

        <!-- Panel attributes -->

        <item name="panelBackground">@android:drawable/menu_background</item>

        <item name="panelBackground">@android:drawable/menu_dropdown_panel_holo_light</item>

        <item name="panelFullBackground">@android:drawable/menu_background_fill_parent_width</item>

        <item name="panelFullBackground">@android:drawable/menu_background_fill_parent_width</item>

        <!-- These three attributes do not seems to be used by the framework. Declared public though -->

        <!-- These three attributes do not seems to be used by the framework. Declared public though -->

        <item name="panelColorBackground">#000</item>

        <item name="panelColorBackground">#000</item>

        <item name="panelColorForeground">?android:attr/textColorPrimary</item>

        <item name="panelColorForeground">?android:attr/textColorPrimary</item>

        <item name="panelTextAppearance">?android:attr/textAppearance</item>

        <item name="panelTextAppearance">?android:attr/textAppearance</item>





        <item name="panelMenuIsCompact">true</item>

        <item name="panelMenuListWidth">250dip</item>

        <item name="panelMenuListTheme">@android:style/Theme.Holo.Light.CompactMenu</item>



        <!-- Scrollbar attributes -->

        <!-- Scrollbar attributes -->

        <item name="scrollbarFadeDuration">250</item>

        <item name="scrollbarFadeDuration">250</item>

        <item name="scrollbarDefaultDelayBeforeFade">300</item>

        <item name="scrollbarDefaultDelayBeforeFade">300</item>