Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
165,910 Commits 3 Branches 0 Tags
c2663dfdab293c233e230f637b8aaf4bc79bf8d0
Commit Graph

42389 Commits

Author SHA1 Message Date
Alan Viverette
c2663dfdab am 0ab3e1df: am 4e7c562c: Merge "Update drawable state after updating tint list" into lmp-mr1-dev 
* commit '0ab3e1df1de76f54296eefb1df05664950da8d2b':
  Update drawable state after updating tint list
 2014-10-30 23:44:49 +00:00
Alan Viverette
b50a6f39ca am baed009e: am 2d3443fc: Merge "Add setters for window elevation and clipToOutline properties" into lmp-mr1-dev 
* commit 'baed009eaeaacffef7cc0972517434451e357aef':
  Add setters for window elevation and clipToOutline properties
 2014-10-30 23:44:37 +00:00
Alan Viverette
aff329f867 am 9b5a4e9d: am 66c0adcf: Merge "Ensure accessibility focus rect is drawn correctly" into lmp-mr1-dev 
* commit '9b5a4e9dafda3c9c5c62d3d7cf151f13c4126309':
  Ensure accessibility focus rect is drawn correctly
 2014-10-30 23:44:31 +00:00
Alan Viverette
136974c066 am 19b1c266: am 8785a56c: Merge "Create translucent hardware renderer if surface insets are non-zero" into lmp-mr1-dev 
* commit '19b1c26622bd17165f2bb187fcddf036fd3f53cd':
  Create translucent hardware renderer if surface insets are non-zero
 2014-10-30 23:44:25 +00:00
Jeff Hao
05ea3213fd am 73577862: am b1346d78: Merge "Change boot screen title to "Android is starting" when not upgrading." into lmp-mr1-dev 
* commit '73577862ffe6332f326628febfa1fbb9e693bb40':
  Change boot screen title to "Android is starting" when not upgrading.
 2014-10-30 23:44:09 +00:00
Andre Eisenbach
8018fae1c1 am dfc47254: am e2502eb9: Merge "Fix crash during Bluetooth on/off stress test" into lmp-mr1-dev 
* commit 'dfc472542f22469aca4982d4b87ed3e1d699f473':
  Fix crash during Bluetooth on/off stress test
 2014-10-30 23:43:37 +00:00
Alan Viverette
7d96556604 am 73ab31f6: am 7a0ae7ed: Merge "Add content description to Toolbar collapse button" into lmp-mr1-dev 
* commit '73ab31f610e15e5bb275132845f0146caa4039c6':
  Add content description to Toolbar collapse button
 2014-10-30 23:42:46 +00:00
Chris Wren
e52d0d68c4 am 402152d6: Merge "Reveal notification listener settings APIs." into lmp-mr1-dev 
automerge: b3239da

* commit 'b3239da9a0c3c75e5aea5e961cd8ed4fc627d42b':
  Reveal notification listener settings APIs.
 2014-10-30 19:17:17 +00:00
Erik Kline
0d74973a08 am befe778c: Treat optimistic addresses as global preferred. 
automerge: 9a8351d

* commit '9a8351d9d7d1e002187fca20fea48d1e9214d829':
  Treat optimistic addresses as global preferred.
 2014-10-30 19:10:04 +00:00
Lorenzo Colitti
2f3dab8585 am def4cd4f: Merge "Support more than one clatd at a time." into lmp-mr1-dev 
automerge: ba69b3f

* commit 'ba69b3f290e6fe4a579841a2dd052ca5803ba863':
  Support more than one clatd at a time.
 2014-10-30 19:07:02 +00:00
Shishir Agrawal
060afd455f am c8787bec: Merge "Undo erroneous delete done by I94eb65c62231b5831570bb0cbbbd9c916bee0a37" into lmp-mr1-dev 
automerge: 47fa171

* commit '47fa1715221b50334ca1df1eab148cd50eeef608':
  Undo erroneous delete done by I94eb65c62231b5831570bb0cbbbd9c916bee0a37
 2014-10-30 19:04:24 +00:00
Alan Viverette
2a4c7618ef am 09da6ec6: am 4bf9edfc: Merge "Update drag-to-open menu close behavior" into lmp-mr1-dev 
* commit '09da6ec635fc4565aa7cdac62dccd40fcf73b359':
  Update drag-to-open menu close behavior
 2014-10-30 11:03:35 +00:00
Alan Viverette
4e7c562c43 Merge "Update drawable state after updating tint list" into lmp-mr1-dev 2014-10-29 22:20:18 +00:00
Alan Viverette
2d3443fc5a Merge "Add setters for window elevation and clipToOutline properties" into lmp-mr1-dev 2014-10-29 22:05:11 +00:00
Alan Viverette
66c0adcfd4 Merge "Ensure accessibility focus rect is drawn correctly" into lmp-mr1-dev 2014-10-29 22:05:05 +00:00
Alan Viverette
8785a56c8f Merge "Create translucent hardware renderer if surface insets are non-zero" into lmp-mr1-dev 2014-10-29 22:05:01 +00:00
Jeff Hao
b1346d7829 Merge "Change boot screen title to "Android is starting" when not upgrading." into lmp-mr1-dev 2014-10-29 21:47:30 +00:00
Jeff Hao
9f60c08a44 Change boot screen title to "Android is starting" when not upgrading. 
Bug: 17565501
Change-Id: Id5741e6e7a40750feee1cd7306e79f7baeec67de
 2014-10-29 14:42:39 -07:00
