Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
177,605 Commits 3 Branches 0 Tags
38b5d057f08a1a05df44f94de1053f74739c6677
Commit Graph

48524 Commits

Author SHA1 Message Date
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
3068d14257 am 9f7fee39: Merge "Added getStyleAttributes to access all Theme attributes." into lmp-dev 
* commit '9f7fee392640eeba2922820e02d577a1a950702f':
  Added getStyleAttributes to access all Theme attributes.
 2014-09-06 00:30:36 +00:00
John Reck
8b66705f66 am fd289c1c: Merge "Disable RT-anim for AnimatorSet" into lmp-dev 
* commit 'fd289c1c10c9da50a747f8eb4a52f49aad83f418':
  Disable RT-anim for AnimatorSet
 2014-09-06 00:30:32 +00:00
Alan Viverette
487c96c4e2 am 700106e0: am 9239ba20: Merge "Propagate drawable hotspots when duplicate parent state is enabled" into lmp-dev 
* commit '700106e00cad7a099eb15c63c35499df9720caeb':
  Propagate drawable hotspots when duplicate parent state is enabled
 2014-09-06 00:28:56 +00:00
Jon Miranda
05cc48292b Merge "Added getStyleAttributes to access all Theme attributes." into lmp-dev 2014-09-06 00:27:20 +00:00
Alan Viverette
2ea1200e79 am 9239ba20: Merge "Propagate drawable hotspots when duplicate parent state is enabled" into lmp-dev 
* commit '9239ba20a85df91e9285d543bbeb1b1843d060d0':
  Propagate drawable hotspots when duplicate parent state is enabled
 2014-09-06 00:26:24 +00:00
John Reck
3207ffe120 Merge "Disable RT-anim for AnimatorSet" into lmp-dev 2014-09-06 00:22:25 +00: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
Jeff Sharkey
68cac85e0b am 11333bce: am 01efa7e6: am 89e86555: Merge "Separate active state from open/close." into lmp-dev 
* commit '11333bce2afbc92ca3c644d6264245ac9216dc27':
  Separate active state from open/close.
 2014-09-06 00:03:56 +00:00
Jeff Sharkey
5abb80468e am 01efa7e6: am 89e86555: Merge "Separate active state from open/close." into lmp-dev 
* commit '01efa7e6bcbaf781b589dd120d079ebc9e132069':
  Separate active state from open/close.
 2014-09-05 23:48:54 +00:00
Jeff Sharkey
16da11eb9e am 89e86555: Merge "Separate active state from open/close." into lmp-dev 
* commit '89e865552f42db5cc31ef48ad35f3392e4ed1ac2':
  Separate active state from open/close.
 2014-09-05 23:38:00 +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
Svetoslav
a958000469 am ad1b9d87: am 1458f58e: am 3b42928c: Merge "Print spooler UI polish and bug fixes." into lmp-dev 
* commit 'ad1b9d8779447bd3eacc0dd12519f28b964b868b':
  Print spooler UI polish and bug fixes.
 2014-09-05 23:08:28 +00:00
Chris Craik
a2197d721d am 1bd57d8b: am 7ec137b7: am 6f6a8f2c: Merge "Add shadow/clipping properties to HierarchyViewer" into lmp-dev 
* commit '1bd57d8b78d214a2bdeb0f11bba1a104b14ea84b':
  Add shadow/clipping properties to HierarchyViewer
 2014-09-05 23:08:21 +00: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
Svetoslav
a757f99d97 am 1458f58e: am 3b42928c: Merge "Print spooler UI polish and bug fixes." into lmp-dev 
* commit '1458f58e697e0079fc7fb90ea4094052f14a9688':
  Print spooler UI polish and bug fixes.
 2014-09-05 22:56:45 +00:00
