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

170518 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jorim Jaggi
f61a71b92b am 7157ce9e: am 9016d8fa: Merge "Fix system icon widths" into lmp-mr1-dev automerge: 876820e 
* commit '7157ce9e94d7198e9604f8a9c1324290f1ef1bae':
  Fix system icon widths
 2014-10-28 07:15:46 +00:00
Jorim Jaggi
d866ef6cc1 am 05e7c26b: am 312c1e79: Merge "Add padding when both data icon and wifi icon is visible" into lmp-mr1-dev automerge: 286f361 
* commit '05e7c26b0d0aa0799615d2dd69beadb2af1a6637':
  Add padding when both data icon and wifi icon is visible
 2014-10-28 07:15:42 +00:00
George Mount
24bf96f0a2 am 06e74b30: am e0f76e9a: Merge "Fix transition being canceled improperly." into lmp-mr1-dev automerge: 7b042be 
* commit '06e74b30aebe38c93d55e1ffc05493c3c9941f52':
  Fix transition being canceled improperly.
 2014-10-28 07:15:39 +00:00
George Mount
5d0e36e692 am 8b92704f: am 03d5c6f5: Merge "Add resizeClip attribute to ChangeBounds." into lmp-mr1-dev automerge: 3437192 
* commit '8b92704f021fa4f33fcac5a50442b2f5259d198b':
  Add resizeClip attribute to ChangeBounds.
 2014-10-28 07:15:34 +00:00
Lorenzo Colitti
35261c4351 am 111cc9f5: Merge "Change removeStackedLink to take an interface name." into lmp-mr1-dev 
* commit '111cc9f511dc65006fc2972c9ecbf295619e09b9':
  Change removeStackedLink to take an interface name.
 2014-10-28 07:13:09 +00:00
Lorenzo Colitti
111cc9f511 Merge "Change removeStackedLink to take an interface name." into lmp-mr1-dev 2014-10-28 07:00:31 +00:00
Lajos Molnar
2577b3c0d8 Merge "MediaCodec/Image: handle null cropRect correctly" into lmp-mr1-dev automerge: aab38b7 
automerge: e4c7a65

* commit 'e4c7a65140b5523325fd6ca86c196136fe183ee8':
  MediaCodec/Image: handle null cropRect correctly
 2014-10-28 06:23:59 +00:00
Lorenzo Colitti
f3cab63ef2 Change removeStackedLink to take an interface name. 
This simplifies callers.

Also remove all "implementations" of addStackedLink and
removeStackedLink except the one in LinkProperties, because they
are unused.

Bug: 12111730
Change-Id: Ie294b855facba4b1436299dcb3211b72d9ba448e
 2014-10-28 15:13:57 +09:00
Erik Kline
d3b9fd33c6 (re)define the definition of "provisioned" 
Specifically:

    [1] provide a hasIPv4(), and
    [2] a hasIPv6()

each of which requires an IP address, a default route, and
address-family-specific DNS servers to evaluate to true.

Additionally:

    [3] redefine isProvisioned() to return the logical OR
        of [1] and [2] above.

Any external caller can still use any of the has*() methods to
construct its own, different definition of "provisioned".

Bug: 17769720
Change-Id: Ia692fb8508484ff403d3920c94d0e1db4563f807
 2014-10-28 14:47:42 +09:00
Lajos Molnar
e4c7a65140 Merge "MediaCodec/Image: handle null cropRect correctly" into lmp-mr1-dev 
automerge: aab38b7

* commit 'aab38b7ea0b1774d158789772d0f6b1b99c1d3c9':
  MediaCodec/Image: handle null cropRect correctly
 2014-10-28 04:11:38 +00:00
Griff Hazen
47f644a227 DO NOT MERGE Fix lmp-sprout-dev build for generics addition automerge: 732e4ec -s ours automerge: d1cbf9a -s ours 
automerge: eb19a9b  -s ours

* commit 'eb19a9bb8a729d0f13720b88e28fc17ece13af17':
  DO NOT MERGE Fix lmp-sprout-dev build for generics addition
 2014-10-28 03:42:46 +00:00
