1120 Commits

Author SHA1 Message Date
Ji-Hwan Lee
a3874f0ac6 LayoutLib: Fix broken sdk builds
Change-Id: I301b312195eb3e57cb581d015e7c0b0492084b3e
2014-06-13 20:34:54 +09:00
Deepanshu Gupta
9ad11ca07f am e3e1591c: Merge "Remove lxml dependency." into lmp-preview-dev
* commit 'e3e1591cd8d748ba5da228fe857dd785ec7965a9':
  Remove lxml dependency.
2014-06-11 17:43:36 +00:00
Deepanshu Gupta
6370c7f554 am fe01ace8: Merge "LayoutLib: Support more ContextThemeWrappers" into lmp-preview-dev
* commit 'fe01ace8ac5da2c9716a0eb0cb53fdda823b3910':
  LayoutLib: Support more ContextThemeWrappers
2014-06-11 17:43:32 +00:00
Deepanshu Gupta
3e950680c4 am 0a89c1b0: Merge "LayoutLib: Fix EditText rendering" into lmp-preview-dev
* commit '0a89c1b00762b404966e32beef1ea9a53e4a8b08':
  LayoutLib: Fix EditText rendering
2014-06-11 17:43:26 +00:00
Deepanshu Gupta
1160e6d2f7 LayoutLib: Fix EditText rendering
Framework has overloaded java.lang.System.arraycopy() for char[]. The
method is not present on the Desktop VMs. This change replaces the calls
to this method by its more general alternative - the one using Objects.

TODO: Make it more configurable and flexible to allow rewrite of any
such methods in the future.

Change-Id: I6823b13e52b1c555eb257d02b79707d84e73236f
2014-06-10 17:44:14 -07:00
Deepanshu Gupta
352d84fb07 Merge "Remove lxml dependency." into lmp-preview-dev 2014-06-10 22:12:51 +00:00
Deepanshu Gupta
125714173b Remove lxml dependency.
The encoding for the .ttx file generated is now hard-coded to be utf-8.

Change-Id: I71c208327995651fcf44b6961510f84bafb05848
2014-06-10 17:00:29 -07:00
Deepanshu Gupta
b54b78e215 LayoutLib: Support more ContextThemeWrappers
ContextThemeWrapper may be the base context for another
ContextThemeWrapper. We now extract the base context till we reach the
final context.

Change-Id: I034444a2d1579241543fd24248530b299e72498a
2014-06-10 17:44:37 -07:00
Deepanshu Gupta
75814c19d3 am e23620e6: Merge "Build LayoutLib with Java 6" into lmp-preview-dev
* commit 'e23620e684ae73558e42a51f93004c8de07ba8d5':
  Build LayoutLib with Java 6
2014-06-09 15:55:24 +00:00
Yohei Yukawa
0fcedfd8ea Merge "Introduce a sequence number to avoid redundant IPCs" 2014-06-09 12:02:30 +00:00
Yohei Yukawa
3d1e8129eb Introduce a sequence number to avoid redundant IPCs
This CL introduces a sequence number to avoid redundant IPCs
between IMM and IMMS. The basic concept is that:
1. IMMS maintains a sequence number for #notifyUserAction.
2. IMMS increases the sequence number whenever the current
   IME/subtype is changed.
3. IMMS notifies the new sequence number to IMM.
4. IMM maintains the last sent sequence number and the next
   sequence number. IMM should call #notifyUserAction only
   once per particular sequence number.
5. IMMS ignores #notifyUserAction if the specified sequence
   number is not the expected one.

BUG: 7043015
Change-Id: I19ad8542659bc092b92ee13eb9f1d68ddd4b815a
2014-06-09 18:30:02 +09:00
Deepanshu Gupta
acb119f0a2 Merge "Build LayoutLib with Java 6" into lmp-preview-dev 2014-06-07 23:32:10 +00:00
Deepanshu Gupta
f4058c8d6b Build LayoutLib with Java 6
Add source and target flags to LayoutLib Bridge to enable compatibility
with Java 6.

