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

6283 Commits

Author SHA1 Message Date
Andreas Gampe
1d03b816fe Merge "Frameworks/base: Wall Werror in libs/hwui" 2014-11-11 02:37:46 +00:00
Andreas Gampe
1e19674107 Frameworks/base: Wall Werror in libs/hwui 
Turn on -Wall -Werror in libs/hwui. Fix errors.

Change-Id: I74962d08c889712dacbd0d86d6760fc10802b6bd
 2014-11-10 15:58:04 -08:00
Andreas Gampe
6b83b76dd1 Frameworks/base: Wall Werror in libs/input 
Enable -Wall -Werror in libs/input. Mask warnings from Skia.

Change-Id: I0deeffde07fcf3a09eadec2852e9bf5666b55ee8
 2014-11-10 15:55:11 -08:00
Elliott Hughes
32291900ec am 984d81c3: am c34e6359: Merge "bionic\'s struct stat is now POSIX-compliant." 
* commit '984d81c3937d46240fb9645ffa37c5166284a983':
  bionic's struct stat is now POSIX-compliant.
 2014-11-10 22:18:10 +00:00
Elliott Hughes
984d81c393 am c34e6359: Merge "bionic\'s struct stat is now POSIX-compliant." 
* commit 'c34e63598e318c9aa0debde09730a26c64bc1203':
  bionic's struct stat is now POSIX-compliant.
 2014-11-10 22:10:21 +00:00
Elliott Hughes
4da9dc5a62 bionic's struct stat is now POSIX-compliant. 
One less hack needed...

Bug: 18298106
Change-Id: I1e9e5ebf329bd6cbaf3445201f182793ee4871ce
 2014-11-10 10:48:25 -08:00
Andreas Gampe
c6dcf1fd67 am 5bbb52e8: am 189bf056: Merge "Frameworks/base: Fix more warnings" 
* commit '5bbb52e8a4242efeea27921ac3e38cf6f9c56162':
  Frameworks/base: Fix more warnings
 2014-11-09 00:52:52 +00:00
Andreas Gampe
5bbb52e8a4 am 189bf056: Merge "Frameworks/base: Fix more warnings" 
* commit '189bf05616b854f0319c7329a96e63ad374fd6c0':
  Frameworks/base: Fix more warnings
 2014-11-09 00:48:11 +00:00
Andreas Gampe
189bf05616 Merge "Frameworks/base: Fix more warnings" 2014-11-09 00:37:42 +00:00
Andreas Gampe
25df5fba3a Frameworks/base: Fix more warnings 
Exposed by switching the target to Clang, and GCC 4.9 used by
MIPS.

Change-Id: Icb79285ab2306c39c2d381e53ea2e643ee2d2947
 2014-11-07 22:24:57 -08:00
Andreas Gampe
47119ad669 am 1897a8e2: am 9ade8c1a: Merge "Frameworks/base: Wall Werror in libs/storage" 
* commit '1897a8e2fbf94169061e568683fbeda0c3bae0b6':
  Frameworks/base: Wall Werror in libs/storage
 2014-11-08 02:15:46 +00:00
Andreas Gampe
1897a8e2fb am 9ade8c1a: Merge "Frameworks/base: Wall Werror in libs/storage" 
* commit '9ade8c1ad59a40f1a2fdbe88074d05aa97a95aff':
  Frameworks/base: Wall Werror in libs/storage
 2014-11-08 02:11:03 +00:00
Andreas Gampe
9ade8c1ad5 Merge "Frameworks/base: Wall Werror in libs/storage" 2014-11-08 01:14:59 +00:00
Andreas Gampe
1c0668a3f8 am 83892ecb: Merge "resolved conflicts for merge of 487ae9b8 to lmp-mr1-dev-plus-aosp" into lmp-mr1-dev-plus-aosp 
* commit '83892ecb5c38f6e8a216e1596cd6a16bf7bd6a55':
  Frameworks/base: Wall Werror in libs/androidfw
 2014-11-07 23:17:40 +00:00
Andreas Gampe
83892ecb5c Merge "resolved conflicts for merge of 487ae9b8 to lmp-mr1-dev-plus-aosp" into lmp-mr1-dev-plus-aosp 2014-11-07 23:15:30 +00:00
Andreas Gampe
dc9c109af8 resolved conflicts for merge of 487ae9b8 to lmp-mr1-dev-plus-aosp 
Change-Id: I395f184d885a7ef30aa113ab01fcaacc94243008
 2014-11-07 15:14:02 -08:00
John Reck
e19093cad8 am f1923c36: am 8dda03a0: am ca93f69c: Merge "Have an actual fallback if the surface is lost" into lmp-mr1-dev 
* commit 'f1923c368c5c08a477b9f94dea6a499798d91d4f':
  Have an actual fallback if the surface is lost
 2014-11-07 23:01:00 +00:00
John Reck
f1923c368c am 8dda03a0: am ca93f69c: Merge "Have an actual fallback if the surface is lost" into lmp-mr1-dev 
* commit '8dda03a08603f45b3c2c90633491ce2c1fea266b':
  Have an actual fallback if the surface is lost
 2014-11-07 22:55:32 +00:00
