drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
115,090 Commits 1 Branch 0 Tags
Commit Graph

115090 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Aravind Akella
554069ee8c am d18920f5: am d9b09fa9: Merge "Fix registerListener and flush bugs." into klp-dev 
* commit 'd18920f5c9c3f4662ceb8f729805ae06761cf108':
  Fix registerListener and flush bugs.
 2013-10-10 19:21:08 -07:00
Svetoslav
9b74a78063 am 5b8f01b6: am 466c046f: Merge "Fixing jank when transition from print dialog to generating one." into klp-dev 
* commit '5b8f01b62a09b001da4959d367fa99e46143791b':
  Fixing jank when transition from print dialog to generating one.
 2013-10-10 19:21:03 -07:00
Dianne Hackborn
7ea73db9dd am 0faf411f: am fa883071: Merge "Fix issue #11175600: Proc stats is aggregating stats in the wrong direction" into klp-dev 
* commit '0faf411fb494d1d7b1fbfdb0c9b45dc83a2b262c':
  Fix issue #11175600: Proc stats is aggregating stats in the wrong direction
 2013-10-10 19:20:56 -07:00
Adam Powell
7b3cdb0fb7 am 6f090af3: am ebd1dca5: Merge "Re-enable ActionMenuPresenter view recycling" into klp-dev 
* commit '6f090af305eba51785bb9a6ec08fb9f86a73da98':
  Re-enable ActionMenuPresenter view recycling
 2013-10-10 19:20:52 -07:00
Dirk Dougherty
83fec5426a am a16ad1e9: am 384f060f: am a8914d02: am 0c74fc28: am 234101a4: Merge "Doc change: add tablet success story and fix a few issues." into jb-mr2-docs 
* commit 'a16ad1e9c539ed11c17b230c6036a7e178f09511':
  Doc change: add tablet success story and fix a few issues.
 2013-10-10 19:20:30 -07:00
Alan Viverette
785cda30c3 am f8c146a2: am c37db9c0: Merge "Fix layout and invalidate in SubtitleView" into klp-dev 
* commit 'f8c146a2a2e47da9326ac2ea39b7ae47b97df184':
  Fix layout and invalidate in SubtitleView
 2013-10-10 19:20:25 -07:00
Svetoslav
93e12a7c25 resolved conflicts for merge of 92aa5f4e to klp-dev-plus-aosp 
Change-Id: Ib2a3bd688256cb2e6bed13ebac01a31bd2601788
 2013-10-10 19:17:27 -07:00
Aravind Akella
d18920f5c9 am d9b09fa9: Merge "Fix registerListener and flush bugs." into klp-dev 
* commit 'd9b09fa97eb47b051bbfab8cc491143198fbc9bc':
  Fix registerListener and flush bugs.
 2013-10-10 19:07:42 -07:00
Aravind Akella
d9b09fa97e Merge "Fix registerListener and flush bugs." into klp-dev 2013-10-11 02:05:53 +00:00
Svetoslav
5b8f01b62a am 466c046f: Merge "Fixing jank when transition from print dialog to generating one." into klp-dev 
* commit '466c046f204e98b44506dfb1718f0b56094486f7':
  Fixing jank when transition from print dialog to generating one.
 2013-10-10 18:44:22 -07:00
Svetoslav
466c046f20 Merge "Fixing jank when transition from print dialog to generating one." into klp-dev 2013-10-11 01:39:09 +00:00
Dianne Hackborn
0faf411fb4 am fa883071: Merge "Fix issue #11175600: Proc stats is aggregating stats in the wrong direction" into klp-dev 
* commit 'fa8830715ddd6e9ffdf833799580521b5eb530ac':
  Fix issue #11175600: Proc stats is aggregating stats in the wrong direction
 2013-10-10 18:33:01 -07:00
Adam Powell
6f090af305 am ebd1dca5: Merge "Re-enable ActionMenuPresenter view recycling" into klp-dev 
* commit 'ebd1dca5ead3d36f7e21ab27b8eb6f4c612f7319':
  Re-enable ActionMenuPresenter view recycling
 2013-10-10 18:29:33 -07:00