Jason Monk
48d7a89c2c Add missing passive discovery flag automerge: 4444c5b automerge: 07faf0e automerge: e585740 
automerge: 8ae1a5e

* commit '8ae1a5e10efdb58b83b510337dddd47759bdc650':
  Add missing passive discovery flag
 2014-10-28 03:41:57 +00:00
Ying Wang
49310befce Update current.txt with generics to field types. automerge: 79775d4 automerge: 475d739 -s ours automerge: bc66de0 
automerge: dbfdebf

* commit 'dbfdebfff850239a3bd478846bf3fba85df8f67a':
  Update current.txt with generics to field types.
 2014-10-28 03:41:09 +00:00
Yuncheol Heo
9a3e75783e Merge "CEC: Send <ReportMenuStatus:active> together sending <ActiveSource>." into lmp-mr1-dev automerge: 571cc6b 
automerge: 522e0af

* commit '522e0afa0fc400ceeee034c1b593b73a2787f659':
  CEC: Send <ReportMenuStatus:active> together sending <ActiveSource>.
 2014-10-28 03:40:16 +00:00
Alan Viverette
52f67ffc5d Merge "Play CLICK sound effect when compound buttons are clicked" into lmp-mr1-dev automerge: e5d27a2 
automerge: 8e448af

* commit '8e448aff2df5f41dc4b329134306fd700f497ca6':
  Play CLICK sound effect when compound buttons are clicked
 2014-10-28 03:39:26 +00:00
Ying Wang
09c8590316 Update current.txt with generics to field types. automerge: 80c9fbe 
automerge: bf43899

* commit 'bf438996e04d833d882581b25cc24f10d8a2c568':
  Update current.txt with generics to field types.
 2014-10-28 03:38:27 +00:00
Lajos Molnar
aab38b7ea0 Merge "MediaCodec/Image: handle null cropRect correctly" into lmp-mr1-dev 2014-10-28 03:28:18 +00:00
Griff Hazen
eb19a9bb8a DO NOT MERGE Fix lmp-sprout-dev build for generics addition automerge: 732e4ec -s ours 
automerge: d1cbf9a  -s ours

* commit 'd1cbf9a8703a0fa2eefd9ad0f565f99120b61c3b':
  DO NOT MERGE Fix lmp-sprout-dev build for generics addition
 2014-10-28 03:08:11 +00:00
Jason Monk
8ae1a5e10e Add missing passive discovery flag automerge: 4444c5b automerge: 07faf0e 
automerge: e585740

* commit 'e58574026b265b4773f1e9bc896ba53530c7a580':
  Add missing passive discovery flag
 2014-10-28 03:07:22 +00:00
Ying Wang
dbfdebfff8 Update current.txt with generics to field types. automerge: 79775d4 automerge: 475d739 -s ours 
automerge: bc66de0

* commit 'bc66de0df9421ea0ffc36a1a6f6d8fd8bd7dfcda':
  Update current.txt with generics to field types.
 2014-10-28 03:05:59 +00:00
Griff Hazen
d1cbf9a870 DO NOT MERGE Fix lmp-sprout-dev build for generics addition 
automerge: 732e4ec  -s ours

* commit '732e4ecbee3168c19e49469934f0e1cd3268e001':
  DO NOT MERGE Fix lmp-sprout-dev build for generics addition
 2014-10-28 02:23:34 +00:00
Jason Monk
e58574026b Add missing passive discovery flag automerge: 4444c5b 
automerge: 07faf0e

* commit '07faf0e1a1d32408dfdc863a0996baa8522c5fdb':
  Add missing passive discovery flag
 2014-10-28 02:21:20 +00:00
Ying Wang
bc66de0df9 Update current.txt with generics to field types. automerge: 79775d4 
automerge: 475d739  -s ours

* commit '475d7393bf0cbb80dd1911df30a6ba0292da09c3':
  Update current.txt with generics to field types.
 2014-10-28 02:20:25 +00:00
