OSDN Git Service

android-x86/frameworks-base.git
10 years agoRefactor setting an SkPaint onto a hwui Layer.
Derek Sollenberger [Tue, 11 Feb 2014 16:46:49 +0000 (11:46 -0500)]
Refactor setting an SkPaint onto a hwui Layer.

This CL removes the unecessary JNI call to set the colorFilter on
a layer.

Change-Id: I9e088f888938d4315745aa618334bfdb9e61343a

10 years agoMerge "Add concepts of related users and managed profiles to user manager."
Kenny Guy [Tue, 11 Feb 2014 19:27:35 +0000 (19:27 +0000)]
Merge "Add concepts of related users and managed profiles to user manager."

10 years agoMerge "Move inputservice over to frameworks/native"
Michael Wright [Tue, 11 Feb 2014 19:09:12 +0000 (19:09 +0000)]
Merge "Move inputservice over to frameworks/native"

10 years agoMerge "Implement missing safelyRun() on ThreadedRenderer"
John Reck [Tue, 11 Feb 2014 18:55:46 +0000 (18:55 +0000)]
Merge "Implement missing safelyRun() on ThreadedRenderer"

10 years agoMove inputservice over to frameworks/native
Michael Wright [Mon, 10 Feb 2014 23:56:36 +0000 (15:56 -0800)]
Move inputservice over to frameworks/native

Remove all of the pieces except the PointerController and SpriteController over
to frameworks/native in preparation for inputflinger. Those two need to stay in
frameworks/base for now because they depend on Skia currently. In the long run
they should be merged into either the InputManager or the WindowManager rather
than as a part of the inputservice / inputflinger.

Try 2.

Change-Id: I84259356d3eb8efc5aefb9d6b311b5fc590ea3ed

10 years agoImplement missing safelyRun() on ThreadedRenderer
John Reck [Tue, 11 Feb 2014 18:40:25 +0000 (10:40 -0800)]
Implement missing safelyRun() on ThreadedRenderer

Change-Id: I14b75f37a13fabaa759a51369190dbdc84087c4b

10 years agoMerge "camera2: Clean up cross-references"
Eino-Ville Talvala [Tue, 11 Feb 2014 17:57:08 +0000 (17:57 +0000)]
Merge "camera2: Clean up cross-references"

10 years agoMerge "Refactor HardwareLayer"
John Reck [Tue, 11 Feb 2014 17:30:53 +0000 (17:30 +0000)]
Merge "Refactor HardwareLayer"

10 years agoam 86fb9904: am 8a63c34b: am 3aeb629d: Merge "Use long to store pointers in GLES_JNI...
Narayan Kamath [Tue, 11 Feb 2014 16:40:39 +0000 (16:40 +0000)]
am 86fb9904: am 8a63c34b: am 3aeb629d: Merge "Use long to store pointers in GLES_JNI/EGL classes"

* commit '86fb9904ad5760cb957782b45e96054c01fe4200':
  Use long to store pointers in GLES_JNI/EGL classes

10 years agoam 43c9516a: am 860bba68: am 7b7726b7: Merge "Fix in MediaMuxer\'s JNI code"
Narayan Kamath [Tue, 11 Feb 2014 16:40:35 +0000 (16:40 +0000)]
am 43c9516a: am 860bba68: am 7b7726b7: Merge "Fix in MediaMuxer\'s JNI code"

* commit '43c9516a29563131e04ee797562130e2c4f9d54e':
  Fix in MediaMuxer's JNI code

10 years agoam a9d171bd: am 5c770dfb: am b823bd45: Merge "Use long to store pointers in ConsumerI...
Narayan Kamath [Tue, 11 Feb 2014 16:40:31 +0000 (16:40 +0000)]
am a9d171bd: am 5c770dfb: am b823bd45: Merge "Use long to store pointers in ConsumerIrService"

* commit 'a9d171bd5bab29feaef409489ed23d3c490285ce':
  Use long to store pointers in ConsumerIrService

10 years agoam d350af96: am b90fc64b: am f44a3f1e: Merge "Use long for pointers in EmojiFactory...
Narayan Kamath [Tue, 11 Feb 2014 16:40:27 +0000 (16:40 +0000)]
am d350af96: am b90fc64b: am f44a3f1e: Merge "Use long for pointers in EmojiFactory and PdfDocument"

* commit 'd350af9695018e81f85600fb7dd906003cbaf62e':
  Use long for pointers in EmojiFactory and PdfDocument

10 years agoam 8a63c34b: am 3aeb629d: Merge "Use long to store pointers in GLES_JNI/EGL classes"
Narayan Kamath [Tue, 11 Feb 2014 16:34:16 +0000 (16:34 +0000)]
am 8a63c34b: am 3aeb629d: Merge "Use long to store pointers in GLES_JNI/EGL classes"

* commit '8a63c34bb0f0cf25051c6eeb49c21476258fadfb':
  Use long to store pointers in GLES_JNI/EGL classes