Chris Craik
33f71d9b32 am 7ec137b7: am 6f6a8f2c: Merge "Add shadow/clipping properties to HierarchyViewer" into lmp-dev 
* commit '7ec137b7f9edb41117f822ef16bdaf5accbcc31c':
  Add shadow/clipping properties to HierarchyViewer
 2014-09-05 22:56:41 +00:00
Svetoslav
acc90bd72a am 3b42928c: Merge "Print spooler UI polish and bug fixes." into lmp-dev 
* commit '3b42928c318d2732d75bb9c0ed7b864c47a265a2':
  Print spooler UI polish and bug fixes.
 2014-09-05 22:45:50 +00:00
Chris Craik
ce1a912e34 am 6f6a8f2c: Merge "Add shadow/clipping properties to HierarchyViewer" into lmp-dev 
* commit '6f6a8f2c49aaf07f74310e405abc799c8d05fa19':
  Add shadow/clipping properties to HierarchyViewer
 2014-09-05 22:45:47 +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
Griff Hazen
040bb0b0ed am e9a3faa5: am 26c00d5a: am fd7d35d0: Merge "Reduce chance of notification listener dropped messages." into lmp-dev 
* commit 'e9a3faa5d20d0adeed4a5bec8f3aeb131324b3f4':
  Reduce chance of notification listener dropped messages.
 2014-09-05 22:23:55 +00: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
6c62705d50 am 26c00d5a: am fd7d35d0: Merge "Reduce chance of notification listener dropped messages." into lmp-dev 
* commit '26c00d5a4bdbdcdbefe7f5d7e3ce34d92382bbc0':
  Reduce chance of notification listener dropped messages.
 2014-09-05 22:10:10 +00:00
Aravind Akella
863bfe6d70 am de60d944: am f109a7de: am 6a7a06ee: Merge "Documentation fix for Sensor.getMaxDelay()" into lmp-dev 
* commit 'de60d94419de35bc2ef1aa91c2a7406e85a5890a':
  Documentation fix for Sensor.getMaxDelay()
 2014-09-05 22:09:52 +00:00
Jim Miller
260efa2fd5 am 1d7f775c: am bb9e9c7b: am 2dfada6c: Merge "Cleanup - Change name of confirm credentials method after API review" into lmp-dev 
* commit '1d7f775cca1def096906bd96f60d8767e15cbaf2':
  Cleanup - Change name of confirm credentials method after API review
 2014-09-05 22:09:47 +00:00
Eino-Ville Talvala
76bc0395b6 am 4b570b11: am a42873d6: am 8a52744d: Merge "Camera2: Final API revisions" into lmp-dev 
* commit '4b570b11d7835ea1e71e6134a932ecc6f4c15e70':
  Camera2: Final API revisions
 2014-09-05 22:09:42 +00:00
Griff Hazen
c37c9708c3 am fd7d35d0: Merge "Reduce chance of notification listener dropped messages." into lmp-dev 
* commit 'fd7d35d0ce4f9fc585b42f11c1844ddbaab6307f':
  Reduce chance of notification listener dropped messages.
 2014-09-05 21:58:25 +00:00
Aravind Akella
701141cd1f am f109a7de: am 6a7a06ee: Merge "Documentation fix for Sensor.getMaxDelay()" into lmp-dev 
* commit 'f109a7de857d21ec11c6020a5556d7adc78a3c08':
  Documentation fix for Sensor.getMaxDelay()
 2014-09-05 21:57:47 +00:00
Jim Miller
09629ec160 am bb9e9c7b: am 2dfada6c: Merge "Cleanup - Change name of confirm credentials method after API review" into lmp-dev 
* commit 'bb9e9c7b0586dc35158529e8d10cd6b10f5e7498':
  Cleanup - Change name of confirm credentials method after API review
 2014-09-05 21:57:42 +00:00
Eino-Ville Talvala
663debf045 am a42873d6: am 8a52744d: Merge "Camera2: Final API revisions" into lmp-dev 
* commit 'a42873d60a55a65fe36de12c032714403e3e161f':
  Camera2: Final API revisions
 2014-09-05 21:57:16 +00:00