Griff Hazen
732e4ecbee DO NOT MERGE Fix lmp-sprout-dev build for generics addition 
Change-Id: I66f10264476df5504086a7fbc24d729798187d05
 2014-10-27 19:19:22 -07:00
Yuncheol Heo
522e0afa0f Merge "CEC: Send <ReportMenuStatus:active> together sending <ActiveSource>." into lmp-mr1-dev 
automerge: 571cc6b

* commit '571cc6b19511b07d77418b1f0288eb467d367a9a':
  CEC: Send <ReportMenuStatus:active> together sending <ActiveSource>.
 2014-10-28 01:57:50 +00:00
Alan Viverette
8e448aff2d Merge "Play CLICK sound effect when compound buttons are clicked" into lmp-mr1-dev 
automerge: e5d27a2

* commit 'e5d27a22a6908026d346e86389cf414b5badeab6':
  Play CLICK sound effect when compound buttons are clicked
 2014-10-28 01:56:59 +00:00
Ying Wang
bf438996e0 Update current.txt with generics to field types. 
automerge: 80c9fbe

* commit '80c9fbe36fe8b1e298a70c465e85ee677fc12e12':
  Update current.txt with generics to field types.
 2014-10-28 01:55:59 +00:00
Yuncheol Heo
571cc6b195 Merge "CEC: Send <ReportMenuStatus:active> together sending <ActiveSource>." into lmp-mr1-dev 2014-10-28 01:04:07 +00:00
Alan Viverette
e5d27a22a6 Merge "Play CLICK sound effect when compound buttons are clicked" into lmp-mr1-dev 2014-10-28 00:57:11 +00:00
Jason Monk
07faf0e1a1 Add missing passive discovery flag 
automerge: 4444c5b

* commit '4444c5b27874866f18cd8f4abb8914cc17857ea7':
  Add missing passive discovery flag
 2014-10-28 00:52:56 +00:00
Alan Viverette
d4e7790fee Play CLICK sound effect when compound buttons are clicked 
Also plays the sound effect when the switch changes state as a result
of dragging, since that's effectively the same as the click action.

BUG: 16308311
Change-Id: Ic187ece2a8190082617f5ac7aaf05c3511fa80b5
 2014-10-27 17:50:51 -07:00
Ying Wang
80c9fbe36f Update current.txt with generics to field types. 
Bug: 17014855
Change-Id: I14672092f79374f6c5b2362bd3c2aaac84e0c2ae
 2014-10-27 17:42:04 -07:00
Winson Chung
e6a2068c27 Merge "Fixing potential crash when the task loader is stopped. (Bug 18135583)" into lmp-mr1-dev automerge: b55f7d7 
automerge: 0baa55a

* commit '0baa55a74342b558139879201bd55d4f8cc8e5a8':
  Fixing potential crash when the task loader is stopped. (Bug 18135583)
 2014-10-28 00:37:10 +00:00
Jeff Sharkey
a7a3479a85 Merge "Check upgrade certs before permissions." into lmp-mr1-dev automerge: e795533 
automerge: 05cff40

* commit '05cff4047d1c1d0552ce52a6af0151c6b1cc8e4f':
  Check upgrade certs before permissions.
 2014-10-28 00:36:08 +00:00
John Reck
c7c8b06940 Merge "Cleanup debug options" into lmp-mr1-dev automerge: b0aeaad 
automerge: 49a01fc

* commit '49a01fc7dc8d2b9cc7591a94d19f3c209e470aea':
  Cleanup debug options
 2014-10-28 00:35:14 +00:00
Alan Viverette
7a21011a2d Merge "Fix min/max date range in DatePicker calendar mode" into lmp-mr1-dev automerge: 3847552 
automerge: 5a01fcd

* commit '5a01fcd194bea9cf001709f32247ad851cd5a0dc':
  Fix min/max date range in DatePicker calendar mode
 2014-10-28 00:34:22 +00:00
Wale Ogunwale
7e003ba751 Merge "Added documentation for various window frame types." into lmp-mr1-dev automerge: 674f55e 
automerge: e1c6d89

* commit 'e1c6d898177bb694ad84ccb1940f3e3df074a290':
  Added documentation for various window frame types.
 2014-10-28 00:33:30 +00:00