10 years agoam 860bba68: am 7b7726b7: Merge "Fix in MediaMuxer\'s JNI code"
Narayan Kamath [Tue, 11 Feb 2014 16:34:12 +0000 (16:34 +0000)]
am 860bba68: am 7b7726b7: Merge "Fix in MediaMuxer\'s JNI code"

* commit '860bba68a1d65534ce6aec6ba8c0b0a736b18ccc':
  Fix in MediaMuxer's JNI code

10 years agoam 5c770dfb: am b823bd45: Merge "Use long to store pointers in ConsumerIrService"
Narayan Kamath [Tue, 11 Feb 2014 16:34:08 +0000 (16:34 +0000)]
am 5c770dfb: am b823bd45: Merge "Use long to store pointers in ConsumerIrService"

* commit '5c770dfba2846ee173d147fd974f8e9f073c1534':
  Use long to store pointers in ConsumerIrService

10 years agoam b90fc64b: am f44a3f1e: Merge "Use long for pointers in EmojiFactory and PdfDocument"
Narayan Kamath [Tue, 11 Feb 2014 16:34:04 +0000 (16:34 +0000)]
am b90fc64b: am f44a3f1e: Merge "Use long for pointers in EmojiFactory and PdfDocument"

* commit 'b90fc64b030ee50bda9a0dabb5247660b70d6659':
  Use long for pointers in EmojiFactory and PdfDocument

10 years agoam 3aeb629d: Merge "Use long to store pointers in GLES_JNI/EGL classes"
Narayan Kamath [Tue, 11 Feb 2014 16:30:28 +0000 (08:30 -0800)]
am 3aeb629d: Merge "Use long to store pointers in GLES_JNI/EGL classes"

* commit '3aeb629d8251699237e3d067be4fb44ba206626c':
  Use long to store pointers in GLES_JNI/EGL classes

10 years agoam 7b7726b7: Merge "Fix in MediaMuxer\'s JNI code"
Narayan Kamath [Tue, 11 Feb 2014 16:30:25 +0000 (08:30 -0800)]
am 7b7726b7: Merge "Fix in MediaMuxer\'s JNI code"

* commit '7b7726b7982063034667c6a6076cc0b390ede8ce':
  Fix in MediaMuxer's JNI code

10 years agoam b823bd45: Merge "Use long to store pointers in ConsumerIrService"
Narayan Kamath [Tue, 11 Feb 2014 16:30:20 +0000 (08:30 -0800)]
am b823bd45: Merge "Use long to store pointers in ConsumerIrService"

* commit 'b823bd45600fc339ae2e618d5fe506ace74ada4a':
  Use long to store pointers in ConsumerIrService

10 years agoam f44a3f1e: Merge "Use long for pointers in EmojiFactory and PdfDocument"
Narayan Kamath [Tue, 11 Feb 2014 16:30:06 +0000 (08:30 -0800)]
am f44a3f1e: Merge "Use long for pointers in EmojiFactory and PdfDocument"

* commit 'f44a3f1e00e38b09f70efed3eaf771871435e478':
  Use long for pointers in EmojiFactory and PdfDocument

10 years agoMerge "Use long to store pointers in GLES_JNI/EGL classes"
Narayan Kamath [Tue, 11 Feb 2014 15:39:04 +0000 (15:39 +0000)]
Merge "Use long to store pointers in GLES_JNI/EGL classes"

10 years agoAdd concepts of related users and managed profiles to user manager.
Kenny Guy [Tue, 11 Feb 2014 15:33:14 +0000 (15:33 +0000)]
Add concepts of related users and managed profiles to user manager.

Related users are a group that will share things like notifications.
Managed profiles are a profile of another user.

Change-Id: I2d0532f1abf939810f0fa3fc7c77ad13fa567833

10 years agoMerge "Fix in MediaMuxer's JNI code"
Narayan Kamath [Tue, 11 Feb 2014 14:33:38 +0000 (14:33 +0000)]
Merge "Fix in MediaMuxer's JNI code"

10 years agoMerge "Use long to store pointers in ConsumerIrService"
Narayan Kamath [Tue, 11 Feb 2014 14:29:09 +0000 (14:29 +0000)]
Merge "Use long to store pointers in ConsumerIrService"

10 years agoMerge "Use long for pointers in EmojiFactory and PdfDocument"
Narayan Kamath [Tue, 11 Feb 2014 14:07:16 +0000 (14:07 +0000)]
Merge "Use long for pointers in EmojiFactory and PdfDocument"

10 years agoam deefd1fd: am 5f7c0b1d: am 6d8b21a8: Merge "Fix TinyHashMap to use generic hash_typ...
Narayan Kamath [Tue, 11 Feb 2014 14:05:35 +0000 (14:05 +0000)]
am deefd1fd: am 5f7c0b1d: am 6d8b21a8: Merge "Fix TinyHashMap to use generic hash_type instead of hash_t"

* commit 'deefd1fdeaf0b538a13219517f8795fdde198e21':
  Fix TinyHashMap to use generic hash_type instead of hash_t