Alan Viverette
79c067c54a Add setters for window elevation and clipToOutline properties 
These are available as XML attributes but were lacking setters. None
of the Window properties have getters, so just adding setters here.

BUG: 16847753
Change-Id: I9c032903e94b7f12125210bd73c911243612df69
 2014-10-29 14:27:47 -07:00
Alan Viverette
d513379239 Update drawable state after updating tint list 
BUG: 18155988
Change-Id: Ic536027a54c10b2082fbc22476530165b76e2c59
 2014-10-29 19:46:54 +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
Andre Eisenbach
178d3b54cd Fix crash during Bluetooth on/off stress test 
Bug: 18106938
Change-Id: Icdeb736d89d5926264f2043455ccbc3760fd5d29
 2014-10-29 12:13:38 -07:00
Alan Viverette
2b12b58f94 Create translucent hardware renderer if surface insets are non-zero 
BUG: 18160604
Change-Id: Ie4483b9841bd91778659d83b154f69e777fa1dfc
 2014-10-29 11:11:40 -07:00
Alan Viverette
7a0ae7ed31 Merge "Add content description to Toolbar collapse button" into lmp-mr1-dev 2014-10-29 18:00:12 +00: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
Chris Wren
402152d673 Merge "Reveal notification listener settings APIs." into lmp-mr1-dev 2014-10-29 14:54:18 +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
Erik Kline
befe778c73 Treat optimistic addresses as global preferred. 
If the kernel sends notification of an optimistic address then
treat is a useable address (isGlobalPreferred()).

Note that addresses flagged as IFA_F_OPTIMISTIC are
simultaneously flagged as IFA_F_TENTATIVE (when the tentative
state has cleared either DAD has succeeded or failed, and both
flags are cleared regardless).

Additionally: do not consider RFC 4193 ULA addresses sufficient
for "global preffered".  They are, by definition, of global scope
but not sufficient for global reachability.

Bug: 17769720
Change-Id: I759623b28fd52758f2d4d76d167f3cafd9319d6a
 2014-10-29 19:11:58 +09:00
Lorenzo Colitti
def4cd4fa4 Merge "Support more than one clatd at a time." into lmp-mr1-dev 2014-10-29 03:43:04 +00:00
Shishir Agrawal
c8787beca6 Merge "Undo erroneous delete done by I94eb65c62231b5831570bb0cbbbd9c916bee0a37" into lmp-mr1-dev 2014-10-29 00:15:51 +00:00
Alan Viverette
85085343b3 Add content description to Toolbar collapse button 
BUG: 17722111
Change-Id: If6caa8bc61b0d178648952c419591380f4edf4ba
 2014-10-28 16:42:24 -07:00
Alan Viverette
4bf9edfc1f Merge "Update drag-to-open menu close behavior" into lmp-mr1-dev 2014-10-28 22:45:33 +00:00
Alan Viverette
632af84924 Ensure accessibility focus rect is drawn correctly 
Reverts previous change that draws it as part of View.draw() and ensures
that the display is always redrawn if a view has accessibility focus.
Correctly removes focus from views with accessibility focused ancestors.

Also reverts the focus indicator to use a solid line since the dotted
line looked janky.

BUG: 17675993
Change-Id: I25718334cc1ae1c2cd19d3c23af1c18c6a67504c
 2014-10-28 20:57:47 +00:00
Chris Wren
8326a8a945 Reveal notification listener settings APIs. 
Fix the value of the ACTION_NOTIFICATION_LISTENER_SETTINGS constant
to be the actual value to which the settings app responds.

Bug: 10023397
Change-Id: I80a0ff76406a3b0b893793f9a63ffa563dae103b
 2014-10-28 15:54:53 -04:00
Shishir Agrawal
1ae88e3420 Undo erroneous delete done by I94eb65c62231b5831570bb0cbbbd9c916bee0a37 
The change above deleted these lines by mistake.

Bug: 18153840
Change-Id: I010c36f227e313cdf00a363f1f851e61a4db1af4
 2014-10-28 11:19:14 -07: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
Lorenzo Colitti
954394653d Support more than one clatd at a time. 
1. Make Nat464Xlat a per-network object, one for every network
   requiring clat, instead of a ConnectivityService singleton.
2. Make the NetworkManagementService clatd commands take an
   interface.
3. When we attempt to start clatd on a network, store its
   Nat464Xlat object in the NetworkAgentInfo, so we have an
   authoritative way of knowing whether clat is running on a
   given network.
4. Rework Nat464Xlat, hopefully simplifying it.

Bug: 12111730
Change-Id: I1fa5508ef020cd1c3d1c7a1f7b06370ac5fc2ae2
 2014-10-29 01:23:26 +09: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
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