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

46056 Commits

Author SHA1 Message Date
Alan Viverette
71c2789930 am e9e7d012: am 272e2f73: Merge "Ensure we don\'t pass null values in to Theme.resolveAttributes" into lmp-mr1-dev 
* commit 'e9e7d012dd7df56227854fd0887b6f0476db8b67':
  Ensure we don't pass null values in to Theme.resolveAttributes
 2014-10-31 00:28:11 +00:00
Lorenzo Colitti
fa186dbd3d am f2c90942: am bbb2c5b2: Merge "Add support for running 464xlat on wifi as well." into lmp-mr1-dev 
* commit 'f2c9094293529f42b7183f0373b41a5278581a81':
  Add support for running 464xlat on wifi as well.
 2014-10-31 00:16:09 +00:00
Chris Banes
3726cd1285 am 95e3322c: am e436cb39: Merge "Fix ActionMenuView vertical alignment of items" into lmp-mr1-dev 
* commit '95e3322c93fbfa4806f5ec0c63478854b4b29396':
  Fix ActionMenuView vertical alignment of items
 2014-10-31 00:15:48 +00:00
Yigit Boyar
9d0a2dc15d am 012e06bc: am 33d9dc46: Merge "Move all actionbar related methods to DecorToolbar" into lmp-mr1-dev 
* commit '012e06bcb965c76e696ebc2e09e5eaaf97129d91':
  Move all actionbar related methods to DecorToolbar
 2014-10-31 00:15:16 +00:00
Alan Viverette
af896cc719 am ce0bc264: am a9ba2cdf: Merge "Ensure ImageView.setImageResource() always resolves Drawable" into lmp-mr1-dev 
* commit 'ce0bc26443bb61832ac59a0d367b9ec1a540301b':
  Ensure ImageView.setImageResource() always resolves Drawable
 2014-10-31 00:15:09 +00:00
Alan Viverette
9a77c8a279 am 3c5cc234: am 674a3a21: Merge "Distinguish unspecified and explicit null values in resources" into lmp-mr1-dev 
* commit '3c5cc234eeef4a08ad7b00b4e869a1e47cf14ab3':
  Distinguish unspecified and explicit null values in resources
 2014-10-31 00:15:01 +00:00
Alan Viverette
349e93ea65 am 65d792e4: am 10450405: Merge "Show scroll indicators in AlertDialog" into lmp-mr1-dev 
* commit '65d792e46cad687b2457ac4903cd489ec9dc77e6':
  Show scroll indicators in AlertDialog
 2014-10-31 00:14:38 +00:00
Adam Lesinski
5231a1edf4 am 49661141: am 720a5c51: Merge "Add dumpsys output to UsageStatsService, along with --checkin support" into lmp-mr1-dev 
* commit '496611416d4da9fb4a8323dab7d270c0f9be04d7':
  Add dumpsys output to UsageStatsService, along with --checkin support
 2014-10-31 00:13:47 +00:00
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
Alan Viverette
bfc8599f43 am b2449a39: am d86d7bce: Merge "Use action mode context for ActionMode menu inflater" into lmp-mr1-dev 
* commit 'b2449a399b0e67ab60c592baca9063540b8c1637':
  Use action mode context for ActionMode menu inflater
 2014-10-30 23:43:58 +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
Alan Viverette
25128b0b5a am 05b2fedc: Merge "Inflate ActionMode items against the ActionBarContextView theme" into lmp-mr1-dev 
automerge: b00c424

* commit 'b00c4242579ac9c42c01656cb7b10f394f55a445':
  Inflate ActionMode items against the ActionBarContextView theme
 2014-10-30 19:05:27 +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
272e2f73bd Merge "Ensure we don't pass null values in to Theme.resolveAttributes" into lmp-mr1-dev 2014-10-30 17:38:40 +00:00
Alan Viverette
7f4a63d1eb Ensure we don't pass null values in to Theme.resolveAttributes 
BUG: 18182274
Change-Id: I08acf877cb81478cc205254edf92a31fcf05991d
 2014-10-30 10:29:03 -07:00
Lorenzo Colitti
bbb2c5b28a Merge "Add support for running 464xlat on wifi as well." into lmp-mr1-dev 2014-10-30 13:27:54 +00:00
Lorenzo Colitti
e21a26b3ba Add support for running 464xlat on wifi as well. 
1. Add a command to NetworkManagementService to enable/disable
   IPv6 ND offload via netd.
2. Make Nat464Xlat enable offload if clatd successfully comes up
   on a wifi network (which means it detected a NAT64), and
   correspondingly re-enable offload when the clatd interface
   goes down.

This change does not enable clatd on wifi yet, that requires an
extra 2 lines to enable it.

Bug: 12111730
Change-Id: I4318611762a37487c9a84f8c4867ec5aece98be8
 2014-10-30 20:31:26 +09: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
Chris Banes
e436cb39da Merge "Fix ActionMenuView vertical alignment of items" into lmp-mr1-dev 2014-10-30 08:42:37 +00:00
Yigit Boyar
33d9dc46cf Merge "Move all actionbar related methods to DecorToolbar" into lmp-mr1-dev 2014-10-30 02:02:15 +00:00
Alan Viverette
a9ba2cdfc1 Merge "Ensure ImageView.setImageResource() always resolves Drawable" into lmp-mr1-dev 2014-10-30 00:52:17 +00:00
Alan Viverette
674a3a21cb Merge "Distinguish unspecified and explicit null values in resources" into lmp-mr1-dev 2014-10-30 00:41:44 +00:00
Alan Viverette
d739d7bd8a Ensure ImageView.setImageResource() always resolves Drawable 
Fixes no-op on method call after configuration change at the expense
of removing a micro-optimization that wasn't really needed.

BUG: 18178233
Change-Id: I36eccf91b138e4bed34be96d9b87200edeb66938
 2014-10-29 17:26:37 -07:00
Alan Viverette
104504053d Merge "Show scroll indicators in AlertDialog" into lmp-mr1-dev 2014-10-30 00:18:32 +00:00
Alan Viverette
154c2c24dc Show scroll indicators in AlertDialog 
BUG: 16353356
Change-Id: I0307283751ccb23b9d85b0c36cb78b01243e70dd
 2014-10-30 00:18:22 +00:00
Alan Viverette
f296940502 Distinguish unspecified and explicit null values in resources 
BUG: 17919345
Change-Id: Ic4f04f7dd0f986f58a749b5950d80c1cfdb074ea
 2014-10-29 17:09:36 -07:00
Adam Lesinski
720a5c51be Merge "Add dumpsys output to UsageStatsService, along with --checkin support" into lmp-mr1-dev 2014-10-29 23:11:54 +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
d86d7bce78 Merge "Use action mode context for ActionMode menu inflater" into lmp-mr1-dev 2014-10-29 21:14:56 +00: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
3abf5c4bd1 Use action mode context for ActionMode menu inflater 
BUG: 18078900
Change-Id: Iff837e741dde79a565f1e8c83846ee6155da179e
 2014-10-29 11:03:35 -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