10 years agoam 5f7c0b1d: am 6d8b21a8: Merge "Fix TinyHashMap to use generic hash_type instead...
Narayan Kamath [Tue, 11 Feb 2014 13:47:50 +0000 (13:47 +0000)]
am 5f7c0b1d: am 6d8b21a8: Merge "Fix TinyHashMap to use generic hash_type instead of hash_t"

* commit '5f7c0b1d80f883fa15f88e0e4d508576a36a45de':
  Fix TinyHashMap to use generic hash_type instead of hash_t

10 years agoam 6d8b21a8: Merge "Fix TinyHashMap to use generic hash_type instead of hash_t"
Narayan Kamath [Tue, 11 Feb 2014 13:44:37 +0000 (05:44 -0800)]
am 6d8b21a8: Merge "Fix TinyHashMap to use generic hash_type instead of hash_t"

* commit '6d8b21a84c92904a966d77f3c6c0282e92c2b077':
  Fix TinyHashMap to use generic hash_type instead of hash_t

10 years agoMerge "Fix TinyHashMap to use generic hash_type instead of hash_t"
Narayan Kamath [Tue, 11 Feb 2014 13:40:37 +0000 (13:40 +0000)]
Merge "Fix TinyHashMap to use generic hash_type instead of hash_t"

10 years agoFix build.
Narayan Kamath [Tue, 11 Feb 2014 09:40:19 +0000 (09:40 +0000)]
Fix build.

com.android.server.SystemServer was no longer imported
on master.

Change-Id: Ie712aa28940953952aa7a99cbb22f74129649249

10 years agoam 25df673b: am 1b51c9cb: Merge "Make SystemService constructor take a Context."...
Jeff Brown [Tue, 11 Feb 2014 08:33:50 +0000 (08:33 +0000)]
am 25df673b: am 1b51c9cb: Merge "Make SystemService constructor take a Context." into klp-modular-dev

* commit '25df673b849de374cf1de40250dfd8a48b7ac28b':
  Make SystemService constructor take a Context.

10 years agoam 1b51c9cb: Merge "Make SystemService constructor take a Context." into klp-modular-dev
Jeff Brown [Tue, 11 Feb 2014 08:18:34 +0000 (08:18 +0000)]
am 1b51c9cb: Merge "Make SystemService constructor take a Context." into klp-modular-dev

* commit '1b51c9cb96fe2a0818289857a016521eed1ec183':
  Make SystemService constructor take a Context.

10 years agoRefactor HardwareLayer
John Reck [Thu, 6 Feb 2014 00:38:25 +0000 (16:38 -0800)]
Refactor HardwareLayer

 Defer all the things!
 Groundwork to allow hardware layers to work in a renderthread world

Change-Id: Ib3aa47525f393083621254a743dbaa6352f933bd

10 years agoMerge "Make SystemService constructor take a Context." into klp-modular-dev
Jeff Brown [Tue, 11 Feb 2014 04:12:02 +0000 (04:12 +0000)]
Merge "Make SystemService constructor take a Context." into klp-modular-dev

10 years agoMake SystemService constructor take a Context.
Jeff Brown [Tue, 11 Feb 2014 03:47:07 +0000 (19:47 -0800)]
Make SystemService constructor take a Context.

This change simplifies the process of initializing a SystemService
by folding the onCreate() step back into the constructor.  It removes
some ambuiguity about what work should happen in the constructor and
should make it possible for services to retain most of their final
fields after refactoring into the new pattern.

Change-Id: I25f41af0321bc01898658ab44b369f9c5d16800b

10 years agoam 2d6b55aa: am 312ba86b: Change task removal sequence
Craig Mautner [Tue, 11 Feb 2014 02:32:27 +0000 (02:32 +0000)]
am 2d6b55aa: am 312ba86b: Change task removal sequence

* commit '2d6b55aaa9dd03f7d934f7a192989513b1087357':
  Change task removal sequence

10 years agoam 312ba86b: Change task removal sequence
Craig Mautner [Tue, 11 Feb 2014 02:20:15 +0000 (02:20 +0000)]
am 312ba86b: Change task removal sequence

* commit '312ba86b476fa1d83864a7d465135cc9a4e94ad8':
  Change task removal sequence

10 years agoChange task removal sequence
Craig Mautner [Tue, 11 Feb 2014 01:55:01 +0000 (17:55 -0800)]
Change task removal sequence

- Remove task after removing activity. Removing the task before
removing the activity led to problems when the task was still needed.

- In WindowManager wait for activity manager to remove the task.
Previously was automatically removing the task when the last activity
was removed.

Fixes bug 12957434.

Change-Id: I7f6b1f09a2e2a845f177f337769075c9376f8bdb

10 years agoMerge "Maybe fix issue #12957738: SecurityException in..."
Dianne Hackborn [Tue, 11 Feb 2014 01:16:11 +0000 (01:16 +0000)]
Merge "Maybe fix issue #12957738: SecurityException in..."

10 years agoam 27f2d46a: (-s ours) am eaf82374: am 38d799fc: Merge "Generic object based data...
Tim Murray [Mon, 10 Feb 2014 23:43:45 +0000 (23:43 +0000)]
am 27f2d46a: (-s ours) am eaf82374: am 38d799fc: Merge "Generic object based data copy."

