1221 Commits

Author SHA1 Message Date
Joe LaPenna
c0c395162f Merge "Hold a wake lock while dozing when display updates are pending." into lmp-mr1-modular-dev 2015-02-24 00:37:15 +00:00
Deepanshu Gupta
99142d2982 am 3f8e2b93: am 30a67cd1: Merge "Set forceFramework correctly for included layouts." into lmp-dev
* commit '3f8e2b9302fba0ace67fb0459d6ffb0884c4d80b':
  Set forceFramework correctly for included layouts.
2015-02-23 19:09:14 +00:00
Deepanshu Gupta
3f8e2b9302 am 30a67cd1: Merge "Set forceFramework correctly for included layouts." into lmp-dev
* commit '30a67cd17af03e53b8be5638f7f70d2989a7cd78':
  Set forceFramework correctly for included layouts.
2015-02-23 19:03:29 +00:00
Deepanshu Gupta
33c1c07796 Set forceFramework correctly for included layouts.
Bug: http://b.android.com/151326
Change-Id: I759f6e1a7a1c83bbbb771ddbb92843a105acffa4
2015-02-23 17:26:12 +00:00
Jeff Brown
c2932a1be3 Hold a wake lock while dozing when display updates are pending.
When the display state is DOZE or DOZE_SUSPEND, assume this means
that the AP may go to sleep at any time so hold a wake lock for
a little while starting when traversals are scheduled to ensure
that the AP remains awake long enough to draw and post the frame
to the display hardware.

This patch is somewhat approximate but should be good enough for
most devices today.

