OSDN Git Service

android-x86/frameworks-base.git
11 years agoMerge "Remove obsolete OMA-DRM support"
Mike Lockwood [Tue, 30 Apr 2013 00:00:00 +0000 (00:00 +0000)]
Merge "Remove obsolete OMA-DRM support"

11 years agoRemove obsolete OMA-DRM support
Mike Lockwood [Mon, 29 Apr 2013 23:12:23 +0000 (16:12 -0700)]
Remove obsolete OMA-DRM support

Change-Id: Ic6008d4c9f8b9cd9fd4efec070260227af70559c

11 years agoMerge commit 'b3f66877' into afdmerge
Jeff Sharkey [Mon, 29 Apr 2013 22:29:13 +0000 (15:29 -0700)]
Merge commit 'b3f66877' into afdmerge

Change-Id: I319863cf23b2e6eacfa4508f7b111fba7b1cbc24

11 years agoMerge "input: added support for multiple keyevents"
Michael Wright [Mon, 29 Apr 2013 22:05:43 +0000 (22:05 +0000)]
Merge "input: added support for multiple keyevents"

11 years agoinput: added support for multiple keyevents
Diego Torres Milano [Thu, 4 Apr 2013 17:44:34 +0000 (13:44 -0400)]
input: added support for multiple keyevents

- Multiple keyevents can now be send from the command line:

    input keyevent <key code number or name> ...

  Sometimes invoking 'input' repeatedly does not send the events fast
  enough, this change solves the problem by allowing multiple key code
  number or names be added to the command line.

Change-Id: I0d0f34bddd99e0195c9badff2f8b3e2aa9a51737

11 years agoMerge "Document the 'aapt dump strings' command"
Christopher Tate [Mon, 29 Apr 2013 21:34:28 +0000 (21:34 +0000)]
Merge "Document the 'aapt dump strings' command"

11 years agoMerge "Don't use X509CertImpl directly"
Kenny Root [Mon, 29 Apr 2013 20:54:48 +0000 (20:54 +0000)]
Merge "Don't use X509CertImpl directly"

11 years agoDon't use X509CertImpl directly
Kenny Root [Wed, 24 Apr 2013 05:33:18 +0000 (22:33 -0700)]
Don't use X509CertImpl directly

Change-Id: Ibabee35c90c2636c6f362e4d778d6795a0cef6c2

11 years agoMerge "Decorate AssetFileDescriptor with Closeable."
Jeff Sharkey [Mon, 29 Apr 2013 18:24:45 +0000 (18:24 +0000)]
Merge "Decorate AssetFileDescriptor with Closeable."

11 years agoMerge branch 'master' of https://googleplex-android.googlesource.com/_direct/platform...
Eino-Ville Talvala [Mon, 29 Apr 2013 18:22:54 +0000 (11:22 -0700)]
Merge branch 'master' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base

11 years agoMerge "Regenerate GL stubs"
Andy McFadden [Mon, 29 Apr 2013 18:22:36 +0000 (18:22 +0000)]
Merge "Regenerate GL stubs"

11 years agoam ccd11e30: am ef325d06: Merge "Add DPad keys to Playpad" into jb-mr2-dev
Michael Wright [Mon, 29 Apr 2013 18:22:30 +0000 (11:22 -0700)]
am ccd11e30: am ef325d06: Merge "Add DPad keys to Playpad" into jb-mr2-dev

* commit 'ccd11e309c00ba385c84114dea88f28017148797':
  Add DPad keys to Playpad

11 years agoDecorate AssetFileDescriptor with Closeable.
Jeff Sharkey [Mon, 29 Apr 2013 18:19:18 +0000 (11:19 -0700)]
Decorate AssetFileDescriptor with Closeable.

Change-Id: I1f5f462b781a6e8fad77337006febd9c54694c0b

11 years agoam 9e69a2ce: am 03ce5b53: Fix build.
Ying Wang [Mon, 29 Apr 2013 18:22:15 +0000 (11:22 -0700)]
am 9e69a2ce: am 03ce5b53: Fix build.

* commit '9e69a2ced4e11f74ee979390c3f58ec4318a16c3':
  Fix build.

11 years agoam 3a3f47e5: am eecf22d4: Merge "The helper query bridge in AccessibilityServiceManag...
Svetoslav [Mon, 29 Apr 2013 18:22:09 +0000 (11:22 -0700)]
am 3a3f47e5: am eecf22d4: Merge "The helper query bridge in AccessibilityServiceManager missing capability." into jb-mr2-dev

* commit '3a3f47e53188f15a68d22392958ede741d71fa0f':
  The helper query bridge in AccessibilityServiceManager missing capability.