* commit '27f2d46a24e840ac5682635dddd0e28dd66172ad':
  Generic object based data copy.

10 years agoam eaf82374: am 38d799fc: Merge "Generic object based data copy."
Tim Murray [Mon, 10 Feb 2014 23:34:54 +0000 (23:34 +0000)]
am eaf82374: am 38d799fc: Merge "Generic object based data copy."

* commit 'eaf82374186bd7084826f1cd258c82a3c6a4bf29':
  Generic object based data copy.

10 years agoam 38d799fc: Merge "Generic object based data copy."
Tim Murray [Mon, 10 Feb 2014 23:29:55 +0000 (15:29 -0800)]
am 38d799fc: Merge "Generic object based data copy."

* commit '38d799fc7a272c3c6ff7b9bc7b7f9239b45bf98c':
  Generic object based data copy.

10 years agoMerge "Generic object based data copy."
Tim Murray [Mon, 10 Feb 2014 23:27:05 +0000 (23:27 +0000)]
Merge "Generic object based data copy."

10 years agoGeneric object based data copy.
Jason Sams [Tue, 26 Nov 2013 02:28:33 +0000 (18:28 -0800)]
Generic object based data copy.

This change consolidates the copy paths to Object based.
The runtime now uses reflection to identify the type of
array present.  This adds support for long/double and reduces
the amount of code present.  We could also support arrays of vectors
or objects in the future with this mechanism.

Change-Id: I2297c1c01fbe6a64c375d6368f25d7db781ea788

10 years agoMerge "Revert "Move inputservice over to frameworks/native""
Michael Wright [Mon, 10 Feb 2014 23:09:45 +0000 (23:09 +0000)]
Merge "Revert "Move inputservice over to frameworks/native""

10 years agoRevert "Move inputservice over to frameworks/native"
Michael Wright [Mon, 10 Feb 2014 23:08:26 +0000 (15:08 -0800)]
Revert "Move inputservice over to frameworks/native"

This reverts commit 89e5c7ebb37fabc4368e87e17a502db62598bd61.

10 years agoMerge "Move inputservice over to frameworks/native"
Michael Wright [Mon, 10 Feb 2014 22:42:01 +0000 (22:42 +0000)]
Merge "Move inputservice over to frameworks/native"

10 years agoMerge "Remove SkRegion dependency from libinput"
Michael Wright [Mon, 10 Feb 2014 22:41:25 +0000 (22:41 +0000)]
Merge "Remove SkRegion dependency from libinput"

10 years agoam 675d44ad: am 12f1f5b8: am 40545f32: Merge "frameworks/base: fix errors inside...
Colin Cross [Mon, 10 Feb 2014 22:14:53 +0000 (22:14 +0000)]
am 675d44ad: am 12f1f5b8: am 40545f32: Merge "frameworks/base: fix errors inside ALOGV"

* commit '675d44ad2355eb4404e286f2c337196297d1e26f':
  frameworks/base: fix errors inside ALOGV

10 years agoMove inputservice over to frameworks/native
Michael Wright [Mon, 10 Feb 2014 22:10:27 +0000 (14:10 -0800)]
Move inputservice over to frameworks/native

Remove all of the pieces except the PointerController and SpriteController over
to frameworks/native in preparation for inputflinger. Those two need to stay in
frameworks/base for now because they depend on Skia currently. In the long run
they should be merged into either the InputManager or the WindowManager rather
than as a part of the inputservice / inputflinger.

Change-Id: Iebef71f3030fb3d26a5f338eb66d75bb37c17734

10 years agoam 12f1f5b8: am 40545f32: Merge "frameworks/base: fix errors inside ALOGV"
Colin Cross [Mon, 10 Feb 2014 22:09:12 +0000 (22:09 +0000)]
am 12f1f5b8: am 40545f32: Merge "frameworks/base: fix errors inside ALOGV"

* commit '12f1f5b87326a31f4c69e949a1e645e82c9152d4':
  frameworks/base: fix errors inside ALOGV

10 years agoam 40545f32: Merge "frameworks/base: fix errors inside ALOGV"
Colin Cross [Mon, 10 Feb 2014 22:06:09 +0000 (14:06 -0800)]
am 40545f32: Merge "frameworks/base: fix errors inside ALOGV"

* commit '40545f32d3364604dac0c21a0310c26f7596e3a8':
  frameworks/base: fix errors inside ALOGV

10 years agoMerge "frameworks/base: fix errors inside ALOGV"
Colin Cross [Mon, 10 Feb 2014 22:02:50 +0000 (22:02 +0000)]
Merge "frameworks/base: fix errors inside ALOGV"

10 years agoMaybe fix issue #12957738: SecurityException in...
Dianne Hackborn [Mon, 10 Feb 2014 21:47:39 +0000 (13:47 -0800)]
Maybe fix issue #12957738: SecurityException in...

...Multiple Processes: uid 10069 does not have
android.permission.UPDATE_DEVICE_STATS.

Change-Id: Ibabb5b09d52412df8bebdc85a584f89e175b1ec5

