03a057c1af9ca3f125c7924bf0b78da52223d8d3 - platform_frameworks_base

commit	03a057c1af9ca3f125c7924bf0b78da52223d8d3	[log] [tgz]
author	Deepanshu Gupta <deepanshu@google.com>	Wed Nov 06 15:15:32 2013 +0530
committer	Adam Lesinski <adamlesinski@google.com>	Mon Jan 27 10:31:09 2014 -0800
tree	5dd4c9e5f9eacfb667676bdf534369f83898ee21
parent	b30296b5fda75bf383c7ab3f567eb41820747869 [diff]

Manual merge of changes from frameworks/base/tools

Manually merge of following changes:
9cb5f5b5233f2331748d108d71f4b685762f32a7
1cf5df38f4bdafa1beb2674ca548ad6d9650766b
083e3caf66c21f7cc9511db479726c38d90e2d2f
81f74f4bc96ea4266cebe1b785d095558f540800
39e75835399f4d979cf82069dae2bd1ec496fb81
272d1bce798a5fef42cc2ee31f629d00c89f66eb
45f5cd49fa898a59484edfd8e291dbe10df82db2

Change-Id: Ie21ca480ac117e16e28eb554474835b762ccb104

tools/layoutlib/bridge/resources/bars/hdpi/stat_sys_battery_charge_anim100.png[Added - diff]
tools/layoutlib/bridge/resources/bars/hdpi/stat_sys_wifi_signal_4_fully.png[diff]
tools/layoutlib/bridge/resources/bars/mdpi/stat_sys_battery_charge_anim100.png[Added - diff]
tools/layoutlib/bridge/resources/bars/mdpi/stat_sys_wifi_signal_4_fully.png[diff]
tools/layoutlib/bridge/resources/bars/status_bar.xml[diff]
tools/layoutlib/bridge/resources/bars/xhdpi/stat_sys_battery_charge_anim100.png[Added - diff]
tools/layoutlib/bridge/resources/bars/xhdpi/stat_sys_wifi_signal_4_fully.png[Added - diff]
tools/layoutlib/bridge/src/android/graphics/NinePatch_Delegate.java[diff]
tools/layoutlib/bridge/src/android/text/format/Time_Delegate.java[Added - diff]
tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/view/WindowManagerImpl.java[diff]
tools/layoutlib/bridge/src/com/android/layoutlib/bridge/bars/StatusBar.java[diff]
tools/layoutlib/bridge/src/com/android/layoutlib/bridge/impl/RenderAction.java[diff]
tools/layoutlib/bridge/src/libcore/icu/DateIntervalFormat_Delegate.java[Added - diff]
tools/layoutlib/bridge/src/libcore/icu/ICU_Delegate.java[diff]
tools/layoutlib/create/.classpath[diff]
tools/layoutlib/create/README.txt[diff]
tools/layoutlib/create/src/com/android/tools/layoutlib/create/AbstractClassAdapter.java[Added - diff]
tools/layoutlib/create/src/com/android/tools/layoutlib/create/AsmAnalyzer.java[diff]
tools/layoutlib/create/src/com/android/tools/layoutlib/create/AsmGenerator.java[diff]
tools/layoutlib/create/src/com/android/tools/layoutlib/create/CreateInfo.java[diff]
tools/layoutlib/create/src/com/android/tools/layoutlib/create/ICreateInfo.java[diff]
tools/layoutlib/create/src/com/android/tools/layoutlib/create/Main.java[diff]
tools/layoutlib/create/src/com/android/tools/layoutlib/create/RefactorClassAdapter.java[Added - diff]
tools/layoutlib/create/src/com/android/tools/layoutlib/create/RenameClassAdapter.java[diff]
tools/layoutlib/create/src/com/android/tools/layoutlib/java/AutoCloseable.java[Added - diff]
tools/layoutlib/create/src/com/android/tools/layoutlib/java/Charsets.java[Added - diff]
tools/layoutlib/create/src/com/android/tools/layoutlib/java/IntegralToString.java[Added - diff]
tools/layoutlib/create/src/com/android/tools/layoutlib/java/Objects.java[Added - diff]
tools/layoutlib/create/src/com/android/tools/layoutlib/java/UnsafeByteSequence.java[Added - diff]
tools/layoutlib/create/tests/com/android/tools/layoutlib/create/AsmAnalyzerTest.java[diff]
tools/layoutlib/create/tests/com/android/tools/layoutlib/create/AsmGeneratorTest.java[diff]
tools/layoutlib/create/tests/com/android/tools/layoutlib/create/RenameClassAdapterTest.java[diff]
tools/layoutlib/create/tests/com/android/tools/layoutlib/create/dataclass/JavaClass.java[Copied from tools/layoutlib/create/tests/mock_android/view/View.java - diff]
tools/layoutlib/create/tests/data/mock_android.jar[diff]
tools/layoutlib/create/tests/data/mock_android.jardesc[Deleted - diff]
tools/layoutlib/create/tests/mock_data/java/lang/JavaClass.java[Copied from tools/layoutlib/create/tests/mock_android/view/View.java - diff]
tools/layoutlib/create/tests/mock_data/mock_android/dummy/InnerTest.java[Renamed from tools/layoutlib/create/tests/mock_android/dummy/InnerTest.java - diff]
tools/layoutlib/create/tests/mock_data/mock_android/view/View.java[Renamed from tools/layoutlib/create/tests/mock_android/view/View.java - diff]
tools/layoutlib/create/tests/mock_data/mock_android/view/ViewGroup.java[Renamed from tools/layoutlib/create/tests/mock_android/view/ViewGroup.java - diff]
tools/layoutlib/create/tests/mock_data/mock_android/widget/LinearLayout.java[Renamed from tools/layoutlib/create/tests/mock_android/widget/LinearLayout.java - diff]
tools/layoutlib/create/tests/mock_data/mock_android/widget/TableLayout.java[Renamed from tools/layoutlib/create/tests/mock_android/widget/TableLayout.java - diff]

41 files changed

tree: 5dd4c9e5f9eacfb667676bdf534369f83898ee21