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

173021 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andreas Gampe
e80c01e8d1 Merge "Frameworks/base: Turn on -Wall -Werror in cmds" 2014-11-07 22:35:32 +00:00
Andreas Gampe
cfedceb8c1 Frameworks/base: Turn on -Wall -Werror in cmds 
Fix small warnings, turn on -Wall -Werror.

Change-Id: Iab1f01a7c7ebd6ba832b75067c5e395f380a1b8b
 2014-11-07 14:33:51 -08:00
Sander Alewijnse
8c1cd7e61f am 3eed90f3: Merge "Added the restrictions pending application restrictions key." into lmp-mr1-dev 
* commit '3eed90f39301089a1c16d6e2c0d027b187567cf0':
  Added the restrictions pending application restrictions key.
 2014-11-07 22:30:50 +00:00
Alan Viverette
75d1cbd71b am e37c761e: am c30a7623: am 48c8cd06: Merge "Support theme attributes in StateListDrawable <item> element" into lmp-mr1-dev 
* commit 'e37c761e5e850aebb3be56a2eadaa85cc2134547':
  Support theme attributes in StateListDrawable <item> element
 2014-11-07 22:27:24 +00:00
Deepanshu Gupta
796e9b7f99 Add primitive shadows support to LayoutLib 
The shadows rendered are not the same as rendered by the framework. The
main purpose of the shadows here is let the user know when shadows will
be cast.

Currently rectangular shadows are available in only two intensities. Any
elevation below 10dp uses one shadow and any elevation over 10 dp uses
the other.

Also, even though the code for arbitrary shapes exist, it doesn't quite
work yet. No shadows are visible when that code is run.

Change-Id: Ie8235ffccf1d3809713f5d8f82afde434817d6b2
 2014-11-07 22:26:11 +00:00
Sander Alewijnse
3eed90f393 Merge "Added the restrictions pending application restrictions key." into lmp-mr1-dev 2014-11-07 22:25:00 +00:00
Alan Viverette
e37c761e5e am c30a7623: am 48c8cd06: Merge "Support theme attributes in StateListDrawable <item> element" into lmp-mr1-dev 
* commit 'c30a7623a2f97ce791ed019d7014b842f9c9b7d2':
  Support theme attributes in StateListDrawable <item> element
 2014-11-07 22:20:09 +00:00
Sander Alewijnse
53d63dcd04 Added the restrictions pending application restrictions key. 
Bug:17632522
Change-Id: If5a0d0ea1f479b0584fc0b1cff2a179d296d2904
 2014-11-07 22:19:48 +00:00
Alan Viverette
c30a7623a2 am 48c8cd06: Merge "Support theme attributes in StateListDrawable <item> element" into lmp-mr1-dev 
* commit '48c8cd06aa0b284368d836cf5d2e6c1b1630d322':
  Support theme attributes in StateListDrawable <item> element
 2014-11-07 22:14:45 +00:00
Alan Viverette
48c8cd06aa Merge "Support theme attributes in StateListDrawable <item> element" into lmp-mr1-dev 2014-11-07 22:09:44 +00:00
John Reck
b23a1b1967 am 0e7c13a1: (-s ours) am 413a6812: am 4734b67d: am 050a8a05: DO NOT MERGE Fix finalizer ordering/double-free issue 
* commit '0e7c13a143ceec3f84e50b0a89ad0399345f9b2a':
  DO NOT MERGE Fix finalizer ordering/double-free issue
 2014-11-07 22:08:43 +00:00
Jason Monk
8dd6f7af9a am ef845286: am e2038151: am 872d4e00: Merge "Prepare for testing the NetworkControllerImpl" into lmp-mr1-dev 
* commit 'ef845286e0f0af4155599376a628e904f9ac3bd2':
  Prepare for testing the NetworkControllerImpl
 2014-11-07 22:04:04 +00:00