Note that the implementation uses the window manager to ensure that
the window which wants to draw is actually visible before acquiring
the wake lock.  There is a cost to this test (a round-trip) which
should not be significant today since we do not expect apps to draw
more than one frame or two while dozing.  However, if we wanted to
support animations in general, we might want to optimize it or
eliminate the check altogether (since we can already account for
the app's use of the wake lock).

Another way to implement this functionality might be for the view
hierarchy to listen for the power manager to report that it has entered
a non-interactive power state before deciding to poke draw locks.
This would be somewhat more accurate than watching the display state.
Also, the draw lock timeout logic could be implemented more directly
instead of using an ordinary timed wake lock.

Bug: 18284212
Change-Id: I84b341c678303e8b7481bd1620e634fe82cc4350
2015-02-20 10:54:09 -08:00
Deepanshu Gupta
0a300b8977 am ad879adb: Merge "Add Asset management support for fonts." into lmp-dev
automerge: 0684991

* commit '068499111c173fdd9869e7dbe5b9de857aca1c2d':
  Add Asset management support for fonts.
2015-02-17 22:21:11 +00:00
Diego Perez
a0fb87a3b8 am 98c3461a: Merge "Do not paint shadow if outside of the clip area" into lmp-dev
automerge: a912fed

* commit 'a912fedbc5fba99fb75884a1941d58170822ceb4':
  Do not paint shadow if outside of the clip area
2015-02-17 22:19:43 +00:00
Deepanshu Gupta
068499111c am ad879adb: Merge "Add Asset management support for fonts." into lmp-dev
* commit 'ad879adb65ffa577844738522ab6d7d30aba2ead':
  Add Asset management support for fonts.
2015-02-13 22:38:23 +00:00
Diego Perez
a912fedbc5 am 98c3461a: Merge "Do not paint shadow if outside of the clip area" into lmp-dev
* commit '98c3461acd6699ab0448f1785909d0d39cd61b5a':
  Do not paint shadow if outside of the clip area
2015-02-13 22:38:17 +00:00
Deepanshu Gupta
ad879adb65 Merge "Add Asset management support for fonts." into lmp-dev 2015-02-13 22:34:36 +00:00
Diego Perez
0dfba38010 Do not paint shadow if outside of the clip area
Change-Id: I064ccc1d1b206a29d9d0db1384782cb5dd5c65ca
2015-02-04 11:57:20 +00:00
Deepanshu Gupta
d51834bdfa Add Asset management support for fonts.
Change-Id: I10ca67dcffe244667d4ae0bda65dbc1aa6691d50
2015-02-03 19:00:43 -08:00
Deepanshu Gupta
580937fc45 am 3d5535cf: Merge "Limited AppCompat support" into lmp-dev
automerge: 7789447

* commit '7789447bd97c851b7a09623a417300590e5439d5':
  Limited AppCompat support
2015-01-31 03:02:42 +00:00
Deepanshu Gupta
1575ca6e1a am 1d59871e: Merge "Resource resolution fixes." into lmp-dev
automerge: 7e683bd

* commit '7e683bdaddff77a24a36d420c5782b47795c5ccb':
  Resource resolution fixes.
2015-01-31 03:01:20 +00:00
Deepanshu Gupta
7789447bd9 am 3d5535cf: Merge "Limited AppCompat support" into lmp-dev
* commit '3d5535cfb7755c20619529649b025c4682013b85':
  Limited AppCompat support
2015-01-31 00:54:10 +00:00
Deepanshu Gupta
7e683bdadd am 1d59871e: Merge "Resource resolution fixes." into lmp-dev
* commit '1d59871e4e8a3a657dab3931d684706c45630a2f':
  Resource resolution fixes.
2015-01-31 00:54:07 +00:00
Deepanshu Gupta
224e931fed Limited AppCompat support
Change-Id: I4ac7234c9533b9f47f070335c4cb6ae605d8a89f
2015-01-28 11:32:30 -08:00
Deepanshu Gupta
b6864ac6cd Resource resolution fixes.
1. Some dynamic ids weren't created and resulted in ResourceNotFound
exceptions.
2. Prevent NPE if a style attribute (eg. style="?attr/foo"), which
cannot be resolved, is resolved. This effectively, also results in
making it harder to catch misconfigured themes. However, support
library does it, and we don't want to throw errors when the library is
working as intended.

Change-Id: I731d8fb9209eb72b464d235d1072d416e132970b
2015-01-15 15:25:49 -08:00
Deepanshu Gupta
f2e04ac7ea am c598047d: am ca67a249: am bb600de6: am 74147527: am 8505c387: Special case AppCompat to show action bar.
* commit 'c598047d67f64e690f682d82c0e77989c79ae465':
  Special case AppCompat to show action bar.
2015-01-10 04:04:22 +00:00
Deepanshu Gupta
c598047d67 am ca67a249: am bb600de6: am 74147527: am 8505c387: Special case AppCompat to show action bar.
* commit 'ca67a249293d021808f349fa2e2f799451aeafe8':
  Special case AppCompat to show action bar.
2015-01-10 03:56:47 +00:00
Deepanshu Gupta
ca67a24929 am bb600de6: am 74147527: am 8505c387: Special case AppCompat to show action bar.
* commit 'bb600de6e7c5c7a0a1d4b872d2ee100ccc353213':
  Special case AppCompat to show action bar.
2015-01-10 03:51:05 +00:00
Deepanshu Gupta
bb600de6e7 am 74147527: am 8505c387: Special case AppCompat to show action bar.
* commit '74147527357b9abd9d30b3a2dbd72a5172a35625':
  Special case AppCompat to show action bar.
2015-01-10 02:16:44 +00:00
Deepanshu Gupta
dbd64f7c90 Support Locale.toLanguageTag on Java 6
Change-Id: I255e79e2c288cd24b350b7c26128bbbb0b2cb9a3
(cherry picked from commit 5cd9dde5a2a77c5095f985186d8f03147fd22870)
2015-01-09 17:43:12 -08:00
Deepanshu Gupta
8505c3870a Special case AppCompat to show action bar.
Bug: http://b.android.com/78944
Change-Id: I02d68d592d812016744716f99376cfefd519b21b
2015-01-10 00:29:52 +00:00
Deepanshu Gupta
169c11dd39 Merge "Add missing DateFormat method." into lmp-mr1-dev 2015-01-08 01:17:32 +00:00
Deepanshu Gupta
565b6b415a Merge "Update platform.dir search in tests." into lmp-mr1-dev 2015-01-08 01:17:23 +00:00
Deepanshu Gupta
d8e99c5861 am 3bd33f1d: Merge "Fix tests on jenkins, take 2." into lmp-dev
automerge: 0b1188e

* commit '0b1188e3c1ff6c814dc64c51c83b19afa36d8ce9':
  Fix tests on jenkins, take 2.
2015-01-07 23:53:09 +00:00
Deepanshu Gupta
6aede34e24 Add missing DateFormat method.
Change-Id: Ia03023e65ef4a7ec90b61f1f538cbe74868c63c5
2015-01-07 12:26:31 -08:00
Deepanshu Gupta
0359b4b199 Update platform.dir search in tests.
The tests search for a built sdk using some heuristics. The default path
of the built sdk has changed now, and this updates the search
accordingly.

Change-Id: I36d465d8c5f6cfd971bbdf95878fb144de233c6c
2015-01-07 12:21:59 -08:00
Deepanshu Gupta
0b1188e3c1 am 3bd33f1d: Merge "Fix tests on jenkins, take 2." into lmp-dev
* commit '3bd33f1d9e8af826fa95095ca391d40f6c75ca2a':
  Fix tests on jenkins, take 2.
2015-01-07 19:46:03 +00:00
Deepanshu Gupta
d657b14927 Fix tests on jenkins, take 2.
Change-Id: I67386c34a7abd7c3afdf9f0768f36f4786399be0
2015-01-07 11:22:22 -08:00
Deepanshu Gupta
984823f543 am 7f9582ce: am 48603a39: Fix tests on jenkins
* commit '7f9582ce616a81b70794d7942b39f8442f5ef9d5':
  Fix tests on jenkins
2015-01-07 09:23:17 +00:00
Deepanshu Gupta
7f9582ce61 am 48603a39: Fix tests on jenkins
* commit '48603a39d4dd721d231c99e10908f4f00c4ec6b9':
  Fix tests on jenkins
2015-01-07 01:43:39 +00:00
Deepanshu Gupta
48603a39d4 Fix tests on jenkins
When the tests are run on the build server, they are run from the jar,
as opposed to the extracted build, which is default when run from an
IDE. Thus, when class.getResourceAsStream() is called with ".." in the
path, it is not resolved properly. This change explicitly resolves the
relative path, so that the test is run properly on the server.

Change-Id: Ib5fabd617dca4052220e5173a8bf4fb4234254ff
2015-01-06 17:32:26 -08:00
Deepanshu Gupta
565f224540 am a6671b70: am 6461e054: Merge "Add image comparison to LayoutLib tests." into lmp-dev
* commit 'a6671b707446963f402a71219725f317a57b42af':
  Add image comparison to LayoutLib tests.
2015-01-06 22:23:01 +00:00
Deepanshu Gupta
229ce66583 am 937db7a3: am 53f73a97: Merge "Add DatePicker, CalendarView to LayoutLib tests" into lmp-dev
* commit '937db7a39ef6f5e88a936f78a729f9578123e60b':
  Add DatePicker, CalendarView to LayoutLib tests
2015-01-06 22:22:53 +00:00
Deepanshu Gupta
b187106c53 am e69e4f8b: am f9bb0b5e: Merge "Fix DatePicker rendering." into lmp-dev
* commit 'e69e4f8b4db142f024e170cf6faabb36095799b7':
  Fix DatePicker rendering.
2015-01-06 22:22:49 +00:00
Deepanshu Gupta
48ab6becea am 8c686ddd: am d20a518c: Merge "Make Preference-cookie map non static." into lmp-dev
* commit '8c686ddd540f3a15cdba4893f104c0e8e9af5716':
  Make Preference-cookie map non static.
2015-01-06 22:22:44 +00:00
Deepanshu Gupta
b88a65df73 am cec8e5a1: am f861c0ce: Merge "Fix default initial value for preferences" into lmp-dev
* commit 'cec8e5a10de413c733223b8b1cc11b70c6254647':
  Fix default initial value for preferences
2015-01-06 22:22:40 +00:00
Deepanshu Gupta
2bd01ebfa9 am 7ed14549: am 7081a114: Merge "Add preferences rendering." into lmp-dev
* commit '7ed145493d3f5bea32c567980f77cc42f613197e':
  Add preferences rendering.
2015-01-06 22:22:36 +00:00
Deepanshu Gupta
a6671b7074 am 6461e054: Merge "Add image comparison to LayoutLib tests." into lmp-dev
* commit '6461e05420c6f42b0e70134a4e0d2a626161ab74':
  Add image comparison to LayoutLib tests.
2015-01-05 23:33:18 +00:00
Deepanshu Gupta
937db7a39e am 53f73a97: Merge "Add DatePicker, CalendarView to LayoutLib tests" into lmp-dev
* commit '53f73a97542c277a519b973060dfa217849b66de':
  Add DatePicker, CalendarView to LayoutLib tests
2015-01-05 23:33:10 +00:00
Deepanshu Gupta
e69e4f8b4d am f9bb0b5e: Merge "Fix DatePicker rendering." into lmp-dev
* commit 'f9bb0b5e133b0c364c3f87623f0fdff0fedc5226':
  Fix DatePicker rendering.
2015-01-05 23:33:06 +00:00
Deepanshu Gupta
8c686ddd54 am d20a518c: Merge "Make Preference-cookie map non static." into lmp-dev
* commit 'd20a518c82e5e33d33e3dc5d74bf3c17d807f7d7':
  Make Preference-cookie map non static.
2015-01-05 23:33:02 +00:00
Deepanshu Gupta
cec8e5a10d am f861c0ce: Merge "Fix default initial value for preferences" into lmp-dev
* commit 'f861c0ce3ff42550f3d5ede837e7bfb3855f5964':
  Fix default initial value for preferences
2015-01-05 23:32:58 +00:00
Deepanshu Gupta
7ed145493d am 7081a114: Merge "Add preferences rendering." into lmp-dev
* commit '7081a114d4ee190c746f337057b0f84928c162dd':
  Add preferences rendering.
2015-01-05 23:32:53 +00:00
Deepanshu Gupta
58df125bbc Add image comparison to LayoutLib tests.
The LayoutLib rendering tests now compares the rendered image with a
golden file from a previous execution. This will help catch any
unexpected changes in the final rendering.

Change-Id: I80251a778e89df7d7ec13863a8f299967f3d747d
2015-01-05 11:32:41 -08:00
Deepanshu Gupta
eae390a94e Add DatePicker, CalendarView to LayoutLib tests
Change-Id: Ice8c41ff90ccb0ffe90fcbfcccc91ea24225a3d9
2015-01-02 11:20:19 -08:00
Deepanshu Gupta
f5b02eb7c4 resolved conflicts for a0bc2e7e to lmp-mr1-dev
The original change wasn't properly merged into lmp-mr1-dev because of
merge conflicts. This change manually resolves the conflicts. The main
reason for the conflict was that TimePickerSpinnerDelegate was swapped
with TimePickerClockDelegate.

This change also fixes the typo in the original change which was fixed
in a subsequent change.

Original commit: 12b6d29b7b5592dcfb6e6fd6f0c21a40f37d014a
fix for typo: cb09bc45c58740af953874f9915306d351fc3d9d

Change-Id: I50bf8c2d86318f632465a38adfad16d1382a9319
2014-12-30 14:07:29 -08:00
Deepanshu Gupta
e64a5bd2fb Fix DatePicker rendering.
1. Return AccessibilityManager service from context.
2. Don't throw an exception if no style specifited in
obtainStyledAttributes. Specifying no style is valid and it's supposed
to use the default theme in that case.

Bug: http://b.android.com/82712 and http://b.android.com/79218
Change-Id: Iba7097f36996e4d6f1e9db778dc73294f2854c79
2014-12-29 12:29:16 -08:00