Dianne Hackborn
fa8830715d Merge "Fix issue #11175600: Proc stats is aggregating stats in the wrong direction" into klp-dev 2013-10-11 01:29:26 +00:00
Dianne Hackborn
59da67900d Fix issue #11175600: Proc stats is aggregating stats in the wrong direction 
Change-Id: I7f06fbde8f52296cb2932003b4da77b2c68a6011
 2013-10-10 18:27:24 -07:00
Adam Powell
ebd1dca5ea Merge "Re-enable ActionMenuPresenter view recycling" into klp-dev 2013-10-11 01:27:20 +00:00
Adam Powell
c3ca3ea3a9 Re-enable ActionMenuPresenter view recycling 
Since action bar transitions are turned off again for now, re-enabling
item view recycling fixes an unfortunate regression with submenus.

If a menu view is invalidated while a submenu is open we need to keep
its anchor consistent. With view recycling active we preserve status
quo and the previous anchor view instance for the popup window remains
in place.

In the future this will need to get more sophisticated;
ActionMenuPresenter will need to re-parent an open submenu against the
proper anchor view by menu item id. But that is a change for another
day.

Bug 11174504

Change-Id: I7e8a444f6996ec95417d20e87938f496e9c3a4dd
 2013-10-10 18:07:48 -07:00
Dirk Dougherty
a16ad1e9c5 am 384f060f: am a8914d02: am 0c74fc28: am 234101a4: Merge "Doc change: add tablet success story and fix a few issues." into jb-mr2-docs 
* commit '384f060f934e61f7a7425340506ae0f927cd9a01':
  Doc change: add tablet success story and fix a few issues.
 2013-10-10 17:59:26 -07:00
Dirk Dougherty
384f060f93 am a8914d02: am 0c74fc28: am 234101a4: Merge "Doc change: add tablet success story and fix a few issues." into jb-mr2-docs 
* commit 'a8914d02f41cd0ee89b6aa33407d51d43790902b':
  Doc change: add tablet success story and fix a few issues.
 2013-10-10 17:57:22 -07:00
Dirk Dougherty
a8914d02f4 am 0c74fc28: am 234101a4: Merge "Doc change: add tablet success story and fix a few issues." into jb-mr2-docs 
* commit '0c74fc28b71df1a59bd6c94e62c1247ae922cff7':
  Doc change: add tablet success story and fix a few issues.
 2013-10-10 17:53:51 -07:00
Dirk Dougherty
0c74fc28b7 am 234101a4: Merge "Doc change: add tablet success story and fix a few issues." into jb-mr2-docs 
* commit '234101a4c597fe285703f7a012ef9eda6c751578':
  Doc change: add tablet success story and fix a few issues.
 2013-10-10 17:50:21 -07:00
Dirk Dougherty
234101a4c5 Merge "Doc change: add tablet success story and fix a few issues." into jb-mr2-docs 2013-10-11 00:48:14 +00:00
Alan Viverette
f8c146a2a2 am c37db9c0: Merge "Fix layout and invalidate in SubtitleView" into klp-dev 
* commit 'c37db9c0de1038d043051401c2c55a8d0a57f373':
  Fix layout and invalidate in SubtitleView
 2013-10-10 17:26:59 -07:00
Alan Viverette
c37db9c0de Merge "Fix layout and invalidate in SubtitleView" into klp-dev 2013-10-11 00:24:02 +00:00
Svetoslav Ganov
92aa5f4ed2 am 896a9b17: Merge "Adding missing resourcs for the defaul PDF printer media sizes." into klp-dev 
* commit '896a9b172627ec318f908e734941afb06cc68169':
  Adding missing resourcs for the defaul PDF printer media sizes.
 2013-10-10 16:55:15 -07:00
