101103 Commits

Author SHA1 Message Date
Chris Craik
0a74ec1863 am d041e476: Merge "Correct sub-hairline tessellation threshold" into jb-mr2-dev
* commit 'd041e476f3c959f5b373b64a329aa427d057375e':
  Correct sub-hairline tessellation threshold
2013-02-28 22:16:36 +00:00
Chris Craik
943e1cd34c am d80806b3: Merge "Fix T-junctions in layers\' generated meshes" into jb-mr2-dev
* commit 'd80806b305ce337283c24f14522cc58fea090b8c':
  Fix T-junctions in layers' generated meshes
2013-02-28 22:16:30 +00:00
Jim Miller
6486588e40 Merge "Fix dependency between keyguard/dexopt/AccessibilityManagerService." 2013-02-28 22:09:41 +00:00
Jim Miller
195b551761 Fix dependency between keyguard/dexopt/AccessibilityManagerService.
This fixes a bug on userdebug builds where dexopt hadn't completed
before the service is needed.  The resulting crash prevented dexopt
from completing, resulting in a reboot loop and perpetual issue starting
the service.

The solution is to hold off on creating keyguard until the system is ready.

It also moves the creation of the AccessibilityManagerService singleton back
into the system process.

Fixes bug 8287106

Change-Id: I96e15c084d38c255fd8f6bca6f21a0785b82ec74
2013-02-28 13:40:49 -08:00
Craig Mautner
c458b7f8d3 Merge "Convert mHistory to mTaskHistory (5)" 2013-02-28 20:20:26 +00:00
Jim Miller
105beddcb9 Fix bad merge in KeyguardHostView
This restores the fix detailed in Change-Id: I866d4b42493df3a6449d8eabc3ea140dc39dac57

Change-Id: Ibe75afd7a612cf96a56e5815a198c2047c7ff5bd
2013-02-27 21:35:18 -08:00
Jim Miller
1430193df4 Merge "Add permission check to AccountManagerService to allow keyguard access." 2013-02-28 03:35:05 +00:00
Jim Miller
6a31d15efb Merge changes I254d6fc6,I360e9ac7
* changes:
  Move keyguard to its own process.
  Move keyguard source and resources into new package
2013-02-28 03:30:45 +00:00
Jim Miller
464f530978 Add permission check to AccountManagerService to allow keyguard access.
When keyguard gets moved to its own process, it will need to access
specific user accounts in order to enable features such as the "forgot pattern"
button.  This adds an additional check to allow apps with the
INTERACT_ACROSS_USERS_FULL permission to work.

Change-Id: Id3107bc212ae3005870db781c32ae4405c068ad9
2013-02-27 18:33:25 -08:00
Jim Miller
5ecd81154f Move keyguard to its own process.
This is in preparation to moving keyguard into its own process.

Moved keyguard source and resources into new .apk.

Got basic test app working.  Still need to implement MockPatternUtils
and means to pass it into KeyguardService with local binder interface.

Added new ACCESS_KEYGUARD_SECURE_STORAGE permission.

Temporarily disabled USER_PRESENT broadcast.

Remove unintentional whitespace changes in PhoneWindowManager, etc.

Checkpoint basic working version.

Move to systemui process.

Synchronize with TOT.

Sync with recent user API changes.

Fix bug with returing interface instead of stub for IKeyguardResult.  Create KeyguardServiceDelegate to allow
for runtime-selectable local or remote interface.

More keyguard crash robustness.

Keyguard crash recovery working.  Currently fails safe (locked).

Fix selector view which was still using frameworks resources.

Remove more references to internal framework variables.  Use aliases for those we should move but
currently have dependencies.

Allow runtime switching between service and local mode.

Fix layout issue on tablets where orientation was reading the incorrect constant
from the framework.  Remove more framework dependencies.

Fix PIN keyboard input.

Remove unnecessary copy of orientation attrs.

Remove unused user selector widget and attempt to get multi user working again.

Fix multi-user avatar icon by grabbing it from UserManager rather than directly since
keyguard can no longer read it.

Merge with AppWidget userId changes in master.

Change-Id: I254d6fc6423ae40f6d7fef50aead4caa701e5ad2
2013-02-27 17:27:53 -08:00
Jim Miller
25a272a9f6 Move keyguard source and resources into new package
This is part 1 of two commits.  This commit moves all keyguard
source and resources to a new com.android.keyguard package.
The second part of this change applies an overlay that makes
it work.

