Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
170,611 Commits 3 Branches 0 Tags
863fbacd14aa7aa7fad2cf4c67019cfce8dfada6
Commit Graph

43391 Commits

Author SHA1 Message Date
Narayan Kamath
f0c7066742 am 78b3f5ab: am fa945c10: am e87d36f8: Merge "Revert "Remove unused apache related API."" 
* commit '78b3f5ab70300548776e3b98ee6d8fb6b1f5318f':
  Revert "Remove unused apache related API."
 2014-10-29 19:42:13 +00:00
Elliott Hughes
99e08b70aa am b5ce284a: resolved conflicts for merge of d3389e2f to lmp-mr1-dev-plus-aosp 
* commit 'b5ce284aa8e738de051572ab37a01d52fa7b1dac':
  Remove unused apache related API.
 2014-10-29 19:38:05 +00:00
Narayan Kamath
78b3f5ab70 am fa945c10: am e87d36f8: Merge "Revert "Remove unused apache related API."" 
* commit 'fa945c105b4f7bb3e3844e8ce467ca701d5f3a9f':
  Revert "Remove unused apache related API."
 2014-10-29 19:34:10 +00:00
Elliott Hughes
b5ce284aa8 resolved conflicts for merge of d3389e2f to lmp-mr1-dev-plus-aosp 
Change-Id: Ic4969a59ef22d4911f74cc1e75ea5ccfab59b770
 2014-10-29 12:31:48 -07:00
Elliott Hughes
64a1a901dc am 87ce99ca: am ced7ebdb: Merge "Migrate off timeFormat12 and timeFormat24." 
* commit '87ce99ca7243e4556a6cfe9f42cc51531301e979':
  Migrate off timeFormat12 and timeFormat24.
 2014-10-29 17:13:38 +00:00
Narayan Kamath
fa945c105b am e87d36f8: Merge "Revert "Remove unused apache related API."" 
* commit 'e87d36f8925a34f85ba80c886757d07ad03fed42':
  Revert "Remove unused apache related API."
 2014-10-29 11:30:11 +00:00
Narayan Kamath
d3389e2f32 resolved conflicts for merge of 9834af9c to stage-aosp-master 
Change-Id: Ibdada14406f49684cf345162204b9810452f25a2
 2014-10-29 11:23:45 +00:00
John Spurlock
a949dc659d am d856afec: am ee990413: Merge "Zen: Show "(until 4:56 PM)" in exit conditions." into lmp-mr1-dev automerge: 93e40ba 
* commit 'd856afec47c069fe117cdf6c3e22c3d066565a11':
  Zen: Show "(until 4:56 PM)" in exit conditions.
 2014-10-28 19:05:55 +00:00
George Mount
830593ee70 am aeb0a9db: am 95d520f1: Merge "Fix NPE in moveSharedElementsToOverlay" into lmp-mr1-dev automerge: 8a536bb 
* commit 'aeb0a9dba297a027344bc91e8b9e33c84c450876':
  Fix NPE in moveSharedElementsToOverlay
 2014-10-28 19:05:50 +00:00
George Mount
7883be77e5 am c1423972: am 45b70108: Merge "Fixed: Nested shared elements now transition separately." into lmp-mr1-dev automerge: 69a3dd8 
* commit 'c1423972727f59a02ca1bc3e55f694e9a27b82d5':
  Fixed: Nested shared elements now transition separately.
 2014-10-28 19:05:47 +00:00
Nicolas Prevot
755c098042 am ecdc14dc: am ebee8a4d: Merge "Replace minimum with maximum in method description." into lmp-mr1-dev automerge: e86848c 
* commit 'ecdc14dc31ba22f2569be5c8850d0d09a1a0c0a4':
  Replace minimum with maximum in method description.
 2014-10-28 18:15:59 +00:00
John Spurlock
d856afec47 am ee990413: Merge "Zen: Show "(until 4:56 PM)" in exit conditions." into lmp-mr1-dev 
automerge: 93e40ba

* commit '93e40ba6c4373402c7c4f430e3e575e4a0cc13eb':
  Zen: Show "(until 4:56 PM)" in exit conditions.
 2014-10-28 18:08:11 +00:00