Alan Viverette
7e79fd3ee2 Merge "Clean up some javadocs in Window.setFeature...()" into lmp-mr1-dev automerge: 253626b 
automerge: b64176b

* commit 'b64176bd87e08bcb952d6c22eea7ffd9a8b6df62':
  Clean up some javadocs in Window.setFeature...()
 2014-10-28 00:32:19 +00:00
Jeff Sharkey
720147e249 Merge "Follow API removal." into lmp-mr1-dev automerge: d634d39 
automerge: 19022f6

* commit '19022f6991e2d681dfdc8d5e6464557647a1faa1':
  Follow API removal.
 2014-10-28 00:31:14 +00:00
Mike Lockwood
bfdc6b50f4 Merge "Improve toString() methods for audio classes to help with debugging" into lmp-mr1-dev automerge: ac7d8c5 
automerge: 9f08a9f

* commit '9f08a9f08a3440e1f4a0b60c3e0cc5fe3dd71f27':
  Improve toString() methods for audio classes to help with debugging
 2014-10-28 00:29:57 +00:00
Jeff Sharkey
a38592ae5d Merge "Follow ArraySet refactoring." into lmp-mr1-dev automerge: 9c81373 
automerge: 817722b

* commit '817722bb36e81ef0216fd1c75a9174e08238f954':
  Follow ArraySet refactoring.
 2014-10-28 00:29:03 +00:00
Jeff Sharkey
a148a0dc66 Merge "Drop DEV network stats to save RAM." into lmp-mr1-dev automerge: 49c1527 
automerge: a5921b9

* commit 'a5921b9b79a1d95e8a41bd74998cab82b153cb0a':
  Drop DEV network stats to save RAM.
 2014-10-28 00:27:07 +00:00
Winson Chung
0baa55a743 Merge "Fixing potential crash when the task loader is stopped. (Bug 18135583)" into lmp-mr1-dev 
automerge: b55f7d7

* commit 'b55f7d79d19e8d8786fab8faabedb2f253bfacf8':
  Fixing potential crash when the task loader is stopped. (Bug 18135583)
 2014-10-27 23:53:52 +00:00
Jeff Sharkey
05cff4047d Merge "Check upgrade certs before permissions." into lmp-mr1-dev 
automerge: e795533

* commit 'e79553355b10815be2cd44f7b84ae39c91a12bb1':
  Check upgrade certs before permissions.
 2014-10-27 23:53:00 +00:00
John Reck
49a01fc7dc Merge "Cleanup debug options" into lmp-mr1-dev 
automerge: b0aeaad

* commit 'b0aeaad442e6cd4920d75a63d65a91267cf9199a':
  Cleanup debug options
 2014-10-27 23:42:35 +00:00
Alan Viverette
5a01fcd194 Merge "Fix min/max date range in DatePicker calendar mode" into lmp-mr1-dev 
automerge: 3847552

* commit '384755230c52f0951820ba496f300959dcc84ead':
  Fix min/max date range in DatePicker calendar mode
 2014-10-27 23:41:44 +00:00
Wale Ogunwale
e1c6d89817 Merge "Added documentation for various window frame types." into lmp-mr1-dev 
automerge: 674f55e

* commit '674f55e515d0895475d136f7793f6ce9929d859c':
  Added documentation for various window frame types.
 2014-10-27 23:40:54 +00:00
Winson Chung
b55f7d79d1 Merge "Fixing potential crash when the task loader is stopped. (Bug 18135583)" into lmp-mr1-dev 2014-10-27 23:39:11 +00:00
Alan Viverette
b64176bd87 Merge "Clean up some javadocs in Window.setFeature...()" into lmp-mr1-dev 
automerge: 253626b

* commit '253626b822b3b20fdb9727705593b4b5b55b8553':
  Clean up some javadocs in Window.setFeature...()
 2014-10-27 23:39:09 +00:00
Jeff Sharkey
e79553355b Merge "Check upgrade certs before permissions." into lmp-mr1-dev 2014-10-27 23:35:58 +00:00