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

Commit 04bfa420 authored by Dianne Hackborn's avatar Dianne Hackborn
Browse files

resolved conflicts for merge of 6550076f to master

parents add6cc9d 6550076f

api/current.xml

+16 −2634

File changed.

Preview size limit exceeded, changes collapsed.

core/java/android/os/Build.java

+10 −1
Original line number Original line Diff line number Diff line
@@ -120,9 +120,18 @@ public class Build { 
         * {@link android.Manifest.permission#WRITE_EXTERNAL_STORAGE} permission to be

         * {@link android.Manifest.permission#WRITE_EXTERNAL_STORAGE} permission to be

         * able to modify the contents of the SD card.  (Apps targeting

         * able to modify the contents of the SD card.  (Apps targeting

         * earlier versions will always request the permission.)

         * earlier versions will always request the permission.)

         * <li> They must explicitly request the

         * {@link android.Manifest.permission#READ_PHONE_STATE} permission to be

         * able to be able to retrieve phone state info.  (Apps targeting

         * earlier versions will always request the permission.)

         * <li> They are assumed to support different screen densities and

         * sizes.  (Apps targeting earlier versions are assumed to only support

         * medium density normal size screens unless otherwise indicated).

         * They can still explicitly specify screen support either way with the

         * supports-screens manifest tag.

         * </ul>

         * </ul>

         */

         */

        public static final int DONUT = CUR_DEVELOPMENT;

        public static final int DONUT = 4;

    }

    }

    

    

    /** The type of build, like "user" or "eng". */

    /** The type of build, like "user" or "eng". */

core/res/res/values/attrs_manifest.xml

+1 −3
Original line number Original line Diff line number Diff line
@@ -577,9 +577,7 @@ 
         backup and restore of the application's settings to external storage. -->

         backup and restore of the application's settings to external storage. -->

    <attr name="backupAgent" format="string" />

    <attr name="backupAgent" format="string" />





    <!-- Whether the application allows its data to be backed up at all.  This

    <!-- This is not the attribute you are looking for. -->

         attribute defaults to 'true':  unless the application opts out, the

         user will be able to back up its data to desktop storage. -->

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

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





    <!-- The <code>manifest</code> tag is the root of an

    <!-- The <code>manifest</code> tag is the root of an

core/res/res/values/public.xml

+2 −23
Original line number Original line Diff line number Diff line
@@ -1128,26 +1128,12 @@ 
  <public type="attr" name="autoUrlDetect" />

  <public type="attr" name="autoUrlDetect" />

  <public type="attr" name="resizeable" />

  <public type="attr" name="resizeable" />





  <public-padding type="attr" name="donut_resource_pad" end="0x0101029f" />



  <public-padding type="id" name="donut_resource_pad" end="0x01020040" />

  

  <public type="style" name="Widget.ProgressBar.Inverse" id="0x0103005b" />

  <public type="style" name="Widget.ProgressBar.Inverse" id="0x0103005b" />

  <public type="style" name="Widget.ProgressBar.Large.Inverse" id="0x0103005c" />

  <public type="style" name="Widget.ProgressBar.Large.Inverse" id="0x0103005c" />

  <public type="style" name="Widget.ProgressBar.Small.Inverse" id="0x0103005d" /> 

  <public type="style" name="Widget.ProgressBar.Small.Inverse" id="0x0103005d" /> 

  <public-padding type="style" name="donut_resource_pad" end="0x01030070" />

  

  <public-padding type="string" name="donut_resource_pad" end="0x01040030" />



  <public-padding type="dimen" name="donut_resource_pad" end="0x01050010" />



  <public-padding type="color" name="donut_resource_pad" end="0x01060030" />



  <public-padding type="array" name="donut_resource_pad" end="0x01070010" />



  <public-padding type="anim" name="donut_resource_pad" end="0x010a0020" />





  <public-padding type="integer" name="donut_resource_pad" end="0x010e0010" />

  <public type="drawable" name="stat_sys_vp_phone_call" />

  <public type="drawable" name="stat_sys_vp_phone_call_on_hold" />

  

  

  <public type="anim" name="anticipate_interpolator" />

  <public type="anim" name="anticipate_interpolator" />

  <public type="anim" name="overshoot_interpolator" />

  <public type="anim" name="overshoot_interpolator" />
@@ -1155,10 +1141,6 @@ 
  <public type="anim" name="bounce_interpolator" />

  <public type="anim" name="bounce_interpolator" />

  <public type="anim" name="linear_interpolator" />

  <public type="anim" name="linear_interpolator" />

  

  

  <public-padding type="drawable" name="donut_resource_pad" end="0x010800d0" />

  

  <public-padding type="layout" name="donut_resource_pad" end="0x01090020" />

  

  

  

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

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

     Resources added in Eclair.

     Resources added in Eclair.
@@ -1169,9 +1151,6 @@ 
  <public type="attr" name="contentAuthority" />

  <public type="attr" name="contentAuthority" />

  <public type="attr" name="windowShowWallpaper" />

  <public type="attr" name="windowShowWallpaper" />





  <public type="drawable" name="stat_sys_vp_phone_call" />

  <public type="drawable" name="stat_sys_vp_phone_call_on_hold" />

  

  <public type="style" name="Theme.Wallpaper" />

  <public type="style" name="Theme.Wallpaper" />

  <public type="style" name="Theme.Wallpaper.NoTitleBar" />

  <public type="style" name="Theme.Wallpaper.NoTitleBar" />

  <public type="style" name="Theme.Wallpaper.NoTitleBar.Fullscreen" />

  <public type="style" name="Theme.Wallpaper.NoTitleBar.Fullscreen" />