John Reck
0e7c13a143 am 413a6812: am 4734b67d: am 050a8a05: DO NOT MERGE Fix finalizer ordering/double-free issue 
* commit '413a68127a7dd1c422e142cbd0e9157c99623de3':
  DO NOT MERGE Fix finalizer ordering/double-free issue
 2014-11-07 22:01:02 +00:00
Jason Monk
ef845286e0 am e2038151: am 872d4e00: Merge "Prepare for testing the NetworkControllerImpl" into lmp-mr1-dev 
* commit 'e2038151c2a3410a67edc408a1d677b05cda41ec':
  Prepare for testing the NetworkControllerImpl
 2014-11-07 21:55:37 +00:00
John Reck
413a68127a am 4734b67d: am 050a8a05: DO NOT MERGE Fix finalizer ordering/double-free issue 
* commit '4734b67dc56950f93da385d3d59b06b0058cf33b':
  DO NOT MERGE Fix finalizer ordering/double-free issue
 2014-11-07 21:52:08 +00:00
John Reck
4734b67dc5 am 050a8a05: DO NOT MERGE Fix finalizer ordering/double-free issue 
* commit '050a8a050de04bd0098cde8fdf665a7202929ee0':
  DO NOT MERGE Fix finalizer ordering/double-free issue
 2014-11-07 21:47:42 +00:00
Andreas Gampe
2204f0bf56 Frameworks/base: Wall Werror in libs/androidfw 
Turn on -Wall -Werror in libs/androidfw. Fix warnings. Refactor
some code.

Change-Id: I66fe54ace433c15dee5de328b149ca142f74b2dd
 2014-11-07 13:35:05 -08:00
John Reck
050a8a050d DO NOT MERGE Fix finalizer ordering/double-free issue 
Bug: 18289984

If Surface:finalize() happens after HwuiContext:finalize()
it would try to manipulate a destroyed object. However, as
Surface:finalize() always calls HwuiContext:destroy() this
can be fixed by simply getting rid of HwuiContext's finalizer

Change-Id: I7c912214417ab32891b1c58d045c9721e5f01965
(cherry picked from commit c298f9c9170b9e8721cfb616f784ec22734f22f4)
 2014-11-07 21:33:40 +00:00
Jason Monk
e2038151c2 am 872d4e00: Merge "Prepare for testing the NetworkControllerImpl" into lmp-mr1-dev 
* commit '872d4e00ed1715d76dc8e97853a4e3e9542ca8d0':
  Prepare for testing the NetworkControllerImpl
 2014-11-07 21:29:45 +00:00
Jason Monk
872d4e00ed Merge "Prepare for testing the NetworkControllerImpl" into lmp-mr1-dev 2014-11-07 21:26:40 +00:00
Tyler Gunn
5fe5179d94 am 5c43813b: am 3f5a43b2: Merge "Conference event package performance improvement." into lmp-mr1-dev automerge: af7dfdd 
* commit '5c43813bb26c241e753f36126edfa7e6c73598a5':
  Conference event package performance improvement.
 2014-11-07 21:21:20 +00:00
John Spurlock
64b15265fa am aa1f9804: am d8367c24: Merge "QS: Long-press on usage-based tiles to hide." into lmp-mr1-dev automerge: 5cde5c6 
* commit 'aa1f9804b43a3590ed845c5606a9f4e9f977b317':
  QS: Long-press on usage-based tiles to hide.
 2014-11-07 21:21:16 +00:00
John Spurlock
bc3c32e2c2 am 41cf9241: am 1e64aa33: Merge "Reset rotation-lock-for-accessibility setting on upgrade." into lmp-mr1-dev automerge: e586ab7 
* commit '41cf924137feb7be16f93d5f2701f2af2a74fade':
  Reset rotation-lock-for-accessibility setting on upgrade.
 2014-11-07 21:21:04 +00:00
