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

Commit 25498099 authored by Amith Yamasani's avatar Amith Yamasani
Browse files

resolved conflicts for merge of 61b19ea1 to master 

Change-Id: I0128e6ed15fdeb54b0ed81665731fcbfe76e3a0c
parents 6959232e 61b19ea1

api/current.txt

+3 −3
Original line number Diff line number Diff line
@@ -620,7 +620,7 @@ package android { 
    field public static final int keyboardLayout = 16843691; // 0x10103ab

    field public static final int keyboardMode = 16843341; // 0x101024d

    field public static final int keycode = 16842949; // 0x10100c5

    field public static final int keyset = 16843727; // 0x10103cf

    field public static final int keyset = 16843729; // 0x10103d1

    field public static final int killAfterRestore = 16843420; // 0x101029c

    field public static final int label = 16842753; // 0x1010001

    field public static final int labelFor = 16843718; // 0x10103c6
@@ -847,7 +847,7 @@ package android { 
    field public static final int reqNavigation = 16843306; // 0x101022a

    field public static final int reqTouchScreen = 16843303; // 0x1010227

    field public static final int required = 16843406; // 0x101028e

    field public static final int requiredForAllUsers = 16843729; // 0x10103d1

    field public static final int requiredForAllUsers = 16843728; // 0x10103d0

    field public static final int requiresFadingEdge = 16843685; // 0x10103a5

    field public static final int requiresSmallestWidthDp = 16843620; // 0x1010364

    field public static final int resizeMode = 16843619; // 0x1010363
@@ -1176,7 +1176,7 @@ package android { 
    field public static final int windowMinWidthMinor = 16843607; // 0x1010357

    field public static final int windowNoDisplay = 16843294; // 0x101021e

    field public static final int windowNoTitle = 16842838; // 0x1010056

    field public static final int windowOverscan = 16843728; // 0x10103d0

    field public static final int windowOverscan = 16843727; // 0x10103cf

    field public static final int windowShowAnimation = 16842934; // 0x10100b6

    field public static final int windowShowWallpaper = 16843410; // 0x1010292

    field public static final int windowSoftInputMode = 16843307; // 0x101022b

core/res/res/values/public.xml

+9 −9
Original line number Diff line number Diff line
@@ -2033,15 +2033,8 @@ 
     =============================================================== -->

  <eat-comment />



  <public type="attr" name="mipMap" id="0x010103cd" />

  <public type="attr" name="mirrorForRtl" id="0x010103ce" />



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

         Resources added in version 19 of the platform

         =============================================================== -->

      <eat-comment />



  <public type="attr" name="keyset" id="0x010103cf" />

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

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

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

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

  <public type="style" name="Theme.NoTitleBar.Overscan" />
@@ -2052,4 +2045,11 @@ 
  <public type="style" name="Theme.DeviceDefault.NoActionBar.Overscan" />

  <public type="style" name="Theme.DeviceDefault.Light.NoActionBar.Overscan" />



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

    Resources added in version 19 of the platform

    =============================================================== -->

  <eat-comment />



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



</resources>