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

45547 Commits

Author SHA1 Message Date
Baligh Uddin
7ba8a7177a Merge "Import translations. DO NOT MERGE" 2013-10-11 15:09:02 +00:00
Vineeta Srivastava
81a80651b4 am 4ab895c9: am 29a6dd3c: am caaefaea: Merge "Setting MTU size for specific network" into klp-dev 
* commit '4ab895c9cac4b582cc51f1c37bb1b2233808691f':
  Setting MTU size for specific network
 2013-10-10 21:15:49 -07:00
Vineeta Srivastava
4ab895c9ca am 29a6dd3c: am caaefaea: Merge "Setting MTU size for specific network" into klp-dev 
* commit '29a6dd3c8a4a410e8de7d026f001a3052b3cb221':
  Setting MTU size for specific network
 2013-10-10 21:12:02 -07:00
Vineeta Srivastava
29a6dd3c8a am caaefaea: Merge "Setting MTU size for specific network" into klp-dev 
* commit 'caaefaeab705a7c9c800670278e5c2b85ba09b28':
  Setting MTU size for specific network
 2013-10-10 21:09:59 -07:00
Vineeta Srivastava
caaefaeab7 Merge "Setting MTU size for specific network" into klp-dev 2013-10-11 04:07:58 +00:00
Aravind Akella
986481d52a am 554069ee: am d18920f5: am d9b09fa9: Merge "Fix registerListener and flush bugs." into klp-dev 
* commit '554069ee8c3a0c06d0849d198325eda9c0128097':
  Fix registerListener and flush bugs.
 2013-10-10 19:27:03 -07:00
Adam Powell
d2d0b5843d am 7b3cdb0f: am 6f090af3: am ebd1dca5: Merge "Re-enable ActionMenuPresenter view recycling" into klp-dev 
* commit '7b3cdb0fb7cd7fab647de09e6a64ce59555ed733':
  Re-enable ActionMenuPresenter view recycling
 2013-10-10 19:26:52 -07:00
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
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
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
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
Baligh Uddin
e8583a4b14 Import translations. DO NOT MERGE 
Change-Id: Ie15b5236e1b23a7e48fb8b9c9e84c00005bd8460
Auto-generated-cl: translation import
 2013-10-10 19:15:57 -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
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
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
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
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
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
seonju.oh
c24aabd619 Setting MTU size for specific network 
UK H3G - MTU:1440, HPLMN:234-20, 235-94

Bug:10195070
Change-Id: I42b4472ee1c64044872ea1fcaf268faf500dd879
 2013-10-10 15:42:51 -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
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
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
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
Chet Haase
eddb9dc0a4 am a8382f70: am 1928bcbc: am 1d7b3dc1: Merge "Make LayoutTransition.setInterpolator() actually do something" into klp-dev 
* commit 'a8382f7064225ac1f44d27545376607d10ee00f3':
  Make LayoutTransition.setInterpolator() actually do something
 2013-10-10 11:32:23 -07: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
Alan Viverette
46b2cc1323 am 66b5b5b2: am cb38a97c: am 90abd6d1: Merge "Ensure accessibility node cache is synced with service state" into klp-dev 
* commit '66b5b5b2b74baa9b7c26d5d72eaa2b6f9f5675dc':
  Ensure accessibility node cache is synced with service state
 2013-10-10 11:28:43 -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
John Spurlock
aba437d9ba am 107c3fed: am a8c73fbd: am a619afd6: Merge "IME navigation guard implemented as a View." into klp-dev 
* commit '107c3fed5c26ce2202b6c9394e14e30e49642c85':
  IME navigation guard implemented as a View.
 2013-10-10 11:24:44 -07:00