Change-Id: I81266af758bb57df037541d6e82600e5020a3c0d
2014-06-07 11:19:03 -07:00
Amith Yamasani
34e0888c99 am 87590b53: Merge "Add missing abstract method override in BridgePowerManager." into lmp-preview-dev
* commit '87590b5342c5c4b1fb7b1c6037d64cffd1806025':
  Add missing abstract method override in BridgePowerManager.
2014-06-06 20:57:52 +00:00
Amith Yamasani
da8738fabd Add missing abstract method override in BridgePowerManager.
Change-Id: I28a24f33f8a598e487ec21861e918a39a8875d43
2014-06-06 12:28:27 -07:00
Dianne Hackborn
d8883df650 am 87bc3c25: Merge "Improvements to low power mode." into lmp-preview-dev
* commit '87bc3c258d8be516bc0fcedeb6eec34088582061':
  Improvements to low power mode.
2014-06-06 18:26:17 +00:00
Dianne Hackborn
421e2fd044 Merge "Improvements to low power mode." into lmp-preview-dev 2014-06-06 17:46:11 +00:00
Dianne Hackborn
eb94fa7975 Improvements to low power mode.
Add new public API for monitoring low power mode.

BatteryService now puts device in to low power mode when
battery level is low.

Window manager now watches low power mode to turn off
animations.

Modifying the animator scale now gets propagated to all
processes.

Change-Id: I8fa566994764ddd4e1977631e28381ab9409f8ee
2014-06-06 10:25:36 -07:00
Deepanshu Gupta
eaa55cdc87 am ee001119: Merge "LayoutLib: Add assertions for typeface." into lmp-preview-dev
* commit 'ee0011198ff150f972c8afbc5dff695bce2af1f1':
  LayoutLib: Add assertions for typeface.
2014-06-05 22:43:22 +00:00
Deepanshu Gupta
6d14163a1e am 242dded6: Merge "LayoutLib: Font variants" into lmp-preview-dev
* commit '242dded6e8b7e5851ad7b80a0c05e4883d2a9f42':
  LayoutLib: Font variants
2014-06-05 22:43:16 +00:00
Deepanshu Gupta
6c1f78f5d6 am 9a9d96bf: Merge "LayoutLib: Add capability to simulate old versions" into lmp-preview-dev
* commit '9a9d96bf044bd75e0d75e16a6002dc20e5399866':
  LayoutLib: Add capability to simulate old versions
2014-06-05 22:43:11 +00:00
Deepanshu Gupta
a19b8c111b LayoutLib: Add assertions for typeface.
Framework passes typeface along with the paint object at many places.
Paint_Delegate is supposed to have the typeface object with it. Add
assertions to ensure that the two typefaces are indeed the same.

Change-Id: I68193513c2d99f269c0458d6493f23025bbda385
2014-06-05 14:42:14 -07:00
Deepanshu Gupta
ad69aee5ed LayoutLib: Font variants
Update to support font variants properly.

Change-Id: Iabe37babd9ddce80a9ba9eca7e0e5a0ffb090646
2014-06-05 10:34:12 -07:00
Yohei Yukawa
0297051162 Trivial method renaming for notifyTextCommitted
This CL does not change existing behavior but only renames
notifyTextCommitted with notifyUserAction so that we can use
not only text commit but also other actions such as just typing
a character will be used as a trigger to update the IME
rotation order for better IME switching experience.

BUG: 7043015
Change-Id: I7f3e13a7226ef0dceee82b67e8a0d8536f7e9807
2014-06-05 23:07:05 +09:00
Deepanshu Gupta
d0ca7b623b am dfc3bc9b: Fix build.
* commit 'dfc3bc9b3cf27a72dfd133ce62f5e791ef74659d':
  Fix build.