Change-Id: I360e9ac7783c6cb289c992733818b9535df185b9
2013-02-27 17:26:43 -08:00
Marco Nelissen
e84da7fa9e Merge "When scanning a single file, take .nomedia into account" 2013-02-28 00:36:05 +00:00
Marco Nelissen
14528fd007 When scanning a single file, take .nomedia into account
Make scanSingleFile behave the same way as scanMtpFile, by taking into
account whether there's a .nomedia file guarding the file being scanned.
Without this, downloaded (or otherwise explicitly scanned) images/video/music
will appear in Gallery and Music even if a .nomedia file is hiding them.

Change-Id: Ib9ad4bda1b9a942f79a37ccd8e6a54d57710f528
2013-02-27 16:16:11 -08:00
Chris Craik
d041e476f3 Merge "Correct sub-hairline tessellation threshold" into jb-mr2-dev 2013-02-27 23:49:37 +00:00
Chris Craik
d80806b305 Merge "Fix T-junctions in layers' generated meshes" into jb-mr2-dev 2013-02-27 23:47:55 +00:00
Chris Craik
19a390bff3 Correct sub-hairline tessellation threshold
Change-Id: Id868d41a36db5b4daa762d84b6329f9c31916bce
2013-02-27 15:43:26 -08:00
Dirk Dougherty
cae227cc7b am 122f4051: am 99fd8c21: am 74d4638e: am a44583c1: am 8e4e5549: am d9019dd2: Doc change: Mention ratings in app stats intro, mention proguard in pub checklist, align terminology wrt native platform filtering.
* commit '122f4051b5c4d61044ba377b4b5fa10133ab7b37':
  Doc change: Mention ratings in app stats intro, mention proguard in pub checklist, align terminology wrt native platform filtering.
2013-02-27 23:23:39 +00:00
Romain Guy
25d1a1275b am a6456d0d: Merge "Draw text drop shadows even when the text color is transparent" into jb-mr2-dev
* commit 'a6456d0d7ea2a65474b8a3db5dbf001880c40a71':
  Draw text drop shadows even when the text color is transparent
2013-02-27 23:23:34 +00:00
Romain Guy
59ca3cc0b1 am 13e3891b: Merge "Don\'t increment the paint\'s generation ID when drawing bitmaps" into jb-mr2-dev
* commit '13e3891b20133d131ba61fa86bcd8b6ee1e50199':
  Don't increment the paint's generation ID when drawing bitmaps
2013-02-27 23:23:30 +00:00
Dianne Hackborn
3ad6c2703f am c7288579: am 7f3a53a4: am 7b69e401: Merge "Fix starting window memory leak"
* commit 'c7288579c788c9c8863ec63561282a3e11006b65':
  Fix starting window memory leak
2013-02-27 23:23:11 +00:00
Ian Rogers
47788d148e am 7e112d51: am 14d0ab55: am de3c20bc: Merge "Track stack memory in MemoryInfo."
* commit '7e112d51c4d203e4e3b2b875dc7c8457e1d9e056':
  Track stack memory in MemoryInfo.
2013-02-27 23:23:08 +00:00
Victoria Lease
478fab641f am 7ff28ad2: (-s ours) Merge "round subpixels up to next integer in measureText DO NOT MERGE" into jb-mr2-dev
* commit '7ff28ad2d1b049d90591aea24656b586ee867e83':
  round subpixels up to next integer in measureText DO NOT MERGE
2013-02-27 23:23:05 +00:00
Irfan Sheriff
b283293b02 am 408f4edb: Merge "Fix concurrency issues" into jb-mr2-dev
* commit '408f4edb5e833419deab3849b219c35d3d6d8aba':
  Fix concurrency issues
2013-02-27 23:23:02 +00:00
Scott Main
fb3819e914 am 35cd94ab: am 4539955e: am 8f03a47e: am 464deaba: am 3383c015: am 9d167eaa: docs: another string change for developer console bug: 8033647
* commit '35cd94ab97ac95401bafef8237d74e91d81ef08d':
  docs: another string change for developer console bug: 8033647
2013-02-27 23:22:53 +00:00
Ian Rogers
0664d95090 am 0493d799: am 75dcb333: am 545464df: Merge "Deprecate and document memory allocation counting."
* commit '0493d7997e22376524d707e407662d0f98f40c47':
  Deprecate and document memory allocation counting.