11 years agoam f266c6b9: am f99177f3: Merge "Update preloaded classes" into jb-mr2-dev
Kenny Root [Mon, 29 Apr 2013 18:22:06 +0000 (11:22 -0700)]
am f266c6b9: am f99177f3: Merge "Update preloaded classes" into jb-mr2-dev

* commit 'f266c6b93f44fcc674d4c5686af0c1d1b782dab0':
  Update preloaded classes

11 years agoMerge "Exclude regions from the tap detector."
Craig Mautner [Mon, 29 Apr 2013 17:31:48 +0000 (17:31 +0000)]
Merge "Exclude regions from the tap detector."

11 years agoExclude regions from the tap detector.
Craig Mautner [Mon, 29 Apr 2013 17:29:11 +0000 (10:29 -0700)]
Exclude regions from the tap detector.

Fix typing on the keyboard causing focus to shift stacks.

Change-Id: I4ec9ccdbe35e27f4860a5bdf0e2818f58e53b873

11 years agoMerge "Hideybar gesture clears flags if SYSTEM_UI_FLAG_FULLSCREEN"
John Spurlock [Mon, 29 Apr 2013 12:52:25 +0000 (12:52 +0000)]
Merge "Hideybar gesture clears flags if SYSTEM_UI_FLAG_FULLSCREEN"

11 years agoMerge "Allow compiling aapt for the device"
Bjorn Bringert [Mon, 29 Apr 2013 10:10:51 +0000 (10:10 +0000)]
Merge "Allow compiling aapt for the device"

11 years agoDocument the 'aapt dump strings' command
Mårten Kongstad [Thu, 20 Dec 2012 09:08:54 +0000 (10:08 +0100)]
Document the 'aapt dump strings' command

Update the usage page for aapt to mention 'strings' as a valid
subcommand to 'dump'.

Change-Id: Iadb2b8ce36951ff36ffbf6b5ea349ba1e2b12582

11 years agoGeneric refactoring for clarity.
Craig Mautner [Sun, 28 Apr 2013 20:50:14 +0000 (13:50 -0700)]
Generic refactoring for clarity.

- Log.* was being interspersed with Slog.*.
- WindowState Rects were being converted to local variables making
it harder to find all references to them.

Change-Id: I868a32028604d46dbbc15b005a440f0571336293

11 years agoMerge "Clean up FocusedStackFrame layer setting."
Craig Mautner [Sun, 28 Apr 2013 16:02:47 +0000 (16:02 +0000)]
Merge "Clean up FocusedStackFrame layer setting."

11 years agoClean up FocusedStackFrame layer setting.
Craig Mautner [Sun, 28 Apr 2013 15:58:21 +0000 (08:58 -0700)]
Clean up FocusedStackFrame layer setting.

- Putting the stack frame above the highest app window layer ends up
putting it over the IME when the caret popup is showing. This puts
the stack frame layer above the highest non-child window layer.

- Also change the timing so the layer isn't applied until all other
layers are also being applied.

Change-Id: Ic5f142998822ac1e3890a2943cda7fc86a7e7974

11 years agoThe helper query bridge in AccessibilityServiceManager missing capability.
Svetoslav [Fri, 26 Apr 2013 22:08:16 +0000 (15:08 -0700)]
The helper query bridge in AccessibilityServiceManager missing capability.

1. The helper query bridge service did not have the now capability
   to query the screen content.

2. Fixing the build.

bug:8633951

Change-Id: Ief6a3387793710a83b83c18cc6c53b51dcda9bdf

11 years agoam ef325d06: Merge "Add DPad keys to Playpad" into jb-mr2-dev
Michael Wright [Sat, 27 Apr 2013 00:16:07 +0000 (17:16 -0700)]
am ef325d06: Merge "Add DPad keys to Playpad" into jb-mr2-dev

* commit 'ef325d060800e5e1c955969889b549494be576ee':
  Add DPad keys to Playpad

11 years agoMerge "Add DPad keys to Playpad" into jb-mr2-dev
Michael Wright [Fri, 26 Apr 2013 23:57:39 +0000 (23:57 +0000)]
Merge "Add DPad keys to Playpad" into jb-mr2-dev

11 years agoam 03ce5b53: Fix build.
Ying Wang [Fri, 26 Apr 2013 22:56:15 +0000 (15:56 -0700)]
am 03ce5b53: Fix build.

* commit '03ce5b536647853cbfa65357760f3fb246b85e36':
  Fix build.

11 years agoFix build.
Ying Wang [Fri, 26 Apr 2013 22:54:44 +0000 (15:54 -0700)]
Fix build.