George Mount
aeb0a9dba2 am 95d520f1: Merge "Fix NPE in moveSharedElementsToOverlay" into lmp-mr1-dev 
automerge: 8a536bb

* commit '8a536bb4e04b8a0e4f074c744321d352d5bf08b2':
  Fix NPE in moveSharedElementsToOverlay
 2014-10-28 18:06:58 +00:00
George Mount
c142397272 am 45b70108: Merge "Fixed: Nested shared elements now transition separately." into lmp-mr1-dev 
automerge: 69a3dd8

* commit '69a3dd85df49d5c5ef67d7c28f1473d23ce46980':
  Fixed: Nested shared elements now transition separately.
 2014-10-28 18:06:04 +00:00
Nicolas Prevot
ecdc14dc31 am ebee8a4d: Merge "Replace minimum with maximum in method description." into lmp-mr1-dev 
automerge: e86848c

* commit 'e86848c258a2fc42e52eb1e3234c1288acd96a3b':
  Replace minimum with maximum in method description.
 2014-10-28 18:05:09 +00:00
John Spurlock
ee990413b5 Merge "Zen: Show "(until 4:56 PM)" in exit conditions." into lmp-mr1-dev 2014-10-28 17:08:43 +00:00
George Mount
95d520f160 Merge "Fix NPE in moveSharedElementsToOverlay" into lmp-mr1-dev 2014-10-28 17:01:25 +00:00
George Mount
45b701085b Merge "Fixed: Nested shared elements now transition separately." into lmp-mr1-dev 2014-10-28 17:00:43 +00:00
John Spurlock
c90e6fe863 Zen: Show "(until 4:56 PM)" in exit conditions. 
Implement two-line exit conditions, display the duration + end
time on separate lines.

Bug: 16824863
Change-Id: I8dabc83042fce604ccb86b463b9bb547c7903c64
 2014-10-28 12:57:43 -04:00
Nicolas Prevot
555f1986f1 Replace minimum with maximum in method description. 
BUG:18152344

Change-Id: If5d09051e8f74addf53018cfd3be214d96efb9e6
 2014-10-28 16:18:47 +00:00
Erik Kline
ecb2397c33 am e9810e8d: Merge "(re)define the definition of "provisioned"" into lmp-mr1-dev automerge: dd91fb4 automerge: 8fc600d 
* commit 'e9810e8d532d87d23d3824d6165824a2da0cfee9':
  (re)define the definition of "provisioned"
 2014-10-28 09:00:20 +00:00
Lorenzo Colitti
8a140ccfe3 am 9d6f408a: am 111cc9f5: Merge "Change removeStackedLink to take an interface name." into lmp-mr1-dev automerge: 35261c4 
* commit '9d6f408ab5a3fc12a1cae2ffba928c79df74739c':
  Change removeStackedLink to take an interface name.
 2014-10-28 08:55:55 +00:00
Erik Kline
e9810e8d53 Merge "(re)define the definition of "provisioned"" into lmp-mr1-dev automerge: dd91fb4 
automerge: 8fc600d

* commit '8fc600d1a8fc4f9cedceee185d129a19b06001c5':
  (re)define the definition of "provisioned"
 2014-10-28 08:54:03 +00:00
Lorenzo Colitti
9d6f408ab5 am 111cc9f5: Merge "Change removeStackedLink to take an interface name." into lmp-mr1-dev 
automerge: 35261c4

* commit '35261c4351ea42b2bbd057e852f50158de8eda9c':
  Change removeStackedLink to take an interface name.
 2014-10-28 08:50:41 +00:00
Erik Kline
dd91fb4474 Merge "(re)define the definition of "provisioned"" into lmp-mr1-dev 2014-10-28 07:53:37 +00:00
Alan Viverette
caa44c4812 am 52f67ffc: Merge "Play CLICK sound effect when compound buttons are clicked" into lmp-mr1-dev automerge: e5d27a2 automerge: 8e448af 
* commit '52f67ffc5ddb1994eb03c6687a89eccec8f60885':
  Play CLICK sound effect when compound buttons are clicked
 2014-10-28 07:17:21 +00:00