2014-06-05 01:10:44 +00:00
Deepanshu Gupta
c8e2d0a4f8 LayoutLib: Add capability to simulate old versions
Let the IDE know that we can simulate older versions of platform.

Change-Id: Idec6d24296dd0ae04a2d808c14604629e265d458
2014-06-04 17:08:48 -07:00
Deepanshu Gupta
33dff284df am 4c0d33f2: Merge "Add basic support for simulating older versions." into lmp-preview-dev
* commit '4c0d33f29f295e5ae27ba057fc8cb2270295865a':
  Add basic support for simulating older versions.
2014-06-05 00:02:55 +00:00
Deepanshu Gupta
58ff7de971 Fix build.
Change-Id: I877532b5056a035dbd4b0c6c55b5969d6292846a
2014-06-04 16:50:07 -07:00
Deepanshu Gupta
648a309d9b Merge "Add basic support for simulating older versions." into lmp-preview-dev 2014-06-04 23:37:37 +00:00
Deepanshu Gupta
e43dcc1d64 Merge "Distinguish between menus in ActionBar and popup." into lmp-preview-dev 2014-06-04 22:11:37 +00:00
Deepanshu Gupta
9288548527 am e478c562: am 905e113f: am 03df93bc: am 5cde33a6: am dcfba78f: am ed5ab0f0: am 022d8a9f: am bad112f2: am c8235b8e: am ffcad247: am 904b89c5: am 295184bc: am 8782a120: resolved conflicts for merge of 61fb5784 to jb-mr1-dev
* commit 'e478c5624d5eeca5adc088d9328582bd5b487963':
  Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
2014-06-04 20:56:26 +00:00
Deepanshu Gupta
e478c5624d am 905e113f: am 03df93bc: am 5cde33a6: am dcfba78f: am ed5ab0f0: am 022d8a9f: am bad112f2: am c8235b8e: am ffcad247: am 904b89c5: am 295184bc: am 8782a120: resolved conflicts for merge of 61fb5784 to jb-mr1-dev
* commit '905e113f97560dbcf71cab517ab4c1ee4faaa4d3':
  Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
2014-06-04 20:52:36 +00:00
Deepanshu Gupta
905e113f97 am 03df93bc: am 5cde33a6: am dcfba78f: am ed5ab0f0: am 022d8a9f: am bad112f2: am c8235b8e: am ffcad247: am 904b89c5: am 295184bc: am 8782a120: resolved conflicts for merge of 61fb5784 to jb-mr1-dev
* commit '03df93bcb854eedc600ef0120fd238ec974c44a1':
  Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
2014-06-04 20:48:19 +00:00
Deepanshu Gupta
5cde33a6ff am dcfba78f: am ed5ab0f0: am 022d8a9f: am bad112f2: am c8235b8e: am ffcad247: am 904b89c5: am 295184bc: am 8782a120: resolved conflicts for merge of 61fb5784 to jb-mr1-dev
* commit 'dcfba78fbb4dad6792113383b2d32eff7f2c1f88':
  Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
2014-06-04 20:41:47 +00:00
Deepanshu Gupta
3c15d8d688 am 14104896: am e4aa3138: am a9e82914: Merge branch \'klp-dev\' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into klp-dev
* commit '14104896770dd26195cd9ccfac8c1604cb95dbc6':
  Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
2014-06-04 20:32:46 +00:00
Deepanshu Gupta
022d8a9f44 am bad112f2: am c8235b8e: am ffcad247: am 904b89c5: am 295184bc: am 8782a120: resolved conflicts for merge of 61fb5784 to jb-mr1-dev
* commit 'bad112f23f09f8839b4b7294439b0fe725cc2034':
  Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
2014-06-04 20:30:05 +00:00
Deepanshu Gupta
1410489677 am e4aa3138: am a9e82914: Merge branch \'klp-dev\' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into klp-dev
* commit 'e4aa31382139ee2e319110fbfff402e0c6315952':
  Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