Change-Id: I1fedbbb521305e02502ddb23a96b5ee96fa43b7b

11 years agoam eecf22d4: Merge "The helper query bridge in AccessibilityServiceManager missing...
Svetoslav [Fri, 26 Apr 2013 22:23:36 +0000 (15:23 -0700)]
am eecf22d4: Merge "The helper query bridge in AccessibilityServiceManager missing capability." into jb-mr2-dev

* commit 'eecf22d464579e5b7a3baaa6c450481778b59a45':
  The helper query bridge in AccessibilityServiceManager missing capability.

11 years agoam f99177f3: Merge "Update preloaded classes" into jb-mr2-dev
Kenny Root [Fri, 26 Apr 2013 22:23:34 +0000 (15:23 -0700)]
am f99177f3: Merge "Update preloaded classes" into jb-mr2-dev

* commit 'f99177f3944e06fc7a1a516a0b703794e39af5f1':
  Update preloaded classes

11 years agoMerge "The helper query bridge in AccessibilityServiceManager missing capability...
Svetoslav [Fri, 26 Apr 2013 22:20:57 +0000 (22:20 +0000)]
Merge "The helper query bridge in AccessibilityServiceManager missing capability." into jb-mr2-dev

11 years agoMerge "Update preloaded classes" into jb-mr2-dev
Kenny Root [Fri, 26 Apr 2013 22:20:35 +0000 (22:20 +0000)]
Merge "Update preloaded classes" into jb-mr2-dev

11 years agoThe helper query bridge in AccessibilityServiceManager missing capability.
Svetoslav [Fri, 26 Apr 2013 22:08:16 +0000 (15:08 -0700)]
The helper query bridge in AccessibilityServiceManager missing capability.

1. The helper query bridge service did not have the now capability
   to query the screen content.

2. Fixing the build.

bug:8633951

Change-Id: Ief6a3387793710a83b83c18cc6c53b51dcda9bdf

11 years agoAdd DPad keys to Playpad
Michael Wright [Fri, 26 Apr 2013 22:06:38 +0000 (15:06 -0700)]
Add DPad keys to Playpad

Change-Id: If274aa7e9d5e4988cf613ea9a16584c413ded8dd

11 years agoMerge "Disable various sampling event logs."
Jeff Sharkey [Fri, 26 Apr 2013 21:56:26 +0000 (21:56 +0000)]
Merge "Disable various sampling event logs."

11 years agoMerge "Add keyguard background scrim and protection around keyguard APIs"
Jim Miller [Fri, 26 Apr 2013 21:43:55 +0000 (21:43 +0000)]
Merge "Add keyguard background scrim and protection around keyguard APIs"

11 years agoam d66496bc: am fdbd23c6: Merge "Deliver key events to the system if no accessibility...
Svetoslav [Fri, 26 Apr 2013 21:42:19 +0000 (14:42 -0700)]
am d66496bc: am fdbd23c6: Merge "Deliver key events to the system if no accessibility service handles them." into jb-mr2-dev

* commit 'd66496bcaacd454e3c3a2d47910653989d48fcda':
  Deliver key events to the system if no accessibility service handles them.

11 years agoam fdbd23c6: Merge "Deliver key events to the system if no accessibility service...
Svetoslav [Fri, 26 Apr 2013 21:40:28 +0000 (14:40 -0700)]
am fdbd23c6: Merge "Deliver key events to the system if no accessibility service handles them." into jb-mr2-dev

* commit 'fdbd23c64f03ee39759208252a965fec81ad860a':
  Deliver key events to the system if no accessibility service handles them.

11 years agoMerge "Deliver key events to the system if no accessibility service handles them...
Svetoslav [Fri, 26 Apr 2013 21:37:05 +0000 (21:37 +0000)]
Merge "Deliver key events to the system if no accessibility service handles them." into jb-mr2-dev

11 years agoAdd keyguard background scrim and protection around keyguard APIs
Jim Miller [Fri, 22 Mar 2013 23:11:08 +0000 (16:11 -0700)]
Add keyguard background scrim and protection around keyguard APIs

With this change, the system process will put up a scrim in the
event keyguard crashes to protect underlying content.

It also adds permission checks to prevent unathorized access
through the binder APIs.

Cleaned up KeyguardTestActivity to build separately.

Removed unused resources.

Change-Id: I9e370c6bfb7dca68eae9eae304c815fb84a753d2

11 years agoDeliver key events to the system if no accessibility service handles them.
Svetoslav [Fri, 26 Apr 2013 20:11:11 +0000 (13:11 -0700)]
Deliver key events to the system if no accessibility service handles them.

