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

Commit ee52a8d3 authored by DvTonder's avatar DvTonder
Browse files

Framework: Switch to the new 4.2 handling of public symbols 

With 4.2, non-api public symbols are now kept in the symbols.xml
file and no longer in the public.xml file.  This commit moves the
CyanogenMod required symbols to the proper file.

Thanks to PawitP for pointing it out

Change-Id: Ied3ea11c91eb8e8947a18b11b6d49f3a09bcbee5
parent 416d7cbf

core/res/res/values/public.xml

+0 −43
Original line number Diff line number Diff line
@@ -2028,47 +2028,4 @@ 
  <public type="style" name="Widget.DeviceDefault.CheckedTextView" id="0x010301db" />

  <public type="style" name="Widget.DeviceDefault.Light.CheckedTextView" id="0x010301dc" />



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

   Resources added in version 10 of CyanogenMod

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

  <eat-comment />



  <!-- Config.xml entries -->

  <java-symbol type="bool" name="config_forceDisableHardwareKeyboard" />

  <java-symbol type="bool" name="config_hasRotationLockSwitch" />



  <!-- Notification and battery light -->

  <java-symbol type="bool" name="config_intrusiveBatteryLed" />

  <java-symbol type="bool" name="config_multiColorBatteryLed" />

  <java-symbol type="array" name="notification_light_package_mapping" />



  <!-- Power menu -->

  <java-symbol type="string" name="global_action_screenshot" />

  <java-symbol type="string" name="global_action_choose_profile" />

  <java-symbol type="string" name="global_action_reboot" />

  <java-symbol type="string" name="global_actions_toggle_expanded_desktop_mode" />

  <java-symbol type="string" name="global_actions_expanded_desktop_mode_off_status" />

  <java-symbol type="string" name="global_actions_expanded_desktop_mode_on_status" />

  <java-symbol type="string" name="global_actions" />

  <java-symbol type="string" name="reboot_system" />

  <java-symbol type="string" name="reboot_progress" />

  <java-symbol type="array" name="shutdown_reboot_options" />

  <java-symbol type="array" name="shutdown_reboot_actions" />

  <java-symbol type="drawable" name="ic_lock_screenshot" />

  <java-symbol type="drawable" name="ic_lock_reboot" />

  <java-symbol type="drawable" name="ic_lock_profile" />

  <java-symbol type="drawable" name="ic_lock_expanded_desktop" />



  <!-- Profiles -->

  <java-symbol type="xml" name="profile_default" />

  <java-symbol type="string" name="wildcardProfile" />



  <!-- Power widget -->

  <java-symbol type="string" name="hour" />

  <java-symbol type="string" name="hours" />

  <java-symbol type="string" name="minute" />

  <java-symbol type="string" name="minutes" />

  <java-symbol type="string" name="second" />

  <java-symbol type="string" name="seconds" />



</resources>

core/res/res/values/symbols.xml

+43 −0
Original line number Diff line number Diff line
@@ -1814,4 +1814,47 @@ 
  <!-- From PinyinIME(!!!) -->

  <java-symbol type="string" name="inputMethod" />



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

   Resources added in version 10 of CyanogenMod

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

  <eat-comment />



  <!-- Config.xml entries -->

  <java-symbol type="bool" name="config_forceDisableHardwareKeyboard" />

  <java-symbol type="bool" name="config_hasRotationLockSwitch" />



  <!-- Notification and battery light -->

  <java-symbol type="bool" name="config_intrusiveBatteryLed" />

  <java-symbol type="bool" name="config_multiColorBatteryLed" />

  <java-symbol type="array" name="notification_light_package_mapping" />



  <!-- Power menu -->

  <java-symbol type="string" name="global_action_screenshot" />

  <java-symbol type="string" name="global_action_choose_profile" />

  <java-symbol type="string" name="global_action_reboot" />

  <java-symbol type="string" name="global_actions_toggle_expanded_desktop_mode" />

  <java-symbol type="string" name="global_actions_expanded_desktop_mode_off_status" />

  <java-symbol type="string" name="global_actions_expanded_desktop_mode_on_status" />

  <java-symbol type="string" name="global_actions" />

  <java-symbol type="string" name="reboot_system" />

  <java-symbol type="string" name="reboot_progress" />

  <java-symbol type="array" name="shutdown_reboot_options" />

  <java-symbol type="array" name="shutdown_reboot_actions" />

  <java-symbol type="drawable" name="ic_lock_screenshot" />

  <java-symbol type="drawable" name="ic_lock_reboot" />

  <java-symbol type="drawable" name="ic_lock_profile" />

  <java-symbol type="drawable" name="ic_lock_expanded_desktop" />



  <!-- Profiles -->

  <java-symbol type="xml" name="profile_default" />

  <java-symbol type="string" name="wildcardProfile" />



  <!-- Power widget -->

  <java-symbol type="string" name="hour" />

  <java-symbol type="string" name="hours" />

  <java-symbol type="string" name="minute" />

  <java-symbol type="string" name="minutes" />

  <java-symbol type="string" name="second" />

  <java-symbol type="string" name="seconds" />



</resources>