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

116886 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
2c2894238d am 5ea3689e: am 208c42df: Merge "Makes ACTION_PAIRING_REQUEST require BLUETOOTH_PRIVILEGED." into klp-dev 
* commit '5ea3689ea69f3c934a3c95b9ba82a41e073123d2':
  Makes ACTION_PAIRING_REQUEST require BLUETOOTH_PRIVILEGED.
 2013-10-10 13:15:34 -07: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
6a621b6833 am e9d21b05: am e4a1e1c4: am 97fee818: Merge "Reinflate QSB RSSI Tile on config change" into klp-dev 
* commit 'e9d21b05ced5e923bdcb548920c550e89b5f77d0':
  Reinflate QSB RSSI Tile on config change
 2013-10-10 13:03:04 -07:00
Adam Lesinski
e9d21b05ce am e4a1e1c4: am 97fee818: Merge "Reinflate QSB RSSI Tile on config change" into klp-dev 
* commit 'e4a1e1c48b0e27868ca171e95e882b1de7bbfedd':
  Reinflate QSB RSSI Tile on config change
 2013-10-10 13:00:27 -07: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
Alan Viverette
dcaceadc5c Merge "Update string for translation" 2013-10-10 19:23:56 +00:00
Alan Viverette
2a64861344 Update string for translation 
BUG: 11161348
Change-Id: I54b830cfba2703f3a32d7135b2aff7307754c0be
 2013-10-10 12:22:57 -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
632d038181 am 66c8aa74: am c9a4349a: am 8a9b694d: Merge "Revert "Headphones volume warning disabled by default"" into klp-dev 
* commit '66c8aa7413f6bbd4ecd14048ea03267cd5d96fba':
  Revert "Headphones volume warning disabled by default"
 2013-10-10 11:55:15 -07:00
Eric Laurent
66c8aa7413 am c9a4349a: am 8a9b694d: Merge "Revert "Headphones volume warning disabled by default"" into klp-dev 
* commit 'c9a4349a2eef99c9db49f62f045b12ea03ece998':
  Revert "Headphones volume warning disabled by default"
 2013-10-10 11:51:34 -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