10 years agoFix NPE on removing a user
Amith Yamasani [Mon, 10 Feb 2014 21:43:18 +0000 (13:43 -0800)]
Fix NPE on removing a user

Bug: 12957232

Check for null mDeviceOwner.

Change-Id: I107dc24d1a8de121ebd2c1bb56e1af40bb1c55ac

10 years agoRemove SkRegion dependency from libinput
Michael Wright [Thu, 6 Feb 2014 02:02:40 +0000 (18:02 -0800)]
Remove SkRegion dependency from libinput

This gets us one step closer to removing our dependency on Skia, which is at
least one of the things blocking us from moving the input system out of
f/b.

Change-Id: I755e6267996c93fe700f1056327386923287575a

10 years agoMerge "Fix NPE in PolicyControl."
John Spurlock [Mon, 10 Feb 2014 20:43:14 +0000 (20:43 +0000)]
Merge "Fix NPE in PolicyControl."

10 years agocamera2: Clean up cross-references
Eino-Ville Talvala [Mon, 10 Feb 2014 20:41:04 +0000 (12:41 -0800)]
camera2: Clean up cross-references

Change-Id: I7410293a13f65768a2aeed1490662735f73987cb

10 years agoFix NPE in PolicyControl.
John Spurlock [Mon, 10 Feb 2014 20:36:24 +0000 (15:36 -0500)]
Fix NPE in PolicyControl.

Bug:12957738
Change-Id: I8051a7a0656f50ed63321f9a79faf0383d7c66b4

10 years agoMerge "Decode file descriptor from the correct offset."
Leon Scroggins III [Mon, 10 Feb 2014 20:30:50 +0000 (20:30 +0000)]
Merge "Decode file descriptor from the correct offset."

10 years agoam f7193bf8: am d9f9da39: am 56b86deb: am 1c91b1f7: am 45dbfcc7: Improve text renderi...
Deepanshu Gupta [Mon, 10 Feb 2014 20:04:05 +0000 (20:04 +0000)]
am f7193bf8: am d9f9da39: am 56b86deb: am 1c91b1f7: am 45dbfcc7: Improve text rendering and measurement.

* commit 'f7193bf89780039cf924dd7d1bb67f4830517231':
  Improve text rendering and measurement.

10 years agoam d9f9da39: am 56b86deb: am 1c91b1f7: am 45dbfcc7: Improve text rendering and measur...
Deepanshu Gupta [Mon, 10 Feb 2014 19:56:58 +0000 (19:56 +0000)]
am d9f9da39: am 56b86deb: am 1c91b1f7: am 45dbfcc7: Improve text rendering and measurement.

* commit 'd9f9da396b41f394991f676bc74dcfc59c7070a8':
  Improve text rendering and measurement.

10 years agoam 56b86deb: am 1c91b1f7: am 45dbfcc7: Improve text rendering and measurement.
Deepanshu Gupta [Mon, 10 Feb 2014 19:53:48 +0000 (19:53 +0000)]
am 56b86deb: am 1c91b1f7: am 45dbfcc7: Improve text rendering and measurement.

* commit '56b86debcfaf8f661011702d31854bb3804f5fe1':
  Improve text rendering and measurement.

10 years agoam 1c91b1f7: am 45dbfcc7: Improve text rendering and measurement.
Deepanshu Gupta [Mon, 10 Feb 2014 19:50:58 +0000 (19:50 +0000)]
am 1c91b1f7: am 45dbfcc7: Improve text rendering and measurement.

* commit '1c91b1f7a2da5e5b1996217228399ef958c2be0c':
  Improve text rendering and measurement.

10 years agoam 45dbfcc7: Improve text rendering and measurement.
Deepanshu Gupta [Mon, 10 Feb 2014 19:47:20 +0000 (19:47 +0000)]
am 45dbfcc7: Improve text rendering and measurement.

* commit '45dbfcc781a3926d22571b6ccfa3f27ec896f119':
  Improve text rendering and measurement.

10 years agoMerge "Removing SkiaColorFilter and inspecting the native object directly."
Derek Sollenberger [Mon, 10 Feb 2014 19:19:06 +0000 (19:19 +0000)]
Merge "Removing SkiaColorFilter and inspecting the native object directly."

10 years agoMerge "Add shadow casting / global perspective APIs, hidden for now."
Chris Craik [Mon, 10 Feb 2014 18:58:53 +0000 (18:58 +0000)]
Merge "Add shadow casting / global perspective APIs, hidden for now."

10 years agoam edb555ed: am 92ade49e: Merge "Fix ActivityView layout bug." into klp-modular-dev
Griff Hazen [Mon, 10 Feb 2014 18:01:27 +0000 (18:01 +0000)]
am edb555ed: am 92ade49e: Merge "Fix ActivityView layout bug." into klp-modular-dev

* commit 'edb555edceaf51f7ef40e35257a4b00c06a68e72':
  Fix ActivityView layout bug.