2013-02-27 23:22:44 +00:00
Ben Murdoch
9b4f09348e am 0e2f22a4: Merge "Update WebView#PictureListener for JBMR2." into jb-mr2-dev
* commit '0e2f22a42bc91db814591164b8a2cfc3d5a5cdbc':
  Update WebView#PictureListener for JBMR2.
2013-02-27 23:22:31 +00:00
Romain Guy
6a7cac6af9 am d9731a57: am bf53be46: am 09353f74: Merge "Check and fail early if requested wallpaper size exceeds maximum texture size."
* commit 'd9731a57c631a5218819dbb02755c4dd41e7cc44':
  Check and fail early if requested wallpaper size exceeds maximum texture size.
2013-02-27 23:22:28 +00:00
Svetoslav
b9dec1c3a7 am a60fdfac: NPE in AccessibilityManagerService.
* commit 'a60fdfac9432972e520e8c53b3b0717b4c3a2973':
  NPE in AccessibilityManagerService.
2013-02-27 23:22:22 +00:00
Dianne Hackborn
bf2798b387 am 9ad66541: Merge "New ContentProvider initialization for testing." into jb-mr2-dev
* commit '9ad665417713398524d425f63b0d6fa751244237':
  New ContentProvider initialization for testing.
2013-02-27 23:22:12 +00:00
Dmitry Shmidt
aded7f6486 am be1a8cda: wifi: Fix scan results merge
* commit 'be1a8cda3e8113d1fd3a6e56d8bc6c4f2d350423':
  wifi: Fix scan results merge
2013-02-27 23:22:10 +00:00
Dirk Dougherty
122f4051b5 am 99fd8c21: am 74d4638e: am a44583c1: am 8e4e5549: am d9019dd2: Doc change: Mention ratings in app stats intro, mention proguard in pub checklist, align terminology wrt native platform filtering.
* commit '99fd8c21caae6f01c9a14541505832d66c1dff89':
  Doc change: Mention ratings in app stats intro, mention proguard in pub checklist, align terminology wrt native platform filtering.
2013-02-27 22:51:12 +00:00
Dirk Dougherty
99fd8c21ca am 74d4638e: am a44583c1: am 8e4e5549: am d9019dd2: Doc change: Mention ratings in app stats intro, mention proguard in pub checklist, align terminology wrt native platform filtering.
* commit '74d4638e2821e21885528d79d5b39c0ac08d3740':
  Doc change: Mention ratings in app stats intro, mention proguard in pub checklist, align terminology wrt native platform filtering.
2013-02-27 14:49:52 -08:00
Dirk Dougherty
74d4638e28 am a44583c1: am 8e4e5549: am d9019dd2: Doc change: Mention ratings in app stats intro, mention proguard in pub checklist, align terminology wrt native platform filtering.
* commit 'a44583c12e81ff676e8e7f57791da6021ddf8ef5':
  Doc change: Mention ratings in app stats intro, mention proguard in pub checklist, align terminology wrt native platform filtering.
2013-02-27 14:47:12 -08:00
Dirk Dougherty
a44583c12e am 8e4e5549: am d9019dd2: Doc change: Mention ratings in app stats intro, mention proguard in pub checklist, align terminology wrt native platform filtering.
* commit '8e4e5549371dc4c373c67ea84cb21ce9cdf7502e':
  Doc change: Mention ratings in app stats intro, mention proguard in pub checklist, align terminology wrt native platform filtering.
2013-02-27 14:45:04 -08:00
Dirk Dougherty
8e4e554937 am d9019dd2: Doc change: Mention ratings in app stats intro, mention proguard in pub checklist, align terminology wrt native platform filtering.
* commit 'd9019dd275f9a0a8be4ac8ae383e2878f78b5445':
  Doc change: Mention ratings in app stats intro, mention proguard in pub checklist, align terminology wrt native platform filtering.
2013-02-27 14:43:01 -08:00
Dirk Dougherty
d9019dd275 Doc change: Mention ratings in app stats intro, mention proguard in pub checklist, align terminology wrt native platform filtering.
Change-Id: I9bba5b8ffb7da40083904f6f471e99fd4c98d63d
Bug: 8033688
Bug: 8277558
2013-02-27 14:34:24 -08:00
Romain Guy
a6456d0d7e Merge "Draw text drop shadows even when the text color is transparent" into jb-mr2-dev 2013-02-27 22:16:22 +00:00
Romain Guy
13e3891b20 Merge "Don't increment the paint's generation ID when drawing bitmaps" into jb-mr2-dev 2013-02-27 22:08:32 +00:00
Chris Craik
6c5b9be745 Fix T-junctions in layers' generated meshes
bug:4128442