We have APIs that allow an accessibility service to filter key events. The
service has to declare the capability to toggle event filtering in its
manifest and then it can set a flag to toggle the feature at runtime. The
problem was that even if no accessibility service was handling key events
these events were not fed back to the input system.

This change adds a new feature flag in the accessibility input filter that
is set only if at least one service can and wants to filter key events. If
the feature flag is set then the filter will deliver events to services and
,if they are not handled, to the system. This change also cleaned the logic
for updating the input filter.

bug:8713422

Change-Id: I4bc0c1348676569d1b76e9024708d1ed43ceb26a

11 years agoam bb393d68: am 0b063188: Merge "Set persistent property for SELinux enforcement...
gcondra@google.com [Fri, 26 Apr 2013 20:39:39 +0000 (13:39 -0700)]
am bb393d68: am 0b063188: Merge "Set persistent property for SELinux enforcement on update." into jb-mr2-dev

* commit 'bb393d68e4dbb5334c3b3984ef2020e0cfc7e790':
  Set persistent property for SELinux enforcement on update.

11 years agoUpdate preloaded classes
Kenny Root [Fri, 26 Apr 2013 19:53:57 +0000 (12:53 -0700)]
Update preloaded classes

Bug: 5213043
Change-Id: I272500ce7f6ea6bfbc624c9705f8c8b8ef1aa0ad

11 years agoam 0b063188: Merge "Set persistent property for SELinux enforcement on update." into...
gcondra@google.com [Fri, 26 Apr 2013 20:37:51 +0000 (13:37 -0700)]
am 0b063188: Merge "Set persistent property for SELinux enforcement on update." into jb-mr2-dev

* commit '0b063188054e8d1843f19325063349529494e29d':
  Set persistent property for SELinux enforcement on update.

11 years agoMerge "Set persistent property for SELinux enforcement on update." into jb-mr2-dev
repo sync [Fri, 26 Apr 2013 20:31:36 +0000 (20:31 +0000)]
Merge "Set persistent property for SELinux enforcement on update." into jb-mr2-dev

11 years agoMerge "Fix wfd crash after disconnect due to null pointer exception in"
Andreas Huber [Fri, 26 Apr 2013 20:04:07 +0000 (20:04 +0000)]
Merge "Fix wfd crash after disconnect due to null pointer exception in"

11 years agoam 032d8e38: am 0bb497b8: Merge "Use the newer ZoneInfoDB API."
Elliott Hughes [Fri, 26 Apr 2013 19:39:34 +0000 (12:39 -0700)]
am 032d8e38: am 0bb497b8: Merge "Use the newer ZoneInfoDB API."

* commit '032d8e3890335e96b16bfa3fbd7706fbb0f2d2c0':
  Use the newer ZoneInfoDB API.

11 years agoam 0bb497b8: Merge "Use the newer ZoneInfoDB API."
Elliott Hughes [Fri, 26 Apr 2013 19:38:04 +0000 (12:38 -0700)]
am 0bb497b8: Merge "Use the newer ZoneInfoDB API."

* commit '0bb497b8d1bac2206df89a878ecb7e356d21fe99':
  Use the newer ZoneInfoDB API.

11 years agoam eb6403e9: resolved conflicts for merge of bfdd2566 to jb-mr2-dev-plus-aosp
Jeff Brown [Fri, 26 Apr 2013 19:06:15 +0000 (12:06 -0700)]
am eb6403e9: resolved conflicts for merge of bfdd2566 to jb-mr2-dev-plus-aosp

* commit 'eb6403e95d601b62be7b4610599e72fd329f2666':
  Generate SDK docs for v7 support library packages.

11 years agoresolved conflicts for merge of bfdd2566 to jb-mr2-dev-plus-aosp
Jeff Brown [Fri, 26 Apr 2013 19:02:36 +0000 (12:02 -0700)]
resolved conflicts for merge of bfdd2566 to jb-mr2-dev-plus-aosp

Change-Id: I42e15a186561222edd0d97047fcd207208a87282

11 years agoFix wfd crash after disconnect due to null pointer exception in
Andreas Huber [Fri, 26 Apr 2013 18:54:53 +0000 (11:54 -0700)]
Fix wfd crash after disconnect due to null pointer exception in

WindowManagerService.java

Change-Id: I661f9c73d481da88661793ad529c0807cf74a5e7

11 years agoMerge "Use the newer ZoneInfoDB API."
Elliott Hughes [Fri, 26 Apr 2013 18:41:47 +0000 (18:41 +0000)]
Merge "Use the newer ZoneInfoDB API."

11 years agoMerge "Generate SDK docs for v7 support library packages." into jb-mr2-dev
Jeff Brown [Fri, 26 Apr 2013 18:31:12 +0000 (18:31 +0000)]
Merge "Generate SDK docs for v7 support library packages." into jb-mr2-dev