Svetoslav
3aa2e2b3ab Fixing jank when transition from print dialog to generating one. 
Initially we show the print dialog and when the user presses print
we show a generating dialog with an indefinite spinner and a cancel
button. The transition between the two UIs which are really different
layouts show in the print activity is animated. In the middle of
the animation from print to generating UI there was a jump of the
content and an undesired window animation kicking in. This is a
side effect of changing the activity to floating so now changing the
container size was causing window resize and hence animation. Fun!

bug:10983508

Change-Id: I7d88e073c55863b945cdb50822401592f32d44c3
 2013-10-10 16:52:54 -07:00
Svetoslav Ganov
896a9b1726 Merge "Adding missing resourcs for the defaul PDF printer media sizes." into klp-dev 2013-10-10 23:52:07 +00:00
Rika Brooks
5cfd2b0459 am bc2eee5a: am 140ae7bd: Telephony: SMS over IMS 
* commit 'bc2eee5a31fb778cad7dbca2695ae054ecefc9fa':
  Telephony: SMS over IMS
 2013-10-10 16:41:37 -07:00
Rika Brooks
bc2eee5a31 am 140ae7bd: Telephony: SMS over IMS 
* commit '140ae7bdadd13d3b849385636e1811438e62ed6a':
  Telephony: SMS over IMS
 2013-10-10 16:38:46 -07:00
Dirk Dougherty
3f848899f4 Doc change: add tablet success story and fix a few issues. 
Change-Id: Ifdc494270d200604b9a228601b5ead0e8b2c4e3f
 2013-10-10 16:34:40 -07:00
Rika Brooks
140ae7bdad Telephony: SMS over IMS 
Add RIL_REQUEST_IMS_REGISTRATION_STATE, RIL_REQUEST_IMS_SEND_SMS, and
RIL_UNSOL_RESPONSE_IMS_NETWORK_STATE_CHANGED.  Add FORMAT_UNKNOWN to
SmsConstants.

Bug: 9626411
Change-Id: I87ca9841b4ace931c55e2d379fe6d7589b2dc8a5
Signed-off-by: Ed Tam <etam@google.com>
 2013-10-10 23:23:48 +00:00
Dianne Hackborn
16b43a7791 am 17c21a30: am 2c09e8cd: Merge "Fix issue #11157301: Bad process stats when apps are binding to long-running services" into klp-dev 
* commit '17c21a3007a2321ae8805a397c3566411a60cba0':
  Fix issue #11157301: Bad process stats when apps are binding to long-running services
 2013-10-10 16:21:39 -07:00
Dianne Hackborn
17c21a3007 am 2c09e8cd: Merge "Fix issue #11157301: Bad process stats when apps are binding to long-running services" into klp-dev 
* commit '2c09e8cdf6ea855698f4d46fd1a529ed49eb71f6':
  Fix issue #11157301: Bad process stats when apps are binding to long-running services
 2013-10-10 16:16:53 -07:00
Adam Lesinski
9a786c251d am e8b92b6b: am 6c906dc5: Merge "Fix SystemUI crash on devices with WiFi only" into klp-dev 
* commit 'e8b92b6bc32bbb0bcd34ffe2979771b4104bed67':
  Fix SystemUI crash on devices with WiFi only
 2013-10-10 16:13:35 -07:00
Dianne Hackborn
2c09e8cdf6 Merge "Fix issue #11157301: Bad process stats when apps are binding to long-running services" into klp-dev 2013-10-10 23:11:59 +00:00
Dianne Hackborn
32366b29c4 Fix issue #11157301: Bad process stats when apps are binding to long-running services 
We now treat PROCESS_STATE_TOP more specially.  When a process has another
client bound to it that is TOP, it will only allow itself to go in the TOP
state if it is not already running for another significant reason.

Change-Id: Ia3856406bd481bf6e98d55100a5513ccf4060e0d
 2013-10-10 16:10:32 -07:00
Adam Lesinski
e8b92b6bc3 am 6c906dc5: Merge "Fix SystemUI crash on devices with WiFi only" into klp-dev 
* commit '6c906dc52d1f967a695462d6c83e33d2a4e3b0f2':
  Fix SystemUI crash on devices with WiFi only
 2013-10-10 16:08:47 -07:00
