56527 Commits

Author SHA1 Message Date
Eric Rowe
f7efe33da2 Merge "Increase long timeout to 2 minutes" into lmp-dev 2014-09-06 01:28:23 +00:00
Dianne Hackborn
ce78347c37 Merge "Fix issue #17397177: BatteryStats reporting error on job start/stop" into lmp-dev 2014-09-06 00:49:28 +00:00
Justin Koh
4021e50861 Merge "Make the image wallpaper component overlayable" into lmp-dev 2014-09-06 00:45:41 +00:00
Dianne Hackborn
c3940bc1ba Fix issue #17397177: BatteryStats reporting error on job start/stop
Dumb, dumb, dumb mistake.

Also fix battery stats wakeup reason tracking to use a SamplingTimer
(like kernel wake locks) so we can track both the duration and count
for each wakeup reason.

Change-Id: I89d69661006dc533622b1b7e68a139166d3a6975
2014-09-05 17:33:06 -07:00
Jon Miranda
05cc48292b Merge "Added getStyleAttributes to access all Theme attributes." into lmp-dev 2014-09-06 00:27:20 +00:00
John Reck
3207ffe120 Merge "Disable RT-anim for AnimatorSet" into lmp-dev 2014-09-06 00:22:25 +00:00
Justin Koh
29c3016128 Make the image wallpaper component overlayable
This is necessary for devices that want to have wallpaper but don't have
SystemUi.

Bug: 17394246
Change-Id: I75c2a3a2120fd6600274d44059b3f85569b9a187
2014-09-05 17:20:16 -07:00
Alan Viverette
9ffe8c06e5 Merge "Propagate drawable hotspots when duplicate parent state is enabled" into lmp-dev 2014-09-06 00:15:09 +00:00
Eric Rowe
f5031e5494 Increase long timeout to 2 minutes
Change-Id: I2f9e15c6e551536d61ec52fbaf7f54405fa05bcd
2014-09-05 16:59:51 -07:00
Alan Viverette
e9921370d7 Merge "Simplify ripple background drawing, fix ripple alphas" into lmp-dev 2014-09-05 23:45:36 +00:00
Jeff Sharkey
5341f94a19 Merge "Separate active state from open/close." into lmp-dev 2014-09-05 23:28:31 +00:00
Jon Miranda
042ad633bc Added getStyleAttributes to access all Theme attributes.
ViewDebug uses getStyleAttributes to get the attributes, and then gets the
attribute name and value so that Hierarchy Viewer can display it.

Bug: 17407087
Change-Id: I3577e32ae99668383701dc908bb46db14a75c3c4
2014-09-05 16:19:08 -07:00
Jeff Sharkey
bc7bce38b2 Separate active state from open/close.
Also change name to setStagingProgress() to make it clearer that
system may adjust the range.  Start throwing from openSession() in
preparation for ASEC allocation moving.

Bug: 17405741
Change-Id: Id7da51a32d5d89cb512ddafbd7ceaafbcd41cac6
2014-09-05 16:16:39 -07:00
John Reck
f5945a0c8b Disable RT-anim for AnimatorSet
Bug: 17317184

 Unfortunately this will disable *all* RT animations in a scene,
 but we don't have more selective targetting currently

Change-Id: I57e1c0ae43957f45229473bdcdaf34c05825fab7
2014-09-05 15:58:26 -07:00
John Reck
4e849178ef Merge "Fix race condition" into lmp-dev 2014-09-05 22:38:42 +00:00
Svetoslav
d89c5ad3d3 Merge "Print spooler UI polish and bug fixes." into lmp-dev 2014-09-05 22:37:39 +00:00
Chris Craik
83eb430270 Merge "Add shadow/clipping properties to HierarchyViewer" into lmp-dev 2014-09-05 22:36:41 +00:00
John Reck
ec845a215e Fix race condition
Bug: 17372309

 AnimationContext::startFrame() happens both with and without
 the UI thread lock. Pass the TraversalMode into it so
 that ThreadedRenderer's subclass can correctly decide
 when it is safe to push over mPendingAnimatingRenderNodes, as doing
 so outside of the lock is Very Bad.

