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

Commit 73e5be19 authored by Dianne Hackborn's avatar Dianne Hackborn Committed by The Android Open Source Project
Browse files

Automated import from //branches/master/...@140926,140926

parent d9889787

api/current.xml

+22 −0
Original line number Diff line number Diff line
@@ -12120,6 +12120,17 @@ 
 visibility="public"

>

</field>

<field name="Theme_Light_Panel"

 type="int"

 transient="false"

 volatile="false"

 value="16973914"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="Theme_NoDisplay"

 type="int"

 transient="false"
@@ -12153,6 +12164,17 @@ 
 visibility="public"

>

</field>

<field name="Theme_Panel"

 type="int"

 transient="false"

 volatile="false"

 value="16973913"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="Theme_Translucent"

 type="int"

 transient="false"

core/res/res/values/public.xml

+2 −0
Original line number Diff line number Diff line
@@ -1069,6 +1069,8 @@ 
  <public type="style" name="Animation.InputMethod" id="0x01030056" />

  <public type="style" name="Widget.KeyboardView" id="0x01030057" />

  <public type="style" name="ButtonBar" id="0x01030058" />

  <public type="style" name="Theme.Panel" id="0x01030059" />

  <public type="style" name="Theme.Light.Panel" id="0x0103005a" />

  

  <public type="string" name="dialog_alert_title" id="0x01040014" />

  <public type="string" name="VideoView_error_text_invalid_progressive_playback" id="0x01040015" />

core/res/res/values/themes.xml

+31 −12
Original line number Diff line number Diff line
@@ -312,19 +312,41 @@ 
        <item name="windowContentOverlay">@null</item>

    </style>

    

    <!-- Default theme for input methods, which is used by the

         {@link android.inputmethodservice.InputMethodService} class.

         this inherits from Theme.NoTitleBar, but makes the background

         transparent, the window floating and translucent, and ensures that

         it does not dim the UI behind it.  This also configures the window

         with the standard IME animations and visuals. -->

    <style name="Theme.InputMethod" parent="Theme.NoTitleBar">

    <!-- Default dark theme for panel windows.  This removes all extraneous

         window decorations, so you basically have an empty rectangle in which

         to place your content.  It makes the window floating, with a transparent

         background, and turns off dimming behind the window. -->

    <style name="Theme.Panel">

        <item name="android:windowBackground">@android:color/transparent</item>

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

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

        <item name="android:windowIsFloating">true</item>

        <item name="android:backgroundDimEnabled">false</item>

        <item name="android:windowIsTranslucent">true</item>

        <item name="android:windowNoTitle">true</item>

    </style>



    <!-- Default light theme for panel windows.  This removes all extraneous

         window decorations, so you basically have an empty rectangle in which

         to place your content.  It makes the window floating, with a transparent

         background, and turns off dimming behind the window. -->

    <style name="Theme.Light.Panel">

        <item name="android:windowBackground">@android:color/transparent</item>

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

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

        <item name="android:windowIsFloating">true</item>

        <item name="android:backgroundDimEnabled">false</item>

        <item name="android:windowIsTranslucent">true</item>

        <item name="android:windowNoTitle">true</item>

    </style>



    <!-- Default theme for input methods, which is used by the

         {@link android.inputmethodservice.InputMethodService} class.

         this inherits from Theme.NoTitleBar, but makes the background

         transparent, the window floating and translucent, and ensures that

         it does not dim the UI behind it.  This also configures the window

         with the standard IME animations and visuals. -->

    <style name="Theme.InputMethod" parent="Theme.Panel">

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

        <item name="android:imeFullscreenBackground">@android:drawable/input_method_fullscreen_background</item>

        <item name="android:imeExtractEnterAnimation">@android:anim/input_method_extract_enter</item>
@@ -332,11 +354,8 @@ 
    </style>



    <!-- Theme for the search input bar. -->

    <style name="Theme.SearchBar" parent="Theme.Translucent.NoTitleBar">

        <item name="android:windowBackground">@android:color/transparent</item>

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

        <item name="android:windowIsFloating">true</item>

        <item name="android:windowIsTranslucent">true</item>

    <style name="Theme.SearchBar" parent="Theme.Panel">

        <item name="android:backgroundDimEnabled">true</item>

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

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

    </style>