Alan Viverette
ce8c358712 Update above/below backgrounds in PopupWindow.setBackground() 
BUG: 17718714
Change-Id: I936dfede60bc006a59cd3eb1b18548c7702ae0ee
 2014-11-07 13:19:38 -08:00
Tyler Gunn
5c43813bb2 am 3f5a43b2: Merge "Conference event package performance improvement." into lmp-mr1-dev automerge: af7dfdd 
* commit '3f5a43b2d3e7b233cda4d6d15cf014689862cf21':
  Conference event package performance improvement.
 2014-11-07 21:14:25 +00:00
John Spurlock
aa1f9804b4 am d8367c24: Merge "QS: Long-press on usage-based tiles to hide." into lmp-mr1-dev automerge: 5cde5c6 
* commit 'd8367c24f76f0464701228fafe630f8abfbc91da':
  QS: Long-press on usage-based tiles to hide.
 2014-11-07 21:14:19 +00:00
John Spurlock
41cf924137 am 1e64aa33: Merge "Reset rotation-lock-for-accessibility setting on upgrade." into lmp-mr1-dev automerge: e586ab7 
* commit '1e64aa3382f6d25a6ac2231f861c25ecca328285':
  Reset rotation-lock-for-accessibility setting on upgrade.
 2014-11-07 21:14:13 +00:00
Tyler Gunn
3f5a43b2d3 Merge "Conference event package performance improvement." into lmp-mr1-dev 
automerge: af7dfdd

* commit 'af7dfddaade234bdad889eee4fcba7ba181031cb':
  Conference event package performance improvement.
 2014-11-07 20:57:36 +00:00
John Spurlock
d8367c24f7 Merge "QS: Long-press on usage-based tiles to hide." into lmp-mr1-dev 
automerge: 5cde5c6

* commit '5cde5c616a39b060730f9b995c19642695222975':
  QS: Long-press on usage-based tiles to hide.
 2014-11-07 20:56:35 +00:00
John Spurlock
1e64aa3382 Merge "Reset rotation-lock-for-accessibility setting on upgrade." into lmp-mr1-dev 
automerge: e586ab7

* commit 'e586ab79670b6fabfa80f1f29ecb184f97f06f72':
  Reset rotation-lock-for-accessibility setting on upgrade.
 2014-11-07 20:55:24 +00:00
Tyler Gunn
af7dfddaad Merge "Conference event package performance improvement." into lmp-mr1-dev 2014-11-07 20:42:23 +00:00
John Reck
130a3a081f Fix DisplayListRenderer breakage 
Change-Id: I30babebd2b50efe6830be466209341057601544f
 2014-11-07 12:42:10 -08:00
John Spurlock
5cde5c616a Merge "QS: Long-press on usage-based tiles to hide." into lmp-mr1-dev 2014-11-07 20:31:12 +00:00
John Spurlock
c247b8f727 QS: Long-press on usage-based tiles to hide. 
Bug: 18284167
Change-Id: Ia03ea34af5733b801be6a14645c76754b73c6165
 2014-11-07 15:30:04 -05:00
John Spurlock
e586ab7967 Merge "Reset rotation-lock-for-accessibility setting on upgrade." into lmp-mr1-dev 2014-11-07 20:26:35 +00:00
John Spurlock
8c51d0b711 Reset rotation-lock-for-accessibility setting on upgrade. 
Since it now hides the display setting, force the user to opt-in
again.

Bug: 18104538
Change-Id: I4cac947f7a35ba0f578d059542401dcc5d169307
 2014-11-07 15:14:21 -05:00
Jason Monk
e0cdb6079e Prepare for testing the NetworkControllerImpl 
This will allow us to add some test cases to verify that under
certain phone/signal conditions we get out the icons we expect.
This will let us break less things when refactoring for MSIM.

Bug: 18222975
Change-Id: I7bd3e66e7de6b30fede72e40fb6aa37dd523336c
 2014-11-07 20:08:47 +00:00