Griff Hazen
69dd40d08a Merge "Reduce chance of notification listener dropped messages." into lmp-dev 2014-09-05 21:52:44 +00:00
Michael Wright
37495c042b am 36bb5708: am 3a448381: am d2300a59: Merge "Allow for event dispatching when in non-interactive states." into lmp-dev 
* commit '36bb5708861a9cfc7677997b65e79dadebab29c6':
  Allow for event dispatching when in non-interactive states.
 2014-09-05 21:32:58 +00:00
Aravind Akella
65e74377d9 am 6a7a06ee: Merge "Documentation fix for Sensor.getMaxDelay()" into lmp-dev 
* commit '6a7a06ee74ec3c63a4096be5bf2e3d18c9867170':
  Documentation fix for Sensor.getMaxDelay()
 2014-09-05 21:05:19 +00:00
Jim Miller
9e349078ab am 2dfada6c: Merge "Cleanup - Change name of confirm credentials method after API review" into lmp-dev 
* commit '2dfada6c875acffd17f541aaac47aafb265b0164':
  Cleanup - Change name of confirm credentials method after API review
 2014-09-05 21:05:15 +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
Mark Doliner
d0646dca40 Small documentation fixes across many files. 
Change-Id: I3e8787ce4bc6018ea1dc9aef2a2cd4e0a8dde663
 2014-09-05 13:57:51 -07:00
Chris Wren
7381daa0b9 remove unused matchesCallFilter(Bundle, int) 
Bug: 17402728
Change-Id: I0be7c70597a629ca0bd60b7230ffcc58e8e7aeac
 2014-09-05 16:53:14 -04:00
Eino-Ville Talvala
0eeac755df am 8a52744d: Merge "Camera2: Final API revisions" into lmp-dev 
* commit '8a52744d343dee6cc4958d0cc59484c036f3bf9f':
  Camera2: Final API revisions
 2014-09-05 20:52:48 +00:00
Eino-Ville Talvala
71aa8ab5d7 Merge "Camera2: Final API revisions" into lmp-dev 2014-09-05 20:43:52 +00:00
Amith Yamasani
7bdb80e811 am 6de6199a: am 6b71eada: am 221281ce: Merge "Rename getLocalApprovalIntent to createLocalApprovalIntent" into lmp-dev 
* commit '6de6199a7a9df4f5c495a7a038a71b67e29acb93':
  Rename getLocalApprovalIntent to createLocalApprovalIntent
 2014-09-05 20:32:18 +00:00
Michael Wright
f415d8243d am 798d3953: am 58f5f69b: am e252525f: Merge "Add extra to ASSIST intent to indicate potential input type" into lmp-dev 
* commit '798d39533c258411e0c879961c7c54a76bbb99bc':
  Add extra to ASSIST intent to indicate potential input type
 2014-09-05 20:32:12 +00:00
Michael Wright
415627ba39 am 3a448381: am d2300a59: Merge "Allow for event dispatching when in non-interactive states." into lmp-dev 
* commit '3a4483814783cfa108263ea2707b7f9e9b4dd9e2':
  Allow for event dispatching when in non-interactive states.
 2014-09-05 20:21:52 +00:00
Amith Yamasani
0859c2c760 am 6b71eada: am 221281ce: Merge "Rename getLocalApprovalIntent to createLocalApprovalIntent" into lmp-dev 
* commit '6b71eadab04964e8fe28ff98c3747ffe937f89ac':
  Rename getLocalApprovalIntent to createLocalApprovalIntent
 2014-09-05 20:21:19 +00:00
Michael Wright
215e31e6ca am 58f5f69b: am e252525f: Merge "Add extra to ASSIST intent to indicate potential input type" into lmp-dev 
* commit '58f5f69b7763fa846cfa58ec945f2ad6600ed031':
  Add extra to ASSIST intent to indicate potential input type
 2014-09-05 20:21:05 +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