10 years agoam 92ade49e: Merge "Fix ActivityView layout bug." into klp-modular-dev
Griff Hazen [Mon, 10 Feb 2014 17:54:57 +0000 (17:54 +0000)]
am 92ade49e: Merge "Fix ActivityView layout bug." into klp-modular-dev

* commit '92ade49ecaa23cd77510ee0bc1dbc6355eb581ed':
  Fix ActivityView layout bug.

10 years agoMerge "Fix ActivityView layout bug." into klp-modular-dev
Griff Hazen [Mon, 10 Feb 2014 17:51:35 +0000 (17:51 +0000)]
Merge "Fix ActivityView layout bug." into klp-modular-dev

10 years agoam a11ac26b: am 9d6e456d: am 332aefe9: am d038afd3: am 7074f324: Merge "docs: Fixed...
Ricardo Cervera [Mon, 10 Feb 2014 17:38:43 +0000 (17:38 +0000)]
am a11ac26b: am 9d6e456d: am 332aefe9: am d038afd3: am 7074f324: Merge "docs: Fixed ViewPager animation tutorial. Bug: 12815243" into klp-docs

* commit 'a11ac26b0e012eb9b9829afc74095a5cc6292452':
  docs: Fixed ViewPager animation tutorial. Bug: 12815243

10 years agoam 9d6e456d: am 332aefe9: am d038afd3: am 7074f324: Merge "docs: Fixed ViewPager...
Ricardo Cervera [Mon, 10 Feb 2014 17:32:25 +0000 (17:32 +0000)]
am 9d6e456d: am 332aefe9: am d038afd3: am 7074f324: Merge "docs: Fixed ViewPager animation tutorial. Bug: 12815243" into klp-docs

* commit '9d6e456d777a147444da650e10ca9dfc1a64b9cd':
  docs: Fixed ViewPager animation tutorial. Bug: 12815243

10 years agoam 332aefe9: am d038afd3: am 7074f324: Merge "docs: Fixed ViewPager animation tutoria...
Ricardo Cervera [Mon, 10 Feb 2014 17:29:19 +0000 (17:29 +0000)]
am 332aefe9: am d038afd3: am 7074f324: Merge "docs: Fixed ViewPager animation tutorial. Bug: 12815243" into klp-docs

* commit '332aefe931fe38291fa07fe20c9018eed1c8c0d5':
  docs: Fixed ViewPager animation tutorial. Bug: 12815243

10 years agoam d038afd3: am 7074f324: Merge "docs: Fixed ViewPager animation tutorial. Bug: 12815...
Ricardo Cervera [Mon, 10 Feb 2014 17:26:19 +0000 (17:26 +0000)]
am d038afd3: am 7074f324: Merge "docs: Fixed ViewPager animation tutorial. Bug: 12815243" into klp-docs

* commit 'd038afd39874238357a5ca9621921542f57db7a1':
  docs: Fixed ViewPager animation tutorial. Bug: 12815243

10 years agoam 7074f324: Merge "docs: Fixed ViewPager animation tutorial. Bug: 12815243" into...
Ricardo Cervera [Mon, 10 Feb 2014 17:22:23 +0000 (17:22 +0000)]
am 7074f324: Merge "docs: Fixed ViewPager animation tutorial. Bug: 12815243" into klp-docs

* commit '7074f32440a8d6db4512c82e12b9e1c6891a4ce1':
  docs: Fixed ViewPager animation tutorial. Bug: 12815243

10 years agoMerge "docs: Fixed ViewPager animation tutorial. Bug: 12815243" into klp-docs
Ricardo Cervera [Mon, 10 Feb 2014 17:19:28 +0000 (17:19 +0000)]
Merge "docs: Fixed ViewPager animation tutorial. Bug: 12815243" into klp-docs

10 years agoFix ActivityView layout bug.
Griff Hazen [Mon, 10 Feb 2014 16:58:32 +0000 (08:58 -0800)]
Fix ActivityView layout bug.

Child TextureView should be positioned at origin of ActivityView,
with matching width and height. Previously, a container's padding
would be applied twice for example.

Change-Id: Ie0be10614a45aede4207abf986721385d04d8c76

10 years agoMerge "Extended locales in AAPT / AssetManager."
Narayan Kamath [Mon, 10 Feb 2014 16:51:39 +0000 (16:51 +0000)]
Merge "Extended locales in AAPT / AssetManager."

10 years agoMerge "AssetManager support for 3 letter lang/country codes."
Narayan Kamath [Mon, 10 Feb 2014 16:51:30 +0000 (16:51 +0000)]
Merge "AssetManager support for 3 letter lang/country codes."

10 years agoExtended locales in AAPT / AssetManager.
Narayan Kamath [Tue, 21 Jan 2014 15:32:36 +0000 (15:32 +0000)]
Extended locales in AAPT / AssetManager.

Support 3 letter language codes, script codes &
variants. The bulk of the changes are related to
the implementation of command line filtering of
locales etc. The previous code assumed that the
value of each "axis" (locale, density, size etc.)
could be represented by a 4 byte type. This is
no longer the case.

This change introduces a new class, AaptLocaleValue
which holds a (normalized) locale parsed from a
directory name or a filter string. This class takes
responsibility for parsing locales as well as
writing them to ResTable_config structures, which is
their representation in the resource table.