Jason Monk
193ad53ddd am 6b57033b: am 8b81a638: Merge "getProxy in ConnectivityService returns port w/PAC" into klp-dev 
* commit '6b57033b022890242d6833b494040c360af691d0':
  getProxy in ConnectivityService returns port w/PAC
 2013-10-10 16:05:48 -07:00
David Christie
52d293d371 am bb1a77bb: am 000bffab: Merge "New icons that eliminate location "crosshair" -b/8142654" into klp-dev 
* commit 'bb1a77bbd0d55f393214739f4a4ec87254a8ac74':
  New icons that eliminate location "crosshair" -b/8142654
 2013-10-10 16:05:41 -07:00
Adam Lesinski
6c906dc52d Merge "Fix SystemUI crash on devices with WiFi only" into klp-dev 2013-10-10 23:03:54 +00:00
Jason Monk
6b57033b02 am 8b81a638: Merge "getProxy in ConnectivityService returns port w/PAC" into klp-dev 
* commit '8b81a63810ee2eb03c5c7bb389604fdd2dd44aa3':
  getProxy in ConnectivityService returns port w/PAC
 2013-10-10 15:54:54 -07:00
Jason Monk
8b81a63810 Merge "getProxy in ConnectivityService returns port w/PAC" into klp-dev 2013-10-10 22:52:03 +00:00
Adam Lesinski
c08ae4432c Fix SystemUI crash on devices with WiFi only 
A recent change to QuickSettings forgot to
check whether the device has a radio or not.

Change-Id: I0b89634b290e82a1702de7b2f539cef3efa6d246
 2013-10-10 15:49:57 -07:00
David Christie
bb1a77bbd0 am 000bffab: Merge "New icons that eliminate location "crosshair" -b/8142654" into klp-dev 
* commit '000bffabb8e49b2f907bdf0bb24c8f224add560f':
  New icons that eliminate location "crosshair" -b/8142654
 2013-10-10 15:39:13 -07:00
David Christie
000bffabb8 Merge "New icons that eliminate location "crosshair" -b/8142654" into klp-dev 2013-10-10 22:29:45 +00:00
Matthew Xie
a9a038c275 am bd558e57: am 64be26fa: Merge "Check callback null condition for register/unregsiter state change callback" into klp-dev 
* commit 'bd558e575cf18149def637697c67af3c951ac8bd':
  Check callback null condition for register/unregsiter state change callback
 2013-10-10 15:04:40 -07:00
Matthew Xie
bd558e575c am 64be26fa: Merge "Check callback null condition for register/unregsiter state change callback" into klp-dev 
* commit '64be26fad743ae1d8b5f8e5c61b2e7db18379f8b':
  Check callback null condition for register/unregsiter state change callback
 2013-10-10 15:00:44 -07:00
Matthew Xie
64be26fad7 Merge "Check callback null condition for register/unregsiter state change callback" into klp-dev 2013-10-10 21:56:20 +00:00
Jason Monk
decd295b13 getProxy in ConnectivityService returns port w/PAC 
Changes the PacManager to report message back to ConnectivityService
to send a broadcast once the download has completed.  This allows the
ConnectivityService to store the correct proxy info for getProxy().

This made the problem arise that ProxyProperties was not handling port
while it had PAC.  Added small fix for equals() and parcelization.

The combination of these fixes seems to resolve Bug: 11028616.

Bug: 11168706
Change-Id: I92d1343a8e804391ab77596b8167a2ef8d76b378
 2013-10-10 17:01:45 -04:00
Daniel Sandler
3b69c1fa3e am 2f87ce36: am 9dc7e12c: Merge "Properly size KG camera animation for translucent bars." into klp-dev 
* commit '2f87ce36aed3a3ed6c5c3d1d052d2b3ae672539c':
  Properly size KG camera animation for translucent bars.
 2013-10-10 13:46:55 -07:00