John Reck
ca93f69c96 Merge "Have an actual fallback if the surface is lost" into lmp-mr1-dev 2014-11-07 22:41:03 +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
130a3a081f Fix DisplayListRenderer breakage 
Change-Id: I30babebd2b50efe6830be466209341057601544f
 2014-11-07 12:42:10 -08:00
John Reck
65f2defdfc resolve merge conflicts of cabf8a7 to master. 
Change-Id: If0ca1c37d05f5dc471d88a3bf158dd68a1880bbf
 2014-11-07 11:29:08 -08:00
John Reck
aa95a88327 Have an actual fallback if the surface is lost 
Bug: 17516789

This will force a relayout/reinitialize pass if the Surface
is lost mid-render instead of crashing on the next frame

Change-Id: If08bfa16f740728fa7c05904fa11e26f07b81e2e
 2014-11-07 11:02:07 -08:00
John Reck
cabf8a7064 am f7d3ce6a: am 4b19b7aa: Merge "Fix wrong-thread issue" into lmp-mr1-dev 
* commit 'f7d3ce6a3ca88b23a227e29a5fa3285e24f7b2b1':
  Fix wrong-thread issue
 2014-11-07 18:48:43 +00:00
John Reck
4b19b7aaff Merge "Fix wrong-thread issue" into lmp-mr1-dev 2014-11-07 18:34:55 +00:00
John Reck
12f5e34332 Fix wrong-thread issue 
Bug: 18259560

Change-Id: Ic63a86efba9c86f21defac0695a73db8b09ae284
 2014-11-07 10:31:53 -08:00
Mårten Kongstad
cb7b63d928 RRO: prevent duplicate system overlays 
System overlays, ie overlays with targetPackage="android", were loaded
twice, which caused all sorts of issues. Ensure they are only loaded
once, which will be during Zygote initialization.

Bug: 17765434
Change-Id: Ia5064045c77f713c58fb78adc3942f6af1abdc93
 2014-11-07 16:08:22 +01:00
Mårten Kongstad
96198ebae8 RRO idmap: pad with 0xffffffff, not 0x00000000 
In the new idmap format (version 0x1), 0x00000000 no longer represents a
non-existing entry: 0xffffffff should be used instead.

Bug: 17765434
Change-Id: If2c7e09feba2224eeafe88fd9230e6392d81b9a7
 2014-11-07 16:08:04 +01:00
Mårten Kongstad
30113131fb RRO: reintroduce lost ResTable insert of assets 
With the recent introduction of AssetManager::appendPathToResTable,
overlay packages were not properly added to the AssetManager, and once
added, were not properly inserted into the ResTable.

Bug: 17765434
Change-Id: Ie21f227c654c98730f74a687d0e16ee2b80e747e
 2014-11-07 16:07:42 +01:00
ztenghui
94745ccb33 am 86f289fb: am 0b70c09c: am 7ae6fc81: Merge "A better looking and faster spot shadow." into lmp-mr1-dev 
* commit '86f289fb505a8fef9e5aae822631a738540c31df':
  A better looking and faster spot shadow.
 2014-11-07 04:09:18 +00:00
ztenghui
86f289fb50 am 0b70c09c: am 7ae6fc81: Merge "A better looking and faster spot shadow." into lmp-mr1-dev 
* commit '0b70c09c1df3a5c359b8a93a8ac08e945805b693':
  A better looking and faster spot shadow.
 2014-11-07 00:17:09 +00:00
ztenghui
7ae6fc81ef Merge "A better looking and faster spot shadow." into lmp-mr1-dev 2014-11-06 23:59:17 +00:00
ztenghui
d2dcd6fded A better looking and faster spot shadow. 
1. This improve the looking, the star shape (spike) on long action bar is gone.
Shadow is more smooth now.

2. The performance is better, too. For averaging around rect, round rect and
circle, the spot shadow itself is 3 times faster. On N7 v1, it could be less than
0.1 ms.

b/14976551
b/16712006

Change-Id: I61ed546ee56e7c8dbe504dfcaef12d084904b4b8
 2014-11-06 15:09:46 -08:00
John Reck
088c514cb1 resolved conflicts for merge of be70c771 to master 
Change-Id: I469905bef7361c18aab725778694567d1987c06d
 2014-11-06 13:04:49 -08:00
John Reck
be70c7713d am 327cb318: Merge "Yank ResourceCache out of Caches" into lmp-mr1-dev automerge: 9c13b8c 
* commit '327cb3184d5f5d9f22db9ab18a07bb71081bb446':
  Yank ResourceCache out of Caches
 2014-11-06 19:22:28 +00:00
John Reck
a35778c799 Yank ResourceCache out of Caches 
Bug: 17947547

Pull the ResourceCache (aka, ref-counting side channel) out of
Caches so that DisplayListRenderer doesn't use Caches, avoiding
the risk of instantiating Caches on the wrong thread or
without a GL context

Change-Id: I7d63b70b3b0a0163308c5dedd6ef255eadebe8fd
 2014-11-06 09:45:10 -08:00