11 years agoUse the newer ZoneInfoDB API.
Elliott Hughes [Fri, 26 Apr 2013 18:30:54 +0000 (11:30 -0700)]
Use the newer ZoneInfoDB API.

Change-Id: I846c720ae6c262afb4fd7f8a749008c837e76cc4

11 years agoHideybar gesture clears flags if SYSTEM_UI_FLAG_FULLSCREEN
John Spurlock [Thu, 25 Apr 2013 12:09:19 +0000 (08:09 -0400)]
Hideybar gesture clears flags if SYSTEM_UI_FLAG_FULLSCREEN

If an app uses the system-clearable SYSTEM_UI_FLAG_FULLSCREEN to hide
the status bar, swiping from the top of the screen should clear the
clearable flags, revealing the system ui, and allowing apps to respond
to the change.

This differs from the behavior the gesture triggers when an app hides
the status bar using the non-clearable WM.LP.FLAG_FULLSCREEN.
In this case, we temporarily overlay the transparent auto-hiding bar.

Bug: 8682504
Change-Id: Ie5dc885fd13c8d980c136f6babcea181565ef2a2

11 years agoam 962b038d: am cdeb9cc1: Merge "Enhance TelephonyManger javadocs." into jb-mr2-dev
Wink Saville [Fri, 26 Apr 2013 18:25:04 +0000 (11:25 -0700)]
am 962b038d: am cdeb9cc1: Merge "Enhance TelephonyManger javadocs." into jb-mr2-dev

* commit '962b038d011d06ef8803afaead33ad10ff0133ca':
  Enhance TelephonyManger javadocs.

11 years agoam cdeb9cc1: Merge "Enhance TelephonyManger javadocs." into jb-mr2-dev
Wink Saville [Fri, 26 Apr 2013 18:23:02 +0000 (11:23 -0700)]
am cdeb9cc1: Merge "Enhance TelephonyManger javadocs." into jb-mr2-dev

* commit 'cdeb9cc1decaf23e5ec515b8841d33ecaedb57fd':
  Enhance TelephonyManger javadocs.

11 years agoMerge "Enhance TelephonyManger javadocs." into jb-mr2-dev
Wink Saville [Fri, 26 Apr 2013 18:20:41 +0000 (18:20 +0000)]
Merge "Enhance TelephonyManger javadocs." into jb-mr2-dev

11 years agoDisable various sampling event logs.
Jeff Sharkey [Fri, 26 Apr 2013 17:52:00 +0000 (10:52 -0700)]
Disable various sampling event logs.

They're unused at the moment.

Change-Id: Ib629b405e7b6666d38fcd0ebaa16490bfb0e95f0

11 years agoam 3433b6ff: am 5391a2fc: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
Baligh Uddin [Fri, 26 Apr 2013 17:39:05 +0000 (10:39 -0700)]
am 3433b6ff: am 5391a2fc: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev

* commit '3433b6ff3481d2364e8d727e70bb6fdbd3f139c0':
  Import translations. DO NOT MERGE

11 years agoam 5391a2fc: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
Baligh Uddin [Fri, 26 Apr 2013 17:37:22 +0000 (10:37 -0700)]
am 5391a2fc: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev

* commit '5391a2fcb0d1232723ad37d6872bb5800414052f':
  Import translations. DO NOT MERGE

11 years agoMerge "Import translations. DO NOT MERGE"
Baligh Uddin [Fri, 26 Apr 2013 17:35:52 +0000 (17:35 +0000)]
Merge "Import translations. DO NOT MERGE"

11 years agoMerge "Import translations. DO NOT MERGE"
Baligh Uddin [Fri, 26 Apr 2013 17:34:59 +0000 (17:34 +0000)]
Merge "Import translations. DO NOT MERGE"

11 years agoMerge "Import translations. DO NOT MERGE" into jb-mr2-dev
Baligh Uddin [Fri, 26 Apr 2013 17:32:25 +0000 (17:32 +0000)]
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev

11 years agoam aae1b516: am b0e0e54d: Merge "Can not mark the same content of browser page after...
Victoria Lease [Fri, 26 Apr 2013 17:28:56 +0000 (10:28 -0700)]
am aae1b516: am b0e0e54d: Merge "Can not mark the same content of browser page after copy"

* commit 'aae1b5163c319eae31fca509f13ce0a4ea422840':
  Can not mark the same content of browser page after copy