This includes minor changes at the java / JNI level
for AssetManager. We now call locale.toLanguageTag()
to give the native layer a well formed BCP-47 tag.
I've removed some duplicated parsing code in
AssetManager.cpp and replaced them with functions on
ResTable_config. The native getLocales function has
been changed to return well formed BCP-47 locales as
well, so that the corresponding java function can use
Locale.forLanguageTag to construct a Locale object
out of it.

Finally, this change introduces default and copy
constructors for ResTable_config to prevent having
to memset() the associated memory to 0 on every
stack allocation.

Change-Id: I899a56a9a182ee6be52b9389d1ae59266f5482e9

10 years agoAssetManager support for 3 letter lang/country codes.
Narayan Kamath [Mon, 20 Jan 2014 13:57:11 +0000 (13:57 +0000)]
AssetManager support for 3 letter lang/country codes.

- 3 letter codes are packed into the existing 32 bit locale
  field in ResTable_config
- We introduce new fields for script / variant information.

Note that we define a "match" between two ResTable_config
structures to be purely on the basis of their language &
country (disregarding the script and the variant). However,
configs with scripts and variants are considered to be more
specific than those without.

Change-Id: I3c2e909ebbebdbbd0ab72a639d531b2b9fdbd9b9

10 years agoam 33a608a0: am 578d4f5f: am 56062983: Merge "AArch64: Use long for pointers in RS...
Narayan Kamath [Mon, 10 Feb 2014 13:45:15 +0000 (13:45 +0000)]
am 33a608a0: am 578d4f5f: am 56062983: Merge "AArch64: Use long for pointers in RS Java/JNI code"

* commit '33a608a0a326d9671bffd6750cb5521d6687cc57':
  AArch64: Use long for pointers in RS Java/JNI code

10 years agoam 578d4f5f: am 56062983: Merge "AArch64: Use long for pointers in RS Java/JNI code"
Narayan Kamath [Mon, 10 Feb 2014 13:39:39 +0000 (13:39 +0000)]
am 578d4f5f: am 56062983: Merge "AArch64: Use long for pointers in RS Java/JNI code"

* commit '578d4f5f50b3b8969125376d696e893dc355faa6':
  AArch64: Use long for pointers in RS Java/JNI code

10 years agoam 56062983: Merge "AArch64: Use long for pointers in RS Java/JNI code"
Narayan Kamath [Mon, 10 Feb 2014 13:37:18 +0000 (05:37 -0800)]
am 56062983: Merge "AArch64: Use long for pointers in RS Java/JNI code"

* commit '56062983f1e07295c812fba0e22ce579a35b6f76':
  AArch64: Use long for pointers in RS Java/JNI code

10 years agoMerge "AArch64: Use long for pointers in RS Java/JNI code"
Narayan Kamath [Mon, 10 Feb 2014 13:33:26 +0000 (13:33 +0000)]
Merge "AArch64: Use long for pointers in RS Java/JNI code"

10 years agoam ffc641dd: am 6366dcbd: am bcc27903: am 44085b68: am f2fcbff8: Merge "Doc update...
Katie McCormick [Mon, 10 Feb 2014 13:16:42 +0000 (13:16 +0000)]
am ffc641dd: am 6366dcbd: am bcc27903: am 44085b68: am f2fcbff8: Merge "Doc update: misc GCM fixes" into klp-docs

* commit 'ffc641dd5468878a4d12a8f323bb5b5c75cc9ef3':
  Doc update: misc GCM fixes

10 years agoam 91bdc7d4: am 33331667: am 3f43b646: am 7fd4d29e: am 392ddb22: Merge "Doc change...
Dirk Dougherty [Mon, 10 Feb 2014 13:16:38 +0000 (13:16 +0000)]
am 91bdc7d4: am 33331667: am 3f43b646: am 7fd4d29e: am 392ddb22: Merge "Doc change: add carousel and spotlight for developer video." into klp-docs

* commit '91bdc7d4bed9e98db0a8d079a993cf90538e2a66':
  Doc change: add carousel and spotlight for developer video.

10 years agoam e03ed510: am 4e5b67e6: Queue startActivity params if not yet ready.
Craig Mautner [Mon, 10 Feb 2014 12:51:24 +0000 (12:51 +0000)]
am e03ed510: am 4e5b67e6: Queue startActivity params if not yet ready.

* commit 'e03ed51068bcb4253e2fd2a4a3f39a7e580a721a':
  Queue startActivity params if not yet ready.

10 years agoam 779d204a: am 9ef471f7: Don\'t remove Activities and Tasks until animation done
Craig Mautner [Mon, 10 Feb 2014 12:51:19 +0000 (12:51 +0000)]
am 779d204a: am 9ef471f7: Don\'t remove Activities and Tasks until animation done

* commit '779d204abe6a3922b572822df5cd775ffd5d77e8':
  Don't remove Activities and Tasks until animation done

