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

Commit c0574f23 authored by Josh Guilfoyle's avatar Josh Guilfoyle
Browse files

Organized all T-Mobile modifications and ordered them manually. 

This is a fragile change designed only to get past an immediate problem
with GTalk services on Espresso.  The long term fix will be to remove
all modifications from framework-res.

Note that this change is very fragile and must be carefully merged.  Use
aapt dump resources framework-res.apk to ensure that all of the entries
at the end in public.xml remain at the end of the aapt dump list.

CR: Dirk Sigurdson
CR: Ed Carrigan
parent 18dd0633

core/res/res/values/public.xml

+25 −3
Original line number Diff line number Diff line
@@ -1207,14 +1207,27 @@ 
  



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

     Resources added to support dynamic theming.

     Resources added to support dynamic theming.  id="..." must be adjusted so

     that these entries are placed at the very end of the generated R.java.

     Verify with aapt dump resources

     $ANDROID_PRODUCT_OUT/system/framework/framework-res.apk.

     !!! THIS IS A TEMPORARY SOLUTION !!!

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

  <eat-comment />



  <public type="style" name="Widget.TabIndicator" />

  <public type="style" name="Widget.TabIndicator" id="0x0103009d" />

  <public type="style" name="Widget.EditText.TimePicker" />

  <public type="style" name="com_android_server_status_ExpandedView" />

  <public type="style" name="com_android_server_status_LatestItemView" />

  <public type="style" name="Widget.TextView.ListItem" />

  <public type="style" name="Widget.TextView.ListItem.White" />

  <public type="style" name="Widget.ExpandableListView.White" />

  <public type="style" name="Widget.ExpandableListView.Dialog" />

  <public type="style" name="Widget.ListView.Dialog" />

  <public type="style" name="TimePickerUpButton" />

  <public type="style" name="TimePickerDownButton" />



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

  <public type="attr" name="listItemBackground" id="0x010102c1" />



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

  <public type="attr" name="alertDialogTheme" />
@@ -1232,4 +1245,13 @@ 
  <public type="attr" name="expandedMenuTheme" />

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



  <!-- The following have been temporarily added here to avoid any accidental

       modifications to R.attr and R.id.  Will be removed shortly. -->

  <eat-comment />



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

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



  <public type="string" name="buy_ringtones" id="0x01040325" />



</resources>