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
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
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
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
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
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
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
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
Chet Haase
a8382f7064
am 1928bcbc: am 1d7b3dc1: Merge "Make LayoutTransition.setInterpolator() actually do something" into klp-dev
...
* commit '1928bcbcc116e264a734aede72aae6d886366a06':
Make LayoutTransition.setInterpolator() actually do something
2013-10-10 11:29:13 -07: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
Alan Viverette
66b5b5b2b7
am cb38a97c: am 90abd6d1: Merge "Ensure accessibility node cache is synced with service state" into klp-dev
...
* commit 'cb38a97c08ea69902120e333297597af2a62a743':
Ensure accessibility node cache is synced with service state
2013-10-10 11:25:35 -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
John Spurlock
107c3fed5c
am a8c73fbd: am a619afd6: Merge "IME navigation guard implemented as a View." into klp-dev
...
* commit 'a8c73fbd5c90a0d4eacc7aaedc0ca30cfcd5f621':
IME navigation guard implemented as a View.
2013-10-10 11:21:37 -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
Chris Craik
16767ff5f3
am 4ad27474: am e64d6a4e: Merge "Remove unused time tile and resources" into klp-dev
...
* commit '4ad27474ec533acd38d89618b0bdc8cc33af4b00':
Remove unused time tile and resources
2013-10-10 10:49:28 -07: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
852c7b15a5
am 6743c171: am 635892fe: Merge "Guard against NPE when using existing process." into klp-dev
...
* commit '6743c1712e1051ae99639a7d90912c54a0be8b24':
Guard against NPE when using existing process.
2013-10-10 10:21:29 -07: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
Svetoslav
0c6b23ae95
am 4208b408: am 6f71ed5b: Merge "Sometimes the print button not enabled and an accessibility fix." into klp-dev
...
* commit '4208b4088b9a677f62c635f2661c246f626f7928':
Sometimes the print button not enabled and an accessibility fix.
2013-10-10 10:17:44 -07:00
Svetoslav Ganov
0a41b0547b
am bf74156f: am 0ea16e9e: Merge "Coalescing multiple print job notifications." into klp-dev
...
* commit 'bf74156f59013dc5c284c224f14a382f813e8825':
Coalescing multiple print job notifications.
2013-10-10 10:17:40 -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
Svetoslav
6f71ed5b58
Merge "Sometimes the print button not enabled and an accessibility fix." into klp-dev
2013-10-10 17:11:21 +00:00
Svetoslav Ganov
0ea16e9e76
Merge "Coalescing multiple print job notifications." into klp-dev
2013-10-10 17:10:59 +00:00
John Spurlock
57beb3b5b3
IME navigation guard implemented as a View.
...
Instead of a custom onDraw in order to stay 100% in sync with abrupt
layout changes.
Also use the unrestricted layout bottom to avoid unnecessary
fitSystemWindows churn.
Bug:11162351
Change-Id: If9bb9a52d503e348d642bf1238f75c4a418ad805
2013-10-10 12:54:05 -04:00