John Reck
a8f1bce008 am c7c8b069: Merge "Cleanup debug options" into lmp-mr1-dev automerge: b0aeaad automerge: 49a01fc 
* commit 'c7c8b069407236bcc04c086912c73002d48419ef':
  Cleanup debug options
 2014-10-28 07:17:03 +00:00
Alan Viverette
3ed8a3131b am 7a21011a: Merge "Fix min/max date range in DatePicker calendar mode" into lmp-mr1-dev automerge: 3847552 automerge: 5a01fcd 
* commit '7a21011a2de6dac1ccccea94998b2677f22e4b8e':
  Fix min/max date range in DatePicker calendar mode
 2014-10-28 07:16:59 +00:00
Alan Viverette
b21e2e392b am 7e79fd3e: Merge "Clean up some javadocs in Window.setFeature...()" into lmp-mr1-dev automerge: 253626b automerge: b64176b 
* commit '7e79fd3ee2e9b1f27f20fec7eaa4353bbdf1bab2':
  Clean up some javadocs in Window.setFeature...()
 2014-10-28 07:16:51 +00:00
Jeff Sharkey
6007da7b73 am a148a0dc: Merge "Drop DEV network stats to save RAM." into lmp-mr1-dev automerge: 49c1527 automerge: a5921b9 
* commit 'a148a0dc667ac35599a35a46f2232f0128269d78':
  Drop DEV network stats to save RAM.
 2014-10-28 07:16:34 +00:00
Dake Gu
286918f718 am 54aad953: am 4c2e3491: Merge "ActivityTransition: Encode scaleType and matrix in snapshot view" into lmp-mr1-dev automerge: 63964d9 
* commit '54aad9533646d3e4ebbf474858112d61424f9b6d':
  ActivityTransition: Encode scaleType and matrix in snapshot view
 2014-10-28 07:16:30 +00:00
Jeff Sharkey
23801ccafb am 1c665948: am e67b8d28: Merge "Reduce PackageManager RAM usage: ArrayMap/Set." into lmp-mr1-dev automerge: 301b563 
* commit '1c6659486c7f9a868aaf1c87d08ffd9aa3f750d7':
  Reduce PackageManager RAM usage: ArrayMap/Set.
 2014-10-28 07:16:25 +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
111cc9f511 Merge "Change removeStackedLink to take an interface name." into lmp-mr1-dev 2014-10-28 07:00:31 +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
Elliott Hughes
87ce99ca72 am ced7ebdb: Merge "Migrate off timeFormat12 and timeFormat24." 
* commit 'ced7ebdb1d522b4206e2048b278554ca841aeaba':
  Migrate off timeFormat12 and timeFormat24.
 2014-10-28 04:39:24 +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
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
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
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
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
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
John Reck
b0aeaad442 Merge "Cleanup debug options" into lmp-mr1-dev 2014-10-27 23:27:30 +00:00
Alan Viverette
384755230c Merge "Fix min/max date range in DatePicker calendar mode" into lmp-mr1-dev 2014-10-27 23:16:26 +00:00
Alan Viverette
253626b822 Merge "Clean up some javadocs in Window.setFeature...()" into lmp-mr1-dev 2014-10-27 22:39:12 +00:00
Dake Gu
54aad95336 am 4c2e3491: Merge "ActivityTransition: Encode scaleType and matrix in snapshot view" into lmp-mr1-dev 
automerge: 63964d9

* commit '63964d9eae11b79e3d50ee5f3cc79b08050653fe':
  ActivityTransition: Encode scaleType and matrix in snapshot view
 2014-10-27 21:34:58 +00:00
Jeff Sharkey
1c6659486c am e67b8d28: Merge "Reduce PackageManager RAM usage: ArrayMap/Set." into lmp-mr1-dev 
automerge: 301b563

* commit '301b563107c7458a21e4460254e81694b45f0e35':
  Reduce PackageManager RAM usage: ArrayMap/Set.
 2014-10-27 21:33:55 +00:00