Currently we fix T-junctions for hardware layers, and for
Canvas.saveLayer if the transform isn't rectAsRect. Ideally, hardware
layers should lazily re-generate T-junction free geometry if the
transform becomes non-rectAsRect

Depends on frameworks/native change:
https://googleplex-android-review.googlesource.com/#/c/277668/
which adds Region::createTJunctionFreeRegion()

Change-Id: Ice75b4a1a4459ff835059ea81d70f7d1563fd96d
2013-02-27 14:03:19 -08:00
Romain Guy
768bffc9b8 Draw text drop shadows even when the text color is transparent
This matches Skia's behavior.

Change-Id: Ibf0a52611f5801cfa68169f66ab0ec06f256600f
2013-02-27 13:52:26 -08:00
Dianne Hackborn
c7288579c7 am 7f3a53a4: am 7b69e401: Merge "Fix starting window memory leak"
* commit '7f3a53a447d40db36f8f0c2b4c8c7305c5dd4429':
  Fix starting window memory leak
2013-02-27 20:09:27 +00:00
Ian Rogers
7e112d51c4 am 14d0ab55: am de3c20bc: Merge "Track stack memory in MemoryInfo."
* commit '14d0ab55e983d314128bb7b3293023f4a237d991':
  Track stack memory in MemoryInfo.
2013-02-27 20:09:25 +00:00
Dianne Hackborn
7f3a53a447 am 7b69e401: Merge "Fix starting window memory leak"
* commit '7b69e401769fb7a864990f3d732c6a7e8d7ec2f8':
  Fix starting window memory leak
2013-02-27 12:07:01 -08:00
Ian Rogers
14d0ab55e9 am de3c20bc: Merge "Track stack memory in MemoryInfo."
* commit 'de3c20bcb546e50980a642b72c1e8353e5bd2cdc':
  Track stack memory in MemoryInfo.
2013-02-27 12:06:58 -08:00
Dianne Hackborn
7b69e40176 Merge "Fix starting window memory leak" 2013-02-27 19:57:08 +00:00
Romain Guy
758724fd09 Don't increment the paint's generation ID when drawing bitmaps
When the renderer draws a bitmap as part of a display list with an
alpha < 1.0f, the paint is temporarily modified to alter the opacity
of the bitmap. This has the side effect of increasing the paint's
generation ID counter which can break paint caching.

Change-Id: I5055d059ad1639829fa50af3d946e296c4dab877
2013-02-27 11:53:12 -08:00
Ian Rogers
de3c20bcb5 Merge "Track stack memory in MemoryInfo." 2013-02-27 19:47:15 +00:00
Victoria Lease
7ff28ad2d1 Merge "round subpixels up to next integer in measureText DO NOT MERGE" into jb-mr2-dev 2013-02-27 19:39:14 +00:00
Victoria Lease
8e04840f38 round subpixels up to next integer in measureText DO NOT MERGE
A common source of layout bugs we're seeing these days involves the
output of measureText() being fed into StaticLayout's constructor.
measureText() returns subpixel-accurate values, but StaticLayout only
takes integral bounds, resulting in the subpixel portion of the
bounds being truncated. This leaves StaticLayout with insufficient
space to layout the text that was just measured, causing all manner
of unexpected line breaks.

This could be causing issues elsewhere, as well. Until our text
pipeline is fully subpixel-perfect, it's best that measureText
guarantee that the value it returns will be sufficient to contain
the text, even if cast to int.

Cherry-pick of Ib84947f0d0a1229287f5b19b99e7efd40f5317f7

Bug: 8164205
Change-Id: I69795ba5770112c0a3d0e752158076a8d1646b1a
2013-02-27 11:38:05 -08:00
Ian Rogers
7c9f30bfb3 Track stack memory in MemoryInfo.
In /proc/pid/maps the main stack is identified as "[stack]". In Linux 3.4
thread stacks are identified as "[stack:<tid>]" where <tid> is the thread ID of
the thread using that stack. Add support in MemInfo's otherStats to track
memory being used by the stack.

Add sanity check on the length of the otherStats array.
Add detail messages to two null pointer exceptions.

Bug: 8265251

Change-Id: I2b228b147da9bdc5c7a4d825dfc628fcc7923927
2013-02-27 11:34:42 -08:00