11 years agoam b0e0e54d: Merge "Can not mark the same content of browser page after copy"
Victoria Lease [Fri, 26 Apr 2013 17:27:02 +0000 (10:27 -0700)]
am b0e0e54d: Merge "Can not mark the same content of browser page after copy"

* commit 'b0e0e54d9dbef720ac653ed87d8ed6b46e1abdbe':
  Can not mark the same content of browser page after copy

11 years agoMerge "Can not mark the same content of browser page after copy"
Victoria Lease [Fri, 26 Apr 2013 17:17:39 +0000 (17:17 +0000)]
Merge "Can not mark the same content of browser page after copy"

11 years agoam bafd663f: am 4d9431ab: Merge "Fix network reload when config is restored" into...
Irfan Sheriff [Fri, 26 Apr 2013 16:58:57 +0000 (09:58 -0700)]
am bafd663f: am 4d9431ab: Merge "Fix network reload when config is restored" into jb-mr2-dev

* commit 'bafd663fcdd36042e2340efed835d3fb6d76e3dd':
  Fix network reload when config is restored

11 years agoam 4d9431ab: Merge "Fix network reload when config is restored" into jb-mr2-dev
Irfan Sheriff [Fri, 26 Apr 2013 16:56:56 +0000 (09:56 -0700)]
am 4d9431ab: Merge "Fix network reload when config is restored" into jb-mr2-dev

* commit '4d9431ab35c0a8bff8d1e05aa0148aea5ccdbc2f':
  Fix network reload when config is restored

11 years agoMerge "Fix network reload when config is restored" into jb-mr2-dev
Irfan Sheriff [Fri, 26 Apr 2013 16:52:51 +0000 (16:52 +0000)]
Merge "Fix network reload when config is restored" into jb-mr2-dev

11 years agoam d3859994: am 951ce6c9: Merge "Revert change f449c0c381239dc0f78b0f01ecfb3889e056a5...
Svetoslav Ganov [Fri, 26 Apr 2013 16:40:11 +0000 (09:40 -0700)]
am d3859994: am 951ce6c9: Merge "Revert change f449c0c381239dc0f78b0f01ecfb3889e056a597." into jb-mr2-dev

* commit 'd3859994624af39e0f75fd70fe623403f38c408d':
  Revert change f449c0c381239dc0f78b0f01ecfb3889e056a597.

11 years agoam 951ce6c9: Merge "Revert change f449c0c381239dc0f78b0f01ecfb3889e056a597." into...
Svetoslav Ganov [Fri, 26 Apr 2013 16:38:18 +0000 (09:38 -0700)]
am 951ce6c9: Merge "Revert change f449c0c381239dc0f78b0f01ecfb3889e056a597." into jb-mr2-dev

* commit '951ce6c966311d36328a89784d4c2e6836e9ae87':
  Revert change f449c0c381239dc0f78b0f01ecfb3889e056a597.

11 years agoMerge "Revert change f449c0c381239dc0f78b0f01ecfb3889e056a597." into jb-mr2-dev
Svetoslav Ganov [Fri, 26 Apr 2013 16:35:49 +0000 (16:35 +0000)]
Merge "Revert change f449c0c381239dc0f78b0f01ecfb3889e056a597." into jb-mr2-dev

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Fri, 26 Apr 2013 16:13:04 +0000 (09:13 -0700)]
Import translations. DO NOT MERGE

Change-Id: Ia8b07132b35a3e227344420446a09d1c587dab38
Auto-generated-cl: translation import

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Fri, 26 Apr 2013 16:01:51 +0000 (09:01 -0700)]
Import translations. DO NOT MERGE

Change-Id: I04ae5b6e5cd229d6e91721f099bda2f483bdaee0
Auto-generated-cl: translation import

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Fri, 26 Apr 2013 15:53:21 +0000 (08:53 -0700)]
Import translations. DO NOT MERGE

Change-Id: I59b1ac894eb47376cc516df18dea34bcc546060d
Auto-generated-cl: translation import

11 years agoAllow compiling aapt for the device
Bjorn Bringert [Mon, 18 Mar 2013 21:17:26 +0000 (21:17 +0000)]
Allow compiling aapt for the device

Changes:

- The static device version of libandroidfw now includes
  the extra functions needed by aapt. I could only find
  a few host tools that use the static library, so this is
  hopefully not a problem.

- The pseudolocalization code is moved into aapt.
  It was previously in libhost, but only used by aapt.

Change-Id: Ib393ebb7dcebee8abbb628cbe5255ea1679674ac

11 years agoGenerate SDK docs for v7 support library packages.
Jeff Brown [Fri, 26 Apr 2013 04:24:44 +0000 (21:24 -0700)]
Generate SDK docs for v7 support library packages.

