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

Commit 7ee8002a authored by Scott Kennedy's avatar Scott Kennedy
Browse files

resolved conflicts for merge of b5d6b3fe to master 

Change-Id: Ib7beb5c22fadd7aae5039d49a819fbc91d355b6b
parents 00633e02 b5d6b3fe

core/java/android/view/View.java

+1 −1
Original line number Diff line number Diff line
@@ -6889,7 +6889,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, 
    /**

     * Adds the children of a given View for accessibility. Since some Views are

     * not important for accessibility the children for accessibility are not

     * necessarily direct children of the riew, rather they are the first level of

     * necessarily direct children of the view, rather they are the first level of

     * descendants important for accessibility.

     *

     * @param children The list of children for accessibility.

docs/html/guide/practices/ui_guidelines/icon_design_action_bar.jd

+1 −1
Original line number Diff line number Diff line
@@ -96,7 +96,7 @@ finished Action Bar icon dimensions for each generalized screen density.</p> 
    </th>

  </tr>

  <tr>

    <th style="background-color:#f3f3f3;font-weight:normal">

    <th>

      Action Bar Icon Size

    </th>

    <td>

docs/html/guide/practices/ui_guidelines/icon_design_dialog.jd

+40 −30
Original line number Diff line number Diff line
@@ -54,18 +54,28 @@ icon dimensions for each of the three generalized screen densities.</p> 
<table>

  <tbody>

  <tr>

      <th style="background-color:#f3f3f3;font-weight:normal">

        <nobr>Low density screen <em>(ldpi)</em></nobr>

    <th></th>

    <th>

      <code>ldpi</code> (120 dpi)<br>

      <small style="font-weight: normal">(Low density screen)</small>

    </th>

      <th style="background-color:#f3f3f3;font-weight:normal">

        <nobr>Medium density screen <em>(mdpi)</em></nobr>

    <th>

      <code>mdpi</code> (160 dpi)<br>

      <small style="font-weight: normal">(Medium density screen)</small>

    </th>

      <th style="background-color:#f3f3f3;font-weight:normal">

        <nobr>High density screen <em>(hdpi)</em><nobr>

    <th>

      <code>hdpi</code> (240 dpi)<br>

      <small style="font-weight: normal">(High density screen)</small>

    </th>

    <th>

      <code>xhdpi</code> (320 dpi)<br>

      <small style="font-weight: normal">(Extra-high density screen)</small>

    </th>

  </tr>



  <tr>

    <th style="background-color:#f3f3f3;font-weight:normal">

      Dialog Icon Size

    </th>

    <td>

      24 x 24 px

    </td>
@@ -75,13 +85,13 @@ icon dimensions for each of the three generalized screen densities.</p> 
    <td>

      48 x 48 px

    </td>

    <td>

      64 x 64 px

    </td>

  </tr>



  </tbody>

</table>







<p><strong>Final art must be exported as a transparent PNG file. Do not include

a background color</strong>.</p>

docs/html/guide/practices/ui_guidelines/icon_design_launcher.jd

+1 −1
Original line number Diff line number Diff line
@@ -213,7 +213,7 @@ finished launcher icon dimensions for each generalized screen density.</p> 
    </th>

  </tr>

  <tr>

    <th style="background-color:#f3f3f3;font-weight:normal">

    <th>

      Launcher Icon Size

    </th>

    <td>

docs/html/guide/practices/ui_guidelines/icon_design_list.jd

+40 −30
Original line number Diff line number Diff line
@@ -56,18 +56,28 @@ icon dimensions for each of the three generalized screen densities.</p> 
<table>

  <tbody>

  <tr>

      <th style="background-color:#f3f3f3;font-weight:normal">

        <nobr>Low density screen <em>(ldpi)</em></nobr>

    <th></th>

    <th>

      <code>ldpi</code> (120 dpi)<br>

      <small style="font-weight: normal">(Low density screen)</small>

    </th>

      <th style="background-color:#f3f3f3;font-weight:normal">

        <nobr>Medium density screen <em>(mdpi)</em></nobr>

    <th>

      <code>mdpi</code> (160 dpi)<br>

      <small style="font-weight: normal">(Medium density screen)</small>

    </th>

      <th style="background-color:#f3f3f3;font-weight:normal">

        <nobr>High density screen <em>(hdpi)</em><nobr>

    <th>

      <code>hdpi</code> (240 dpi)<br>

      <small style="font-weight: normal">(High density screen)</small>

    </th>

    <th>

      <code>xhdpi</code> (320 dpi)<br>

      <small style="font-weight: normal">(Extra-high density screen)</small>

    </th>

  </tr>



  <tr>

    <th style="background-color:#f3f3f3;font-weight:normal">

      List View Icon Size

    </th>

    <td>

      24 x 24 px

    </td>
@@ -77,13 +87,13 @@ icon dimensions for each of the three generalized screen densities.</p> 
    <td>

      48 x 48 px

    </td>

    <td>

      64 x 64 px

    </td>

  </tr>



  </tbody>

</table>







<p><strong>Final art must be exported as a transparent PNG file. Do not include

a background color</strong>.</p>