10 years agoam 88daefd4: am 379bb6ed: am ff27e6bc: Merge "Use canonical path for /vendor/app"
Christopher Tate [Mon, 10 Feb 2014 12:51:15 +0000 (12:51 +0000)]
am 88daefd4: am 379bb6ed: am ff27e6bc: Merge "Use canonical path for /vendor/app"

* commit '88daefd40767695f7e8a67d1d52dfaac2ab6bdb6':
  Use canonical path for /vendor/app

10 years agoam cd4cf932: am 6691bfd6: am cccae25f: Merge "Example controller app for system ui...
John Spurlock [Mon, 10 Feb 2014 12:51:06 +0000 (12:51 +0000)]
am cd4cf932: am 6691bfd6: am cccae25f: Merge "Example controller app for system ui demo mode."

* commit 'cd4cf932d994c392ca6da21dc32a26d6d467b721':
  Example controller app for system ui demo mode.

10 years agoam ecc8ee64: am 8067c9ec: am 11e6cabc: Merge "Fix a typo."
Jean-Luc Brouillet [Mon, 10 Feb 2014 12:51:01 +0000 (12:51 +0000)]
am ecc8ee64: am 8067c9ec: am 11e6cabc: Merge "Fix a typo."

* commit 'ecc8ee649578c2bb859c639c361d5a24005b9200':
  Fix a typo.

10 years agoam 9e07c1c4: am 6b1f3acd: am 6ea720ba: Merge "Make sure to turn off led after pulse()"
Dan Sandler [Mon, 10 Feb 2014 12:50:24 +0000 (12:50 +0000)]
am 9e07c1c4: am 6b1f3acd: am 6ea720ba: Merge "Make sure to turn off led after pulse()"

* commit '9e07c1c4f333171bff6e1cf1c4408e5738bcf127':
  Make sure to turn off led after pulse()

10 years agoframeworks/base: fix errors inside ALOGV
Colin Cross [Fri, 7 Feb 2014 04:17:48 +0000 (20:17 -0800)]
frameworks/base: fix errors inside ALOGV

Fix errors exposed by adding compile-time checking to disabled ALOGVs.

Change-Id: I9beeb5d5df498c63d6bed49734ee80a8e0afcefc

10 years agoam 6366dcbd: am bcc27903: am 44085b68: am f2fcbff8: Merge "Doc update: misc GCM fixes...
Katie McCormick [Sat, 8 Feb 2014 18:44:52 +0000 (18:44 +0000)]
am 6366dcbd: am bcc27903: am 44085b68: am f2fcbff8: Merge "Doc update: misc GCM fixes" into klp-docs

* commit '6366dcbd494afe20912a932bb18faf199e4a1c62':
  Doc update: misc GCM fixes

10 years agoam 33331667: am 3f43b646: am 7fd4d29e: am 392ddb22: Merge "Doc change: add carousel...
Dirk Dougherty [Sat, 8 Feb 2014 18:44:49 +0000 (18:44 +0000)]
am 33331667: am 3f43b646: am 7fd4d29e: am 392ddb22: Merge "Doc change: add carousel and spotlight for developer video." into klp-docs

* commit '3333166738ca1382307bcf61e30adba6bdec83d4':
  Doc change: add carousel and spotlight for developer video.

10 years agoam bcc27903: am 44085b68: am f2fcbff8: Merge "Doc update: misc GCM fixes" into klp...
Katie McCormick [Sat, 8 Feb 2014 18:39:07 +0000 (18:39 +0000)]
am bcc27903: am 44085b68: am f2fcbff8: Merge "Doc update: misc GCM fixes" into klp-docs

* commit 'bcc27903fb4b9581f2b6912d767cccb2d1c2e1ba':
  Doc update: misc GCM fixes

10 years agoam 3f43b646: am 7fd4d29e: am 392ddb22: Merge "Doc change: add carousel and spotlight...
Dirk Dougherty [Sat, 8 Feb 2014 18:39:01 +0000 (18:39 +0000)]
am 3f43b646: am 7fd4d29e: am 392ddb22: Merge "Doc change: add carousel and spotlight for developer video." into klp-docs

* commit '3f43b646294857ea2dbd5e2fba944ee0d4c19657':
  Doc change: add carousel and spotlight for developer video.

10 years agoam 44085b68: am f2fcbff8: Merge "Doc update: misc GCM fixes" into klp-docs
Katie McCormick [Sat, 8 Feb 2014 18:34:54 +0000 (18:34 +0000)]
am 44085b68: am f2fcbff8: Merge "Doc update: misc GCM fixes" into klp-docs

* commit '44085b68add3d7583f7832c51409de83655fc4f1':
  Doc update: misc GCM fixes

10 years agoam 7fd4d29e: am 392ddb22: Merge "Doc change: add carousel and spotlight for developer...
Dirk Dougherty [Sat, 8 Feb 2014 18:34:44 +0000 (18:34 +0000)]
am 7fd4d29e: am 392ddb22: Merge "Doc change: add carousel and spotlight for developer video." into klp-docs

* commit '7fd4d29e847984c02561c7f385bfe0947432012e':
  Doc change: add carousel and spotlight for developer video.