This change required fixing some bugs in how AAPT handles
qualified symbols such as "android:layout_height"
when generating JavaDoc links.  The links were being
generated using the package name of the generated R file
rather than the package name of the referenced symbol.
These broken links caused the JavaDoc build to fail.

Bug: 8175766
Change-Id: I52fbef27825a25abca960cb44b59c2132267e9d6

11 years agoFix network reload when config is restored
Irfan Sheriff [Fri, 26 Apr 2013 06:22:41 +0000 (23:22 -0700)]
Fix network reload when config is restored

With scan mode opted in, supplicant connection is not shut
down even when wifi is turned off. This is a problem since
networks need to be reloaded when wifi is turned off and turned on
and this currently happens only on a supplicant connection.

Fix to handle this for scan mode state.

Bug: 8714796
Change-Id: I7d66c39fb51018fb52e783341222cea993993893

11 years agoam 01e48e7d: am 22f6a60e: Merge "add docs for new attributes, including account restr...
Scott Main [Fri, 26 Apr 2013 04:27:06 +0000 (21:27 -0700)]
am 01e48e7d: am 22f6a60e: Merge "add docs for new attributes, including account restriction for restricted profiles" into jb-mr2-dev

* commit '01e48e7d1541920ece358257e4c2481936497835':
  add docs for new attributes, including account restriction for restricted profiles

11 years agoam 57fc8122: am addc906f: Merge "Force clipping on layers that fail to be allocated...
Chris Craik [Fri, 26 Apr 2013 04:27:04 +0000 (21:27 -0700)]
am 57fc8122: am addc906f: Merge "Force clipping on layers that fail to be allocated" into jb-mr2-dev

* commit '57fc8122eabc08b19a41f308d409795d094856d8':
  Force clipping on layers that fail to be allocated

11 years agoam 22e9225a: am 5e5aeb46: Merge "fix javadoc build also add some docs to the service...
Scott Main [Fri, 26 Apr 2013 04:27:02 +0000 (21:27 -0700)]
am 22e9225a: am 5e5aeb46: Merge "fix javadoc build also add some docs to the service" into jb-mr2-dev

* commit '22e9225ab13347e3653449af0306bc87fa7965f2':
  fix javadoc build also add some docs to the service

11 years agoam 83a61421: am bbd90f8e: Merge "Hide isLinkedUser()" into jb-mr2-dev
Amith Yamasani [Fri, 26 Apr 2013 04:26:59 +0000 (21:26 -0700)]
am 83a61421: am bbd90f8e: Merge "Hide isLinkedUser()" into jb-mr2-dev

* commit '83a6142173fbd3ddf5c4285e2b6359e44beaddb0':
  Hide isLinkedUser()

11 years agoam 7a21c4cd: am 7f3c5d16: Merge "Added flush() for bluetooth output stream" into...
Matthew Xie [Fri, 26 Apr 2013 04:26:56 +0000 (21:26 -0700)]
am 7a21c4cd: am 7f3c5d16: Merge "Added flush() for bluetooth output stream" into jb-mr2-dev

* commit '7a21c4cdb172f6353cd4166e80910893dc981196':
  Added flush() for bluetooth output stream

11 years agoam 501bf503: am 58665709: Merge "Workaround for bug 8700358: Reproducible WebView...
Kristian Monsen [Fri, 26 Apr 2013 04:26:53 +0000 (21:26 -0700)]
am 501bf503: am 58665709: Merge "Workaround for bug 8700358: Reproducible WebView crash in Feedly starting in JWR22B" into jb-mr2-dev

* commit '501bf503559ff301034e2fb3680b4e046d0ceca5':
  Workaround for bug 8700358: Reproducible WebView crash in Feedly starting in JWR22B

11 years agoam 22f6a60e: Merge "add docs for new attributes, including account restriction for...
Scott Main [Fri, 26 Apr 2013 04:22:38 +0000 (21:22 -0700)]
am 22f6a60e: Merge "add docs for new attributes, including account restriction for restricted profiles" into jb-mr2-dev

* commit '22f6a60e62253436a4f7da1a5d59adc0f17534cc':
  add docs for new attributes, including account restriction for restricted profiles

11 years agoam addc906f: Merge "Force clipping on layers that fail to be allocated" into jb-mr2-dev
Chris Craik [Fri, 26 Apr 2013 04:22:35 +0000 (21:22 -0700)]
am addc906f: Merge "Force clipping on layers that fail to be allocated" into jb-mr2-dev

* commit 'addc906f70ba24aa4b649fff7f98d88b96c8d808':
  Force clipping on layers that fail to be allocated

