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

113551 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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 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
bc2eee5a31 am 140ae7bd: Telephony: SMS over IMS 
* commit '140ae7bdadd13d3b849385636e1811438e62ed6a':
  Telephony: SMS over IMS
 2013-10-10 16:38:46 -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
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
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
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
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
2f87ce36ae am 9dc7e12c: Merge "Properly size KG camera animation for translucent bars." into klp-dev 
* commit '9dc7e12c67476d05e64822d3f019c4b7f46d253b':
  Properly size KG camera animation for translucent bars.
 2013-10-10 13:43:43 -07:00
Daniel Sandler
9dc7e12c67 Merge "Properly size KG camera animation for translucent bars." into klp-dev 2013-10-10 20:40:28 +00:00
John Spurlock
0c0b2844f0 am d9b95382: Merge "Update navigation bar gradient." into klp-dev 
* commit 'd9b95382c721975de18325417f69af04af4089c1':
  Update navigation bar gradient.
 2013-10-10 13:36:55 -07:00
John Spurlock
d9b95382c7 Merge "Update navigation bar gradient." into klp-dev 2013-10-10 20:33:09 +00:00
Jim Miller
23d5cfb40c am 10d196d3: Merge "Keyguard customization for mcc262-mnc07" into klp-dev 
* commit '10d196d32f9bdaa5708334348ca9668369a673ef':
  Keyguard customization for mcc262-mnc07
 2013-10-10 13:30:19 -07:00
John Spurlock
80d7fc50d7 Update navigation bar gradient. 
Bug:10967264
Change-Id: I6a057fb0895ab46bddb4082d49c8b53b329f0c73
 2013-10-10 16:28:34 -04:00
Jim Miller
10d196d32f Merge "Keyguard customization for mcc262-mnc07" into klp-dev 2013-10-10 20:28:01 +00:00
Daniel Sandler
26b7bf6e3c Properly size KG camera animation for translucent bars. 
The KGHV now plumbs insets information down into the camera
so that it can leave space for the navigation bar if the KG
window happens to extend underneath it. The camera widget
preview must therefore be rendered to fit the size of the
smaller inset content area, which means there's now a hole
at the bottom; we fill this bottom area during animation
with a fake navigation bar: a black view occupying the area
underneath the real navbar.

Bug: 11048015
Change-Id: Ia23b62e155686ad9f17a25ccc14f6c97b53dafea
 2013-10-10 16:18:28 -04:00
Edward Jee
5ea3689ea6 am 208c42df: Merge "Makes ACTION_PAIRING_REQUEST require BLUETOOTH_PRIVILEGED." into klp-dev 
* commit '208c42dfee004fea66c9d91fd018210a530d844e':
  Makes ACTION_PAIRING_REQUEST require BLUETOOTH_PRIVILEGED.
 2013-10-10 13:13:04 -07:00
Edward Jee
208c42dfee Merge "Makes ACTION_PAIRING_REQUEST require BLUETOOTH_PRIVILEGED." into klp-dev 2013-10-10 20:07:41 +00:00
Adam Lesinski
e4a1e1c48b am 97fee818: Merge "Reinflate QSB RSSI Tile on config change" into klp-dev 
* commit '97fee8186789beb281d1dcfcd0d69f885a2a1e3e':
  Reinflate QSB RSSI Tile on config change
 2013-10-10 12:56:55 -07:00
Adam Lesinski
97fee81867 Merge "Reinflate QSB RSSI Tile on config change" into klp-dev 2013-10-10 19:54:42 +00:00
Adam Lesinski
828e4c49a0 Reinflate QSB RSSI Tile on config change 
Resources that change based on MCC or MNC will now
show on the RSSI tile in Quick Settings.

bug:10518893
Change-Id: I55a77f967d2630b5c1aa17382069a15f37745405
 2013-10-10 12:25:53 -07:00
Matthew Xie
9b69399399 Check callback null condition for register/unregsiter state change callback 
Fix BluetoothPan closing sequence for unregsiter state change callback
bug 11160007

Change-Id: I405ec91a938289fe9541de2ebd9abc1fb938f44a
 2013-10-10 12:12:04 -07:00
Eric Laurent
c9a4349a2e am 8a9b694d: Merge "Revert "Headphones volume warning disabled by default"" into klp-dev 
* commit '8a9b694d1294ed962c5007cc219c9682dad3946a':
  Revert "Headphones volume warning disabled by default"
 2013-10-10 11:46:21 -07:00
Eric Laurent
8a9b694d12 Merge "Revert "Headphones volume warning disabled by default"" into klp-dev 2013-10-10 18:43:11 +00:00
Edward Jee
430e361b20 Makes ACTION_PAIRING_REQUEST require BLUETOOTH_PRIVILEGED. 
Bug: 11087521
Change-Id: I99cc584987bf12fe0648b048398b4eb9836e6172
 2013-10-10 18:42:34 +00:00
Chet Haase
1928bcbcc1 am 1d7b3dc1: Merge "Make LayoutTransition.setInterpolator() actually do something" into klp-dev 
* commit '1d7b3dc126a493bec79df3e759a8391040e6a308':
  Make LayoutTransition.setInterpolator() actually do something
 2013-10-10 11:25:36 -07:00
Chet Haase
1d7b3dc126 Merge "Make LayoutTransition.setInterpolator() actually do something" into klp-dev 2013-10-10 18:22:08 +00:00
Alan Viverette
cb38a97c08 am 90abd6d1: Merge "Ensure accessibility node cache is synced with service state" into klp-dev 
* commit '90abd6d1dfe883efc4a305db45f6812ea0de1d7b':
  Ensure accessibility node cache is synced with service state
 2013-10-10 11:22:01 -07:00
Alan Viverette
90abd6d1df Merge "Ensure accessibility node cache is synced with service state" into klp-dev 2013-10-10 18:19:25 +00:00
John Spurlock
a8c73fbd5c am a619afd6: Merge "IME navigation guard implemented as a View." into klp-dev 
* commit 'a619afd6590c891676005d1892ab820580991b74':
  IME navigation guard implemented as a View.
 2013-10-10 11:18:13 -07:00
Chet Haase
33d08762d8 Make LayoutTransition.setInterpolator() actually do something 
Previously, you could set a new interpolator on a LayoutTransition object,
but it wouldn't have any effect, since the value was only used at construction
time. This change makes the intended behavior work, byt assigning that
new interpolator to the appropriate animations when they are run.

Issue #11163487 LayoutTransition.setInterpolator() has no effect

Change-Id: I1b390a30c008ac2bf26491dc352e28f276357388
 2013-10-10 11:17:48 -07:00
John Spurlock
a619afd659 Merge "IME navigation guard implemented as a View." into klp-dev 2013-10-10 18:15:00 +00:00
Eric Laurent
f971b1eec5 Revert "Headphones volume warning disabled by default" 
This reverts commit 7cf06209dcdbadd41fabd7e4e7229832aa8ffff2.

Bug: 10297243.
Change-Id: I95b9b34bb38550af493f9a585b6940c4e18e39cc
 2013-10-10 10:43:13 -07:00
Chris Craik
4ad27474ec am e64d6a4e: Merge "Remove unused time tile and resources" into klp-dev 
* commit 'e64d6a4e338739dfe482b3926bda16f885889298':
  Remove unused time tile and resources
 2013-10-10 10:42:50 -07:00
Chris Craik
e64d6a4e33 Merge "Remove unused time tile and resources" into klp-dev 2013-10-10 17:37:22 +00:00
Jeff Sharkey
6743c1712e am 635892fe: Merge "Guard against NPE when using existing process." into klp-dev 
* commit '635892fe354980cd6b00e80bac36957f3c26be2b':
  Guard against NPE when using existing process.
 2013-10-10 10:19:06 -07:00
Jeff Sharkey
635892fe35 Merge "Guard against NPE when using existing process." into klp-dev 2013-10-10 17:17:14 +00:00
Svetoslav
4208b4088b am 6f71ed5b: Merge "Sometimes the print button not enabled and an accessibility fix." into klp-dev 
* commit '6f71ed5b58a9bcf23fd252d13cc4206d38921960':
  Sometimes the print button not enabled and an accessibility fix.
 2013-10-10 10:14:26 -07:00
Svetoslav Ganov
bf74156f59 am 0ea16e9e: Merge "Coalescing multiple print job notifications." into klp-dev 
* commit '0ea16e9e763b5815707971f503d5408dc1b66c10':
  Coalescing multiple print job notifications.
 2013-10-10 10:14:23 -07:00