Change-Id: Ife5dd3a2b46b0a207cd9234c159a674afdbf5efd
2014-09-05 15:23:38 -07:00
Chris Craik
5c75c52e04 Add shadow/clipping properties to HierarchyViewer
bug:15777980

Change-Id: Ic3d24326f585d2d2b9889486f0ed322eb98b5af8
2014-09-05 15:23:08 -07:00
Svetoslav
6552bf3da6 Print spooler UI polish and bug fixes.
1. Added an empty state for pages that are being rendered.

2. Fixed a NPA on a binder thread when destoroying the
   remote print adapter.

3. Fixed a rare crash when the print activity gets an
   activity class callback while initializing.

4. Changed the preview pages on phone in land to four.

5. Fixed a flicker from a list of pages to an empty state
   and then back to the list of pages.

bug:15704969
bug:16966145

Change-Id: I0eea2f30a102d8fefcbf90187fa6d8612fb19434

Conflicts:
	packages/PrintSpooler/src/com/android/printspooler/widget/PageContentView.java
2014-09-05 15:21:50 -07:00
Griff Hazen
69dd40d08a Merge "Reduce chance of notification listener dropped messages." into lmp-dev 2014-09-05 21:52:44 +00:00
Jean-Michel Trivi
d87f2107d9 Merge "Update the broadcasts reserved to the system" into lmp-dev 2014-09-05 21:37:27 +00:00
Aravind Akella
b67d7e2345 Merge "Documentation fix for Sensor.getMaxDelay()" into lmp-dev 2014-09-05 20:58:53 +00:00
Jim Miller
fd5bf4ea77 Merge "Cleanup - Change name of confirm credentials method after API review" into lmp-dev 2014-09-05 20:58:17 +00:00
Eino-Ville Talvala
71aa8ab5d7 Merge "Camera2: Final API revisions" into lmp-dev 2014-09-05 20:43:52 +00:00
Alan Viverette
a3e49a4b1d Propagate drawable hotspots when duplicate parent state is enabled
Makes hotspot-centered ripples "just work" everywhere that old-style
pressed states work.

BUG: 17407652
Change-Id: Id4802662aea537959122f029e85aa576cf51b641
2014-09-05 13:10:12 -07:00
Michael Wright
a6863ad622 Merge "Allow for event dispatching when in non-interactive states." into lmp-dev 2014-09-05 19:58:12 +00:00
Amith Yamasani
4b278afa0d Merge "Rename getLocalApprovalIntent to createLocalApprovalIntent" into lmp-dev 2014-09-05 19:43:44 +00:00
Eino-Ville Talvala
fd887436bd Camera2: Final API revisions
- Rename listeners to callbacks. Listeners are single-method and are interfaces,
  while callbacks are abstract may get more methods in the future.
- Use register/unregister for registering callbacks, not add/remove.

Bug: 17389922
Change-Id: Ic6b46ad79cb43a43a85e2a4b63f059d3af99798b
2014-09-05 12:43:11 -07:00
Michael Wright
57b4ad9f5a Merge "Add extra to ASSIST intent to indicate potential input type" into lmp-dev 2014-09-05 19:36:47 +00:00
Amit Mahajan
597827e460 Merge "Add gid to configure no_ems_support_sim_operators" into lmp-dev 2014-09-05 19:25:49 +00:00
Alan Viverette
a3f0c2b21a Simplify ripple background drawing, fix ripple alphas
Eliminates an extra saveLayer on the background in the common case of
a rectangle-bounded ripple.

Ripples and backgrounds are now drawn at 50% opacity of the ripple
color, which ensures that both the ripple and background are visible
and that the pressed state has a correct combined alpha.

Also fixes a bug where hardware (RT) animation was getting turned off
prematurely.