11 years agoam 5e5aeb46: Merge "fix javadoc build also add some docs to the service" into jb...
Scott Main [Fri, 26 Apr 2013 04:22:33 +0000 (21:22 -0700)]
am 5e5aeb46: Merge "fix javadoc build also add some docs to the service" into jb-mr2-dev

* commit '5e5aeb46849e21b605ef59a691bca478eb4fa380':
  fix javadoc build also add some docs to the service

11 years agoam bbd90f8e: Merge "Hide isLinkedUser()" into jb-mr2-dev
Amith Yamasani [Fri, 26 Apr 2013 04:22:31 +0000 (21:22 -0700)]
am bbd90f8e: Merge "Hide isLinkedUser()" into jb-mr2-dev

* commit 'bbd90f8e7051fde96092cacdebc5d94ce46c7140':
  Hide isLinkedUser()

11 years agoam 7f3c5d16: Merge "Added flush() for bluetooth output stream" into jb-mr2-dev
Matthew Xie [Fri, 26 Apr 2013 04:22:29 +0000 (21:22 -0700)]
am 7f3c5d16: Merge "Added flush() for bluetooth output stream" into jb-mr2-dev

* commit '7f3c5d164fd34e77b783e8c09b65645a1b143f6a':
  Added flush() for bluetooth output stream

11 years agoam 58665709: Merge "Workaround for bug 8700358: Reproducible WebView crash in Feedly...
Kristian Monsen [Fri, 26 Apr 2013 04:22:26 +0000 (21:22 -0700)]
am 58665709: Merge "Workaround for bug 8700358: Reproducible WebView crash in Feedly starting in JWR22B" into jb-mr2-dev

* commit '5866570947a7ef325f74d9dbfc1ccbdd02d3e7b6':
  Workaround for bug 8700358: Reproducible WebView crash in Feedly starting in JWR22B

11 years agoMerge "add docs for new attributes, including account restriction for restricted...
Scott Main [Fri, 26 Apr 2013 03:26:11 +0000 (03:26 +0000)]
Merge "add docs for new attributes, including account restriction for restricted profiles" into jb-mr2-dev

11 years agoMerge "Force clipping on layers that fail to be allocated" into jb-mr2-dev
Chris Craik [Fri, 26 Apr 2013 02:15:45 +0000 (02:15 +0000)]
Merge "Force clipping on layers that fail to be allocated" into jb-mr2-dev

11 years agoadd docs for new attributes, including account restriction for restricted profiles
Scott Main [Tue, 23 Apr 2013 20:30:06 +0000 (13:30 -0700)]
add docs for new attributes, including account restriction for restricted profiles

Change-Id: I737ea55bfa58562b1b384e52626e95b479759376

11 years agoMerge "fix javadoc build also add some docs to the service" into jb-mr2-dev
Scott Main [Fri, 26 Apr 2013 01:57:00 +0000 (01:57 +0000)]
Merge "fix javadoc build also add some docs to the service" into jb-mr2-dev

11 years agoMerge "Hide isLinkedUser()" into jb-mr2-dev
Amith Yamasani [Fri, 26 Apr 2013 01:42:20 +0000 (01:42 +0000)]
Merge "Hide isLinkedUser()" into jb-mr2-dev

11 years agoMerge "Added flush() for bluetooth output stream" into jb-mr2-dev
Matthew Xie [Fri, 26 Apr 2013 01:18:33 +0000 (01:18 +0000)]
Merge "Added flush() for bluetooth output stream" into jb-mr2-dev

11 years agoRevert change f449c0c381239dc0f78b0f01ecfb3889e056a597.
Alan Viverette [Fri, 26 Apr 2013 00:32:45 +0000 (17:32 -0700)]
Revert change f449c0c381239dc0f78b0f01ecfb3889e056a597.

Previously, onHoverEvent() would return true if a view was hoverable
and consume the event. After the change, it would return the result of
dispatchGenericMotionEventInternal(). As a result, touch exploration
caused multiple hover events to be sent from every view under a given
touch point. This change reverts to the original behavior and fixes
touch exploration.

BUG: 8723842
Change-Id: I0c7362f19c51bf21ed842711a03b7f02613958d2

11 years agoam 071c78e0: am e00a3b80: Merge "Don\'t set ADDR_COMPAT_LAYOUT on the emulator" into...
Nick Kralevich [Fri, 26 Apr 2013 00:14:36 +0000 (17:14 -0700)]
am 071c78e0: am e00a3b80: Merge "Don\'t set ADDR_COMPAT_LAYOUT on the emulator" into jb-mr2-dev

* commit '071c78e0070f4add5b811b1abccc9e6f6f312276':
  Don't set ADDR_COMPAT_LAYOUT on the emulator