2014-06-04 20:29:06 +00:00
Deepanshu Gupta
bad112f23f am c8235b8e: am ffcad247: am 904b89c5: am 295184bc: am 8782a120: resolved conflicts for merge of 61fb5784 to jb-mr1-dev
* commit 'c8235b8e7446c849df10ff2f897d2a3743b4934d':
  Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
2014-06-04 20:27:49 +00:00
Deepanshu Gupta
bac0d9ae79 Distinguish between menus in ActionBar and popup.
Mark the menus in the ActionBar and the ones in the Overflow popup
separately. This enables the IDE to differentiate between the two and
enable gestures such as double-click to open the menu xml for menus in
the ActionBar and single click for the menus in the Overflow popup.

Change-Id: I7a23f87d34d618a134ffbe3a665be695915d4bae
(cherry picked from commit f542f28a31b38a4e454535a1fea63968811b418c)
2014-06-04 20:16:09 +00:00
Deepanshu Gupta
904b89c584 am 295184bc: am 8782a120: resolved conflicts for merge of 61fb5784 to jb-mr1-dev
* commit '295184bc71a32a4e9418d34b2adeb0cef4b39781':
  Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
2014-06-04 20:14:52 +00:00
Deepanshu Gupta
295184bc71 am 8782a120: resolved conflicts for merge of 61fb5784 to jb-mr1-dev
* commit '8782a12005e90bbd49be579fb8ede3a42a007380':
  Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
2014-06-04 20:10:55 +00:00
Deepanshu Gupta
e87c63e0e4 am d2dff39b: am b1ca2a0c: am f52fcc70: Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into jb-mr1.1-dev
* commit 'd2dff39b587bd073fcf5c97753c8a29e16f4ef57':
  Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
2014-06-04 19:43:09 +00:00
Deepanshu Gupta
8782a12005 resolved conflicts for merge of 61fb5784 to jb-mr1-dev
Change-Id: I079d5db0d69fd1972e6754cdd1829dfd1645202d
2014-06-04 12:43:01 -07:00
Deepanshu Gupta
61fb578432 am 3ff08eb6: Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
* commit '3ff08eb6bf68868d4f4e872fbbf1ecaf521934a9':
  Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
2014-06-04 19:32:05 +00:00
Craig Mautner
f3f8a73a57 am 05cd6c39: Merge "Force all windows to redraw before unblanking screen" into lmp-preview-dev
* commit '05cd6c39824653e0f7e8641444a7134e8cac72f4':
  Force all windows to redraw before unblanking screen
2014-06-04 18:44:16 +00:00
Craig Mautner
8a0da0184f Force all windows to redraw before unblanking screen
The screen turning on would show windows as they were when the screen
turned off. This fix forces all showing windows to redraw first and
only then allow the screen to turn on.

Fixes bug 15092354.

Change-Id: I52c3f47438176a5ac00ba9a4d5205b56a5aa48f9
2014-06-03 17:08:02 -07:00
Craig Mautner
22af5b8428 am 81dfc082: Merge "Force all windows to redraw before unblanking screen" into klp-modular-dev
* commit '81dfc082d2add8463469e3eac9db94d6d93005ce':
  Force all windows to redraw before unblanking screen
2014-06-03 22:44:52 +00:00
Craig Mautner
81dfc082d2 Merge "Force all windows to redraw before unblanking screen" into klp-modular-dev 2014-06-03 22:41:38 +00:00
Deepanshu Gupta
4f69d5b8e9 am 8af310c0: am 8f6a9a65: am 8974a5e6: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
* commit '8af310c0c6a0922d2a84600f9abf7877009d12ba':
  LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
2014-06-03 20:32:57 +00:00
Deepanshu Gupta
0ab0d875d4 am 28f550f0: am 03a83266: am 08d2007b: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
* commit '28f550f010045d5df9e7762a567fb0351499b846':
  LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
2014-06-03 20:30:53 +00:00