Sanket Padawe
da30cd5434 am d0062dea: am d227b4aa: Merge "API changes to add carrier name to subinforecord" into lmp-mr1-dev 
automerge: 0872f2e

* commit '0872f2ee34000dcbafff8d3c0b8e93b23ac4d076':
  API changes to add carrier name to subinforecord
 2014-11-07 20:06:45 +00:00
Sanket Padawe
0872f2ee34 am d0062dea: am d227b4aa: Merge "API changes to add carrier name to subinforecord" into lmp-mr1-dev 
* commit 'd0062deacc3edcab2aa0b9da94d6605f2080ef66':
  API changes to add carrier name to subinforecord
 2014-11-07 20:03:49 +00:00
Dan Stoza
ceb5bdf42a am 1437146a: am bb8a87f4: am d17793ea: Merge "Add a BufferItem parameter to onFrameAvailable" into lmp-mr1-dev 
* commit '1437146a3e63cd932a29116f032847d4585cb4cd':
  Add a BufferItem parameter to onFrameAvailable
 2014-11-07 20:03:49 +00:00
Dan Stoza
1437146a3e am bb8a87f4: am d17793ea: Merge "Add a BufferItem parameter to onFrameAvailable" into lmp-mr1-dev 
* commit 'bb8a87f48a9978d8faec11819d5fabbbc97cac47':
  Add a BufferItem parameter to onFrameAvailable
 2014-11-07 19:58:51 +00:00
Sanket Padawe
d0062deacc am d227b4aa: Merge "API changes to add carrier name to subinforecord" into lmp-mr1-dev 
* commit 'd227b4aa91b5db20d448d76a2c6f0d4d37f97363':
  API changes to add carrier name to subinforecord
 2014-11-07 19:58:10 +00:00
Dan Stoza
bb8a87f48a am d17793ea: Merge "Add a BufferItem parameter to onFrameAvailable" into lmp-mr1-dev 
* commit 'd17793ea2a93af6ba9bc64c77502f48aa32814e4':
  Add a BufferItem parameter to onFrameAvailable
 2014-11-07 19:48:50 +00:00
Sanket Padawe
d227b4aa91 Merge "API changes to add carrier name to subinforecord" into lmp-mr1-dev 2014-11-07 19:47:49 +00:00
Jason Monk
5ddcaf5cde am 003f248a: am dbda9d1c: am f9cf698f: Merge "Fix Build" into lmp-mr1-dev 
* commit '003f248a70e3635cb67453578366957c0a1e69dc':
  Fix Build
 2014-11-07 19:45:52 +00:00
John Reck
28b73f7743 am 692135ef: am 76adcd6e: am ea4e76f6: Merge "Fix finalizer ordering/double-free issue" into lmp-mr1-dev 
* commit '692135effb19df4da42ab8070ebdb29479bd9df0':
  Fix finalizer ordering/double-free issue
 2014-11-07 19:45:45 +00:00
Dan Stoza
d17793ea2a Merge "Add a BufferItem parameter to onFrameAvailable" into lmp-mr1-dev 2014-11-07 19:44:34 +00:00
Jason Monk
003f248a70 am dbda9d1c: am f9cf698f: Merge "Fix Build" into lmp-mr1-dev 
* commit 'dbda9d1c1b10dd7d695b1056a90aa1568cb0a0c5':
  Fix Build
 2014-11-07 19:41:14 +00:00
John Reck
692135effb am 76adcd6e: am ea4e76f6: Merge "Fix finalizer ordering/double-free issue" into lmp-mr1-dev 
* commit '76adcd6ec551637f57f2630a60f6cdb2bbbf908b':
  Fix finalizer ordering/double-free issue
 2014-11-07 19:41:08 +00:00
Sanket Padawe
e1013f964d API changes to add carrier name to subinforecord 
API changes required to add carrier name of sim as a member of subinforecord.

Change-Id: I08a7f53dc012967005f7b5abd1fbc08f2947da67
 2014-11-07 11:37:29 -08:00