Rob Tsuk
dfd0099ce5 am fce461ea: am db6a1358: am 6c96cbf5: Merge "Log shader source when it fails to compile" into lmp-mr1-dev 
* commit 'fce461eada9f0f03cd30e3a5fcb60072d589049a':
  Log shader source when it fails to compile
 2014-11-05 22:35:46 +00:00
Rob Tsuk
fce461eada am db6a1358: am 6c96cbf5: Merge "Log shader source when it fails to compile" into lmp-mr1-dev 
* commit 'db6a1358d45430a952aa746f8dfd452d12d7e4be':
  Log shader source when it fails to compile
 2014-11-05 22:31:05 +00:00
Rob Tsuk
6c96cbf581 Merge "Log shader source when it fails to compile" into lmp-mr1-dev 2014-11-05 22:22:52 +00:00
Dan Albert
7192db8bb5 Merge "Add a missing visibility modifier to fix build." 2014-11-05 21:42:37 +00:00
Rob Tsuk
fd15f47554 Log shader source when it fails to compile 
So that there will be something to diagnose when such failures occur during
stability tests.

Bug: 18092655
Change-Id: I9a9d8d33b34273a477f2a9dbcf092887dcbc91c0
 2014-11-05 13:26:19 -08:00
Adam Lesinski
1adf320606 am 8491c4ea: Merge "Merge commit \'fb96e54\' into manualmerge" into lmp-mr1-dev-plus-aosp 
* commit '8491c4ead7dba5cfd406cf99a511fc1dce07cc4d':
  Add error checking to aapt for split generation
 2014-11-05 20:35:27 +00:00
Adam Lesinski
685d363d7a Merge commit 'fb96e54' into manualmerge 
Conflicts:
	tools/aapt/Resource.cpp

Change-Id: I4147c3550e9426f3429146eaeb16f10ba76b5b15
 2014-11-05 12:30:25 -08:00
Adam Lesinski
69ecfa9034 Merge "Add error checking to aapt for split generation" into lmp-mr1-dev 2014-11-05 19:15:57 +00:00
Dan Albert
f59b8f0d7c Add a missing visibility modifier to fix build. 
This class is used by the tests, but is built with -fvisibility=hidden
and not declared as ANDROID_API.

Change-Id: If93af7bfdf0752de1f5bbb10fdd46b2eb9c0ccdd
 2014-11-05 09:41:31 -08:00
Adam Lesinski
a7d1d73a47 Implement back-tracking when searching for attributes in XML or resource bag 
Shared libraries have their package ID assigned at run-time, so some
of the guarantees we used to have about sort order of attributes in
bags or XML elements no longer hold.

This CL adds back-tracking and can jump to the nearest attribute with the
same package ID and continue searching.

This means that attributes with the same package ID must be sorted by increasing
resource ID, as was the case before.

Attributes with the same package ID must be grouped together, but the groups can
be in any order. Ex: 0x02010001, 0x02010002, 0x01010000, 0x01010010, 0x7f010032

Bug:17666947
Change-Id: I9c198bbb6ca788849aac85b6323606ea5d9550d6
 2014-11-04 16:34:34 -08:00
Tom Hudson
984162fb7e Replace StatefulBaseRenderer inheritance with CanvasState member 
Incrementally disentangles DisplayListRenderer and OpenGLRenderer.
Introduces abstract CanvasStateClient class to share three functions
between the two.

Design doc at https://docs.google.com/a/google.com/document/d/1PY1JF7AfPEF2UOUAnETS5j_4_tnJShTAMExvpCJfP8o/edit?usp=sharing.

BUG:15672762
R=djsollen@google.com,ccraik@google.com,jreck@google.com

Change-Id: Ic9fdffe18808e7d921ad06d01ea1ca25b2ad6f23
 2014-11-04 17:16:36 -05:00
Tom Hudson
107843de45 Remove status return from all uirenderer::Renderer functions 
This moves the interface closer to android::Canvas. The only use of
return values was in the OpenGLRenderer subclass; that is replaced
with an internal dirty flag: returned from finish(), checked by
CanvasContext.

This is part of a series of CLs to refactor the Graphics JNI bindings.

BUG:15672762
R=djsollen@google.com,ccraik@google.com

Change-Id: Ifd533eb8839a254b0d3a5d04fc5a2905afdfc89e
 2014-11-04 15:49:44 -05:00
Rob Tsuk
0d00b27ecf am 6bd8d825: am c4aea977: am e6c0bda5: Merge "Make points drawn with default paint visible" into lmp-mr1-dev 
* commit '6bd8d825b29fa4db3046644f36c2256a5d0600e0':
  Make points drawn with default paint visible
 2014-11-04 15:32:41 +00:00
Rob Tsuk
6bd8d825b2 am c4aea977: am e6c0bda5: Merge "Make points drawn with default paint visible" into lmp-mr1-dev 
* commit 'c4aea977cd35c423132382cf0ae1f3238e2c7d10':
  Make points drawn with default paint visible
 2014-11-04 15:29:10 +00:00