BUG: 17405007
BUG: 17398089
BUG: 17394445
BUG: 17389859
Change-Id: Idb5808368fe563581a51a8cb9778275ee8d22f4c
2014-09-05 19:15:44 +00:00
Jim Miller
2f2ebcd688 Cleanup - Change name of confirm credentials method after API review
Fixes bug 17288988

Change-Id: I3d69b52e7ffc9f0268fb4dc9647f8704453668b7
2014-09-05 12:11:48 -07:00
Ruben Brunk
8eca9e0f0b Merge "camera2: Undo mirror for front camera in legacy mode." into lmp-dev 2014-09-05 18:52:54 +00:00
Wei Wang
6550557f99 Merge "Unregister app when advertise failed after registration." into lmp-dev 2014-09-05 18:49:27 +00:00
Svetoslav
df11867be3 Merge "Fix runtime restart" into lmp-dev 2014-09-05 18:30:42 +00:00
Svetoslav
7de2abb16c Fix runtime restart
Change-Id: Ic50c8b3b06603ad517fdc8a2392ad12318d46817
2014-09-05 11:28:00 -07:00
Jeff Sharkey
43a2d06166 Merge "Allow badging updates to install sessions." into lmp-dev 2014-09-05 17:56:39 +00:00
Eino-Ville Talvala
48980da14d Merge "Camera2: Document supported target combinations for a session." into lmp-dev 2014-09-05 17:54:01 +00:00
Amith Yamasani
51a0e5b546 Rename getLocalApprovalIntent to createLocalApprovalIntent
Based on API review.

Bug: 17389920
Change-Id: I84674f25a84d317f017473b6f4ac19c849079323
2014-09-05 10:51:13 -07:00
Chris Craik
def8a37128 Merge "Replace native crash with IAE when calling picture.draw() w/ a HW canvas" into lmp-dev 2014-09-05 17:49:20 +00:00
Chris Craik
96890564bd Replace native crash with IAE when calling picture.draw() w/ a HW canvas
bug:17397958
Change-Id: I75f942db0e604f9fd6ab31e6c81f718c0f57b16a
2014-09-05 10:33:39 -07:00
Christopher Ferris
982f21fec2 Merge "Add new header to support 32 bit/64 bit dumps." into lmp-dev 2014-09-05 17:30:21 +00:00
George Mount
0ff16cf43a Merge "API Review: Improve javadoc." into lmp-dev 2014-09-05 17:29:29 +00:00
George Mount
f9557619a7 API Review: Improve javadoc.
Bug 17189781
Also rename PatternMotion to PatternPathMotion

Change-Id: I1c4dcbdd65e33cf9de1504277e31f9f7ede0380d
2014-09-05 10:27:27 -07:00
Jeff Sharkey
ec9bad2015 Allow badging updates to install sessions.
For the system restore use-case, an installer may need to enqueue
their sessions quickly before badging details, like icons, have been
downloaded.  This change relaxes to allow an installer to update
their session badging after the session has been created.  Notify
observers when badging changes.

Rename callback registration methods to match style guide.  Relax
constraint that observers are home app.  Fix bug around internal
progress reporting.

Bug: 17376797, 17389236, 17334199
Change-Id: I5fb88508baea2f08e89a1504fcf5ef972afad4a7
2014-09-05 10:15:15 -07:00
Svetoslav
c5564b8c0e Merge "Update FrameStats API per api-council request." into lmp-dev 2014-09-05 17:09:45 +00:00
Svetoslav
e2da374d6e Merge "Addressing API council comments for UserManager." into lmp-dev 2014-09-05 17:08:12 +00:00
Svetoslav
53dcd394aa Update FrameStats API per api-council request.
bug:17390382

Change-Id: I50518834569f4d0ec394709294537256f03530e0
2014-09-05 10:07:02 -07:00
Svetoslav
c7d62f02b8 Addressing API council comments for UserManager.
bug:17390424

Change-Id: I498d2541289915cb7db16e5c3249ccc7a7dc5ee6
2014-09-05 10:07:02 -07:00