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

116905 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alan Viverette
9845b38279 am 785cda30: am f8c146a2: am c37db9c0: Merge "Fix layout and invalidate in SubtitleView" into klp-dev 
* commit '785cda30c35aefa90fd89adef0e71fa41fd3459c':
  Fix layout and invalidate in SubtitleView
 2013-10-10 19:26:42 -07:00
Svetoslav
518fb915d2 resolved conflicts for merge of 93e12a7c to master 
Change-Id: I94b488bdfce77c5f0708f5ccdced6800aa939785
 2013-10-10 19:24:32 -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
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
Rika Brooks
4ea5477820 am 5cfd2b04: am bc2eee5a: am 140ae7bd: Telephony: SMS over IMS 
* commit '5cfd2b045956ae5eec3f886ca5f5b0db2de6e836':
  Telephony: SMS over IMS
 2013-10-10 16:52:50 -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
Dianne Hackborn
222c5f80e5 am 16b43a77: am 17c21a30: am 2c09e8cd: Merge "Fix issue #11157301: Bad process stats when apps are binding to long-running services" into klp-dev 
* commit '16b43a779166d419875410d598182b852a5f90a3':
  Fix issue #11157301: Bad process stats when apps are binding to long-running services
 2013-10-10 16:23:54 -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
d31f86b4fe am 9a786c25: am e8b92b6b: am 6c906dc5: Merge "Fix SystemUI crash on devices with WiFi only" into klp-dev 
* commit '9a786c251dab96f06a0800b4bad55f3ab839e234':
  Fix SystemUI crash on devices with WiFi only
 2013-10-10 16:16:41 -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
1b2d586e2d am 193ad53d: am 6b57033b: am 8b81a638: Merge "getProxy in ConnectivityService returns port w/PAC" into klp-dev 
* commit '193ad53ddd22a8fe8035246ec55e81fc7a7b2fe1':
  getProxy in ConnectivityService returns port w/PAC
 2013-10-10 16:08:29 -07:00
David Christie
18c2a76649 am 52d293d3: am bb1a77bb: am 000bffab: Merge "New icons that eliminate location "crosshair" -b/8142654" into klp-dev 
* commit '52d293d371eaa555da5cc312198e45f17d754c76':
  New icons that eliminate location "crosshair" -b/8142654
 2013-10-10 16:08:25 -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
Jeff Brown
81bc555850 Merge "Minor code cleanup in loaders." 2013-10-10 22:54:56 +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
ea80d47466 am a9a038c2: am bd558e57: am 64be26fa: Merge "Check callback null condition for register/unregsiter state change callback" into klp-dev 
* commit 'a9a038c275dcc606a92cfe93a9b60a16aae38c4a':
  Check callback null condition for register/unregsiter state change callback
 2013-10-10 15:07:22 -07: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
d7911d4cf9 am 3b69c1fa: am 2f87ce36: am 9dc7e12c: Merge "Properly size KG camera animation for translucent bars." into klp-dev 
* commit '3b69c1fa3eaddb47b49d488a80fa6958223ab19b':
  Properly size KG camera animation for translucent bars.
 2013-10-10 13:50:10 -07: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
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
John Spurlock
04c661922f am eea6f7d0: am 0c0b2844: am d9b95382: Merge "Update navigation bar gradient." into klp-dev 
* commit 'eea6f7d0402b6aded450db1f5bf63723a4def90c':
  Update navigation bar gradient.
 2013-10-10 13:43:17 -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
eea6f7d040 am 0c0b2844: am d9b95382: Merge "Update navigation bar gradient." into klp-dev 
* commit '0c0b2844f0c3eb8459392be43ebaf31efb729085':
  Update navigation bar gradient.
 2013-10-10 13:39:51 -07:00
Jim Miller
f5b083b07f am ba491c68: am 23d5cfb4: am 10d196d3: Merge "Keyguard customization for mcc262-mnc07" into klp-dev 
* commit 'ba491c68908819841aed13ef61b5fbae3666974d':
  Keyguard customization for mcc262-mnc07
 2013-10-10 13:38:34 -07: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
ba491c6890 am 23d5cfb4: am 10d196d3: Merge "Keyguard customization for mcc262-mnc07" into klp-dev 
* commit '23d5cfb40cfe2890eabd43d55e1331369fb47fd4':
  Keyguard customization for mcc262-mnc07
 2013-10-10 13:33:07 -07: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
Edward Jee
5a665f42e0 am 2c289423: am 5ea3689e: am 208c42df: Merge "Makes ACTION_PAIRING_REQUEST require BLUETOOTH_PRIVILEGED." into klp-dev 
* commit '2c2894238d691e3b60fb9732b70c2c72b8f840f7':
  Makes ACTION_PAIRING_REQUEST require BLUETOOTH_PRIVILEGED.
 2013-10-10 13:18:42 -07:00