OSDN Git Service

android-x86/frameworks-base.git
9 years agoFloating toolbars: Add content rect related methods to API
Clara Bayarri [Wed, 25 Feb 2015 14:44:34 +0000 (14:44 +0000)]
Floating toolbars: Add content rect related methods to API

This CL adds the ActionMode.Callback2 abstract class and the rect
invalidate method needed to add the content rect API for Floating
Toolbars. It also extends the existing ActionModeCallbackWrapper in
DecorView to handle the case when ActionMode.Callback is provided
instead of Callback2, falling back to a default implementation.

Change-Id: Ia918ddfcfdf73d0e4cafd24c4a0573245d497cfe

9 years agoMerge "Expose isSystemImeThatHasSubtypeOf to Settings"
Yohei Yukawa [Fri, 13 Mar 2015 13:46:39 +0000 (13:46 +0000)]
Merge "Expose isSystemImeThatHasSubtypeOf to Settings"

9 years agoExpose isSystemImeThatHasSubtypeOf to Settings
Yohei Yukawa [Thu, 12 Mar 2015 06:31:25 +0000 (15:31 +0900)]
Expose isSystemImeThatHasSubtypeOf to Settings

This is a follow up CL for a recent attempt to minimize
the number of default enabled IMEs.
- part1: I831502db502f4073c9c2f50ce7705a4e45e2e1e3
- part2: Ife93d909fb8a24471c425c903e2b7048826e17a3
- part3: I6571d464a46453934f0a8f5e79018a67a9a3c845
- part4: I871ccda787eb0f1099ba3574356c1da4b33681f3

In the avobe CLs, an internal (hidden) method
InputMethodUtils.isValidSystemDefaultIme was marked as
deprecated and we decided to migrate to
InputMethodUtils.isSystemImeThatHasSubtypeOf.

To finish this refactoring, this CL make the new
method visible to the settings app.

InputMethodUtils.isValidSystemDefaultIme remains
to be an internal method. No behavior change is
intended.

Change-Id: I8cb9ca40d15af099c3d1ded46797fb57f14fb9e8

9 years agoMerge "Support a Primary and a Floating ActionMode in DecorView."
Clara Bayarri [Fri, 13 Mar 2015 12:17:35 +0000 (12:17 +0000)]
Merge "Support a Primary and a Floating ActionMode in DecorView."

9 years agoRefactor DisplayList path caching.
Derek Sollenberger [Thu, 12 Feb 2015 19:10:21 +0000 (14:10 -0500)]
Refactor DisplayList path caching.

This removes dependence on SkPath ptrs that HWUI does not control
the lifecycle of. This clears up some errors where the paths are
not generated from Java, but rather the Skia test suites.

Cherry-pick of a change that originally landed in master-skia and is
dependent on a skia merge (ag/655422).

Change-Id: I41b9797a2b0af5d6b4ea51891565469d4f1d832d

9 years agoFix use of SkMutex.
Leon Scroggins III [Tue, 10 Feb 2015 14:40:12 +0000 (09:40 -0500)]
Fix use of SkMutex.

Recent change to Skia moved SkMutex into its own header file. Include
it to use and SkMutex.

Use SK_DECLARE_STATIC_MUTEX to remove static initializer/finalizer.

Fixes master-skia build.

Change-Id: I2ab43c511587167b81310d5d55a65604d82761f5

9 years agoMerge "SkStream is no longer a ref counted object."
Derek Sollenberger [Fri, 13 Mar 2015 12:02:22 +0000 (12:02 +0000)]
Merge "SkStream is no longer a ref counted object."

9 years agoSupport a Primary and a Floating ActionMode in DecorView.
Clara Bayarri [Wed, 4 Mar 2015 17:10:57 +0000 (17:10 +0000)]
Support a Primary and a Floating ActionMode in DecorView.

This CL modifies the support for a single ActionMode in PhoneWindow.
DecorView to support both a Primary and a Floating ActionModes
simultaneously.

Things pending after this CL:
- Handling an actual Floating ActionMode
- Cleaning up the now unused ActionModeWrapper and its related code

Change-Id: Ie2e5ec27393ce9eededadf5bc379bab39981a365

9 years agoAdd a type parameter to startActionMode() calls.
Clara Bayarri [Mon, 2 Mar 2015 19:42:48 +0000 (19:42 +0000)]
Add a type parameter to startActionMode() calls.

This requires adding a new method to View and Window.Callback to pass
down the type as a parameter.

For compatibility purposes, the new method implementations keep the
type and call the old method, in case clients have subclassed it.

Change-Id: If5d857f131e33be8cc6a8814f2e9c4e85ad2da25

9 years agoam e8ef4af3: am 5be1afed: am 7151b1ef: am 98560bdf: am bfcc60a3: am 2825a9c6: am...
Craig Mautner [Fri, 13 Mar 2015 07:41:26 +0000 (07:41 +0000)]
am e8ef4af3: am 5be1afed: am 7151b1ef: am 98560bdf: am bfcc60a3: am 2825a9c6: am 470ad0fa: Merge "Correct docs to specify leading slash in paths." into lmp-docs

* commit 'e8ef4af3dfdf35d1094c57c79c84527310480d41':
  Correct docs to specify leading slash in paths.

9 years agoresolved conflicts for merge of 1d67698b to master
Andreas Gampe [Fri, 13 Mar 2015 07:17:40 +0000 (00:17 -0700)]
resolved conflicts for merge of 1d67698b to master

Change-Id: I866d342320c34e91494b4c70f27d0b79ec33358b

9 years agoam 2f952916: am 1b4933d1: Merge "Wait for visible wallpaper drawn before starting...
Olawale Ogunwale [Fri, 13 Mar 2015 07:09:55 +0000 (07:09 +0000)]
am 2f952916: am 1b4933d1: Merge "Wait for visible wallpaper drawn before starting app transitions"

* commit '2f9529168974fb6ca3a70372fd802e845e015bfd':
  Wait for visible wallpaper drawn before starting app transitions

9 years agoam 8a264dd2: am 07e01e07: am 11b6e235: am db56b5a6: Move Noto Sans Tai Le to the...
Roozbeh Pournader [Fri, 13 Mar 2015 07:08:55 +0000 (07:08 +0000)]
am 8a264dd2: am 07e01e07: am 11b6e235: am db56b5a6: Move Noto Sans Tai Le to the end of the font fallback list.

* commit '8a264dd289df13dfae7d5c89fc4b6f69b30230be':
  Move Noto Sans Tai Le to the end of the font fallback list.

9 years agoam 4a61eaf7: am 1c24b3f1: Merge "Fix build, broken by https://android-review.googleso...
Lorenzo Colitti [Fri, 13 Mar 2015 07:07:54 +0000 (07:07 +0000)]
am 4a61eaf7: am 1c24b3f1: Merge "Fix build, broken by https://android-review.googlesource.com/#/c/115890/"

* commit '4a61eaf784fb085e66a21e9e4d4fa8aeb6b41c2b':
  Fix build, broken by https://android-review.googlesource.com/#/c/115890/

9 years agoresolved conflicts for merge of b6b9fe21 to master
Andreas Gampe [Fri, 13 Mar 2015 06:49:15 +0000 (23:49 -0700)]
resolved conflicts for merge of b6b9fe21 to master

Change-Id: If4f62aa1fd8bb774288a677e7008e86a7e3ea6d9

9 years agoam a4277e14: am a4ed5e94: am e770c5e4: am c44430a3: Merge "Tools attribute improvemen...
Deepanshu Gupta [Fri, 13 Mar 2015 06:33:44 +0000 (06:33 +0000)]
am a4277e14: am a4ed5e94: am e770c5e4: am c44430a3: Merge "Tools attribute improvements for RecyclerView LayoutManager." into lmp-mr1-dev

* commit 'a4277e149355c53fde73a4e1ef44aa665af31cf0':
  Tools attribute improvements for RecyclerView LayoutManager.

9 years agoam 93d44992: am 1a27a3fb: am 46005888: am 0146922a: am 633f4829: am 7256fb4f: am...
Rich Slogar [Fri, 13 Mar 2015 06:33:26 +0000 (06:33 +0000)]
am 93d44992: am 1a27a3fb: am 46005888: am 0146922a: am 633f4829: am 7256fb4f: am a6b0ddb7: Merge "docs: build image updates" into lmp-docs

* commit '93d44992ecf41b8169391005f7d3d219785eef90':
  docs: build image updates

9 years agoam 3d024d4c: am 65215edd: am f0d324e5: am 71ba1230: am efc09c64: am 78660423: Merge...
Deepanshu Gupta [Fri, 13 Mar 2015 06:33:17 +0000 (06:33 +0000)]
am 3d024d4c: am 65215edd: am f0d324e5: am 71ba1230: am efc09c64: am 78660423: Merge "Fix cyclic dependency in BlendComposite and BlendingMode." into lmp-dev

* commit '3d024d4c22b896c95ef4c98610c3db7c58a639ed':
  Fix cyclic dependency in BlendComposite and BlendingMode.

9 years agoam fceec0e1: am c7fc094d: am d44af610: am b3cfb334: Merge "Fix rare NPE in BridgeCont...
Deepanshu Gupta [Fri, 13 Mar 2015 06:32:49 +0000 (06:32 +0000)]
am fceec0e1: am c7fc094d: am d44af610: am b3cfb334: Merge "Fix rare NPE in BridgeContext." into lmp-mr1-dev

* commit 'fceec0e124a55b25d59f2af5279c70ac045d6771':
  Fix rare NPE in BridgeContext.

9 years agoam ca9264ea: am a695f87d: am fa3c6650: am 71518174: Merge "Fix project settings....
Deepanshu Gupta [Fri, 13 Mar 2015 06:32:40 +0000 (06:32 +0000)]
am ca9264ea: am a695f87d: am fa3c6650: am 71518174: Merge "Fix project settings." into lmp-mr1-dev

* commit 'ca9264eab03cf787fb4dfc62a2313d9c3b45a05e':
  Fix project settings.

9 years agoresolved conflicts for merge of ef1741d2 to master
Andreas Gampe [Fri, 13 Mar 2015 06:10:53 +0000 (23:10 -0700)]
resolved conflicts for merge of ef1741d2 to master

Change-Id: I5379d5f756695f5176d92249ac6304bffcf95751

9 years agoresolved conflicts for merge of d93f4c8b to master
Andreas Gampe [Fri, 13 Mar 2015 05:51:01 +0000 (22:51 -0700)]
resolved conflicts for merge of d93f4c8b to master

Change-Id: Iec5cabbeb128a4696a8a670afbf2f4cb9ebdb2de

9 years agoam 26c95085: (-s ours) am cdd3fb5c: Merge "Extracted a separate class to run dexopt...
Andreas Gampe [Fri, 13 Mar 2015 03:20:32 +0000 (03:20 +0000)]
am 26c95085: (-s ours) am cdd3fb5c: Merge "Extracted a separate class to run dexopt on packages"

* commit '26c95085b37d8d1ddc25a8d4d50b54b0ae6242c9':
  Extracted a separate class to run dexopt on packages

9 years agoam bb8c910f: am d2e4a166: Merge "Remove dead path code"
Jason Sams [Fri, 13 Mar 2015 02:59:40 +0000 (02:59 +0000)]
am bb8c910f: am d2e4a166: Merge "Remove dead path code"

* commit 'bb8c910fc12f304c97c94ee86a3a3da56afe8374':
  Remove dead path code

9 years agoDon't allow clients to add FDs to Looper without callbacks.
Jeff Brown [Fri, 13 Mar 2015 02:36:28 +0000 (19:36 -0700)]
Don't allow clients to add FDs to Looper without callbacks.

Bug: 10349083
Change-Id: Ia75e37bb1055559f6442f97c42ec109078e737b6

9 years agoMerge "Don't run full backups until package metadata has been pushed"
Christopher Tate [Fri, 13 Mar 2015 01:27:33 +0000 (01:27 +0000)]
Merge "Don't run full backups until package metadata has been pushed"

9 years agoDon't run full backups until package metadata has been pushed
Christopher Tate [Fri, 13 Mar 2015 01:24:30 +0000 (18:24 -0700)]
Don't run full backups until package metadata has been pushed

Bug 19692849

Change-Id: I13615db7408b5c6fbc787c4773103c052e70f0b2

9 years agoMerge "Volume policy updates."
John Spurlock [Fri, 13 Mar 2015 00:59:33 +0000 (00:59 +0000)]
Merge "Volume policy updates."

9 years agoMerge "NetworkStatsService to adjust VPN stats before recording."
Wenchao Tong [Fri, 13 Mar 2015 00:54:07 +0000 (00:54 +0000)]
Merge "NetworkStatsService to adjust VPN stats before recording."

9 years agoam 5be1afed: am 7151b1ef: am 98560bdf: am bfcc60a3: am 2825a9c6: am 470ad0fa: Merge...
Craig Mautner [Fri, 13 Mar 2015 00:53:51 +0000 (00:53 +0000)]
am 5be1afed: am 7151b1ef: am 98560bdf: am bfcc60a3: am 2825a9c6: am 470ad0fa: Merge "Correct docs to specify leading slash in paths." into lmp-docs

* commit '5be1afedd8f2289ba047473b242cd0535a4493fe':
  Correct docs to specify leading slash in paths.

9 years agoam 7151b1ef: am 98560bdf: am bfcc60a3: am 2825a9c6: am 470ad0fa: Merge "Correct docs...
Craig Mautner [Fri, 13 Mar 2015 00:46:51 +0000 (00:46 +0000)]
am 7151b1ef: am 98560bdf: am bfcc60a3: am 2825a9c6: am 470ad0fa: Merge "Correct docs to specify leading slash in paths." into lmp-docs

* commit '7151b1ef4213207103a669602d6bb9502bc22a13':
  Correct docs to specify leading slash in paths.

9 years agoNetworkStatsService to adjust VPN stats before recording.
Wenchao Tong [Wed, 4 Mar 2015 21:26:38 +0000 (13:26 -0800)]
NetworkStatsService to adjust VPN stats before recording.

* Creates a new Parcelable class VpnInfo to hold required
  parameters for VPN stats adjustments.
* ConnectivityService to collect infomation and provide
  a list of VpnInfo, one for each user.
* NetworkStatsService passes the VpnInfo array to
  NetworkStatsRecorder.
* NetworkStatsRecorder calls NetworkStats.migrateTun()
  to do the math.
* Poll NetworkStats when the vpn application calls
  setUnderlyingNetworks().

Bug: 19536273
Change-Id: I7a4c7726b8243fead10416f7ec6eb5cf95f20183

9 years agoMerge "Add API for WebView OffscreenPreRaster setting."
Hui Shu [Fri, 13 Mar 2015 00:38:45 +0000 (00:38 +0000)]
Merge "Add API for WebView OffscreenPreRaster setting."

9 years agoam 98560bdf: am bfcc60a3: am 2825a9c6: am 470ad0fa: Merge "Correct docs to specify...
Craig Mautner [Fri, 13 Mar 2015 00:37:32 +0000 (00:37 +0000)]
am 98560bdf: am bfcc60a3: am 2825a9c6: am 470ad0fa: Merge "Correct docs to specify leading slash in paths." into lmp-docs

* commit '98560bdf87ad5f97054b13d3c92954132584c7f7':
  Correct docs to specify leading slash in paths.

9 years agoam bfcc60a3: am 2825a9c6: am 470ad0fa: Merge "Correct docs to specify leading slash...
Craig Mautner [Fri, 13 Mar 2015 00:29:21 +0000 (00:29 +0000)]
am bfcc60a3: am 2825a9c6: am 470ad0fa: Merge "Correct docs to specify leading slash in paths." into lmp-docs

* commit 'bfcc60a3f03ff25dccb5277626da213b1e254ccd':
  Correct docs to specify leading slash in paths.

9 years agoam 2825a9c6: am 470ad0fa: Merge "Correct docs to specify leading slash in paths....
Craig Mautner [Fri, 13 Mar 2015 00:22:33 +0000 (00:22 +0000)]
am 2825a9c6: am 470ad0fa: Merge "Correct docs to specify leading slash in paths." into lmp-docs

* commit '2825a9c618840c1cf3d59806a794674f12a7c7c6':
  Correct docs to specify leading slash in paths.

9 years agoam 470ad0fa: Merge "Correct docs to specify leading slash in paths." into lmp-docs
Craig Mautner [Fri, 13 Mar 2015 00:17:36 +0000 (00:17 +0000)]
am 470ad0fa: Merge "Correct docs to specify leading slash in paths." into lmp-docs

* commit '470ad0fa1c0a4047c0a4c3d132a9ec3106e447ba':
  Correct docs to specify leading slash in paths.

9 years agoMerge "Correct docs to specify leading slash in paths." into lmp-docs
Craig Mautner [Fri, 13 Mar 2015 00:09:30 +0000 (00:09 +0000)]
Merge "Correct docs to specify leading slash in paths." into lmp-docs

9 years agoam 6c881ec9: am 872a731e: am a0f20621: am dd7d025b: am ca0db1a0: am eeb79d10: am...
Luan Nguyen [Fri, 13 Mar 2015 00:03:06 +0000 (00:03 +0000)]
am 6c881ec9: am 872a731e: am a0f20621: am dd7d025b: am ca0db1a0: am eeb79d10: am 9a7238d8: Merge "Revert "docs: Update auto landing and design page image assets"" into lmp-docs

* commit '6c881ec9d588202172c45f3152c15fe0069b0ebb':
  Revert "docs: Update auto landing and design page image assets"

9 years agoresolved conflicts for merge of 42f55d1e to master
Marco Nelissen [Thu, 12 Mar 2015 23:17:45 +0000 (16:17 -0700)]
resolved conflicts for merge of 42f55d1e to master

Change-Id: I9c26861c5b0e26bb55e50b2133b7561348a01aec

9 years agoAdd API for WebView OffscreenPreRaster setting.
Hui Shu [Tue, 3 Mar 2015 19:38:41 +0000 (11:38 -0800)]
Add API for WebView OffscreenPreRaster setting.

BUG: 19592029
Change-Id: Ic903b823e5f7830e2cf2d4f3dd9a5458334648a3

9 years agoMerge "Protect against NPE for ActivityRecords without a stack."
Wale Ogunwale [Thu, 12 Mar 2015 22:31:04 +0000 (22:31 +0000)]
Merge "Protect against NPE for ActivityRecords without a stack."

9 years agoMerge "Revert "Revert "Remove activity and window stacks when last task is removed."""
Wale Ogunwale [Thu, 12 Mar 2015 22:30:48 +0000 (22:30 +0000)]
Merge "Revert "Revert "Remove activity and window stacks when last task is removed."""

9 years agoMerge "NetworkStats to support VPN accounting."
Wenchao Tong [Thu, 12 Mar 2015 22:10:55 +0000 (22:10 +0000)]
Merge "NetworkStats to support VPN accounting."

9 years agoProtect against NPE for ActivityRecords without a stack.
Wale Ogunwale [Wed, 11 Mar 2015 22:36:30 +0000 (15:36 -0700)]
Protect against NPE for ActivityRecords without a stack.

A previous change allowed us to remove stack that no longer contained
any task. This was causing some NPE when an ActivityRecord.Token or
some other cached ActivityRecord later gets converted back to an
ActivityRecord and we try to access its stack.

Bug: 19552874
Change-Id: Ie9454bbce56591b337f97af40f8c00b8597becdf

9 years agoMerge "Fix negative touch word offset that caused crashing when selecting text"
Roozbeh Pournader [Thu, 12 Mar 2015 21:45:21 +0000 (21:45 +0000)]
Merge "Fix negative touch word offset that caused crashing when selecting text"

9 years agoam 53729e29: Merge "Wait for opening apps ready before stopping freezing display"
Olawale Ogunwale [Thu, 12 Mar 2015 21:38:41 +0000 (21:38 +0000)]
am 53729e29: Merge "Wait for opening apps ready before stopping freezing display"

* commit '53729e2933540307b090e64ee89cbae26c67de8f':
  Wait for opening apps ready before stopping freezing display

9 years agoam 1b4933d1: Merge "Wait for visible wallpaper drawn before starting app transitions"
Olawale Ogunwale [Thu, 12 Mar 2015 21:38:30 +0000 (21:38 +0000)]
am 1b4933d1: Merge "Wait for visible wallpaper drawn before starting app transitions"

* commit '1b4933d10eea59b091f263ebb3723f4d59a85d2b':
  Wait for visible wallpaper drawn before starting app transitions

9 years agoam 07e01e07: am 11b6e235: am db56b5a6: Move Noto Sans Tai Le to the end of the font...
Roozbeh Pournader [Thu, 12 Mar 2015 21:33:35 +0000 (21:33 +0000)]
am 07e01e07: am 11b6e235: am db56b5a6: Move Noto Sans Tai Le to the end of the font fallback list.

* commit '07e01e07bbfffa9e247a54dd96b3013de46d59e7':
  Move Noto Sans Tai Le to the end of the font fallback list.

9 years agoam 3df87bac: am 5228d083: am 0c3282b5: am 50a9b835: am 42ee70aa: am 24b4e572: am...
Luan Nguyen [Thu, 12 Mar 2015 21:33:28 +0000 (21:33 +0000)]
am 3df87bac: am 5228d083: am 0c3282b5: am 50a9b835: am 42ee70aa: am 24b4e572: am 0fc17c37: Merge "docs: Update auto landing and design page image assets" into lmp-docs

* commit '3df87baca9b62acdd425ea2dc8ae390e311ae6a3':
  docs: Update auto landing and design page image assets

9 years agoam 964b4018: am 40055c22: am 11558e5d: am 8ab872db: am dcc5a34b: am 08ddf132: am...
Rich Slogar [Thu, 12 Mar 2015 21:33:21 +0000 (21:33 +0000)]
am 964b4018: am 40055c22: am 11558e5d: am 8ab872db: am dcc5a34b: am 08ddf132: am 0c1076b2: Merge "docs: eclipse revisions update" into lmp-docs

* commit '964b4018499a0e1a50364f81f576a7181252841a':
  docs: eclipse revisions update

9 years agoam fd9d8c7b: am e5fd6c76: am 3d950de4: am a493c489: am 5f8e08ed: am 66b4b317: am...
Andrew Solovay [Thu, 12 Mar 2015 21:33:14 +0000 (21:33 +0000)]
am fd9d8c7b: am e5fd6c76: am 3d950de4: am a493c489: am 5f8e08ed: am 66b4b317: am 0a3f9c7d: docs: Revisions to "Providing Messaging for Auto"

* commit 'fd9d8c7bcb81c31b7b43eb4f88ab8fc583ea9ac2':
  docs: Revisions to "Providing Messaging for Auto"

9 years agoMerge "Revert "Update ParcelFileDescriptor to use non-blocking I/O.""
Jeff Brown [Thu, 12 Mar 2015 21:25:39 +0000 (21:25 +0000)]
Merge "Revert "Update ParcelFileDescriptor to use non-blocking I/O.""

9 years agoRevert "Update ParcelFileDescriptor to use non-blocking I/O."
Jeff Brown [Thu, 12 Mar 2015 21:25:00 +0000 (21:25 +0000)]
Revert "Update ParcelFileDescriptor to use non-blocking I/O."

Bug: 19715279
This reverts commit a34a3bdcbf2e7057d294a8699bbe1be880500f6d.

Change-Id: Ief03dee1c0a2b4d906797a5c279663c17439c347

9 years agoMerge "Enforce null-termination in ResStringPool::stringAt"
Vishwath Mohan [Thu, 12 Mar 2015 21:17:48 +0000 (21:17 +0000)]
Merge "Enforce null-termination in ResStringPool::stringAt"

9 years agoMerge "Camera: add @hide API for setting camera rotation"
Yin-Chia Yeh [Thu, 12 Mar 2015 20:36:48 +0000 (20:36 +0000)]
Merge "Camera: add @hide API for setting camera rotation"

9 years agoam 276d1bc9: am a98c21a6: Make circular mask thickness configurable
Prashant Malani [Thu, 12 Mar 2015 20:31:52 +0000 (20:31 +0000)]
am 276d1bc9: am a98c21a6: Make circular mask thickness configurable

* commit '276d1bc929485e53ba4d4e93d4cc3ded3fcc2fc3':
  Make circular mask thickness configurable

9 years agoam e011eb4f: am dff0fdb4: Merge "Add translatable=false to dozeComponent" into lmp...
Justin Koh [Thu, 12 Mar 2015 20:31:41 +0000 (20:31 +0000)]
am e011eb4f: am dff0fdb4: Merge "Add translatable=false to dozeComponent" into lmp-mr1-modular-dev

* commit 'e011eb4ff9a082de69fea747141764de2f6f3dcc':
  Add translatable=false to dozeComponent

9 years agoSkStream is no longer a ref counted object.
Leon Scroggins III [Tue, 20 Jan 2015 20:52:43 +0000 (15:52 -0500)]
SkStream is no longer a ref counted object.

With https://codereview.chromium.org/849103004/, SkStream is no longer
ref counted. Change callers that currently unref() SkStreams to one of
either:
- delete the stream
- pass ownership of the stream

screencap.cpp:
Call EncodeData directly, bypassing SkDynamicMemoryWStream and SkBitmap.

Utils.cpp:
Write directly to an SkData, and then use that to construct a new
SkStream.

Cherry-pick of a change that originally landed in master-skia and is
dependent on a skia merge (ag/655422).

Change-Id: Idc99ad7d5a70c893dc012d59915216f301ab3c9d

9 years agoFix negative touch word offset that caused crashing when selecting text
Mady Mellor [Thu, 12 Mar 2015 18:01:43 +0000 (11:01 -0700)]
Fix negative touch word offset that caused crashing when selecting text

Previously the offset between the touch event and the start / end of
the word could result in a negative value - we don't care or want
this value to be negative. The negative value also causes the returned
offset to be outside the bounds of the text which resulted in a crash.

Bug: 19705184
Change-Id: I4287df7778c246dd10654f1a1f1e57538e940730

9 years agoMerge "drm: add EVENT_SESSION_RECLAIMED for resource manager."
Ronghua Wu [Thu, 12 Mar 2015 18:05:44 +0000 (18:05 +0000)]
Merge "drm: add EVENT_SESSION_RECLAIMED for resource manager."

9 years agoVolume policy updates.
John Spurlock [Tue, 3 Mar 2015 22:35:57 +0000 (17:35 -0500)]
Volume policy updates.

 - Make volume policy settable by the volume UI instead
   of hardcoded in AudioService.
 - Add status bar icon for silent mode.
 - Limit unmute-on-volume-adjust behavior to tvs.
 - Ensure all changes to device volume are sent through
   setIndex so no change events are missed.

Bug: 19260237
Change-Id: Iea070a7a6f90ff620e39629f2da3f33f87223d72

9 years agoam 11b6e235: am db56b5a6: Move Noto Sans Tai Le to the end of the font fallback list.
Roozbeh Pournader [Thu, 12 Mar 2015 17:52:54 +0000 (17:52 +0000)]
am 11b6e235: am db56b5a6: Move Noto Sans Tai Le to the end of the font fallback list.

* commit '11b6e2358aac68691f016fca07ee82be3e815f2b':
  Move Noto Sans Tai Le to the end of the font fallback list.

9 years agoam db56b5a6: Move Noto Sans Tai Le to the end of the font fallback list.
Roozbeh Pournader [Thu, 12 Mar 2015 17:43:42 +0000 (17:43 +0000)]
am db56b5a6: Move Noto Sans Tai Le to the end of the font fallback list.

* commit 'db56b5a681b097f7649937e8ad4d73c1e560fb3b':
  Move Noto Sans Tai Le to the end of the font fallback list.

9 years agoMerge "Wait for opening apps ready before stopping freezing display"
Olawale Ogunwale [Thu, 12 Mar 2015 16:51:17 +0000 (16:51 +0000)]
Merge "Wait for opening apps ready before stopping freezing display"

9 years agoMerge "Wait for visible wallpaper drawn before starting app transitions"
Olawale Ogunwale [Thu, 12 Mar 2015 16:22:07 +0000 (16:22 +0000)]
Merge "Wait for visible wallpaper drawn before starting app transitions"

9 years agoMove Noto Sans Tai Le to the end of the font fallback list.
Roozbeh Pournader [Wed, 11 Feb 2015 23:45:49 +0000 (15:45 -0800)]
Move Noto Sans Tai Le to the end of the font fallback list.

This is to make sure the East Asian punctuation shared between CJK languages
and Tai Le are rendered from the CJK fonts when no language is specified
for the text, or CJK text is rendered in a non-CJK locale.

Also remove the old comment about 64k glyphs limit.

Bug: 19355391
Change-Id: Ic2cbc79cecf9539ace8a432f373685eeff81e106
(cherry picked from commit 70f0a4365bbffd016470807c9dbd7e9c1ea2df9d)

9 years agoMerge "Allow polling for WindowInsets."
Filip Gruszczynski [Thu, 12 Mar 2015 15:12:43 +0000 (15:12 +0000)]
Merge "Allow polling for WindowInsets."

9 years agoMerge "AudioService: Write base stream volume changes to the event log."
John Spurlock [Thu, 12 Mar 2015 14:50:27 +0000 (14:50 +0000)]
Merge "AudioService: Write base stream volume changes to the event log."

9 years agoMerge "Make QS use SettingsLib's BT code"
Jason Monk [Thu, 12 Mar 2015 14:23:49 +0000 (14:23 +0000)]
Merge "Make QS use SettingsLib's BT code"

9 years agoAudioService: Write base stream volume changes to the event log.
John Spurlock [Tue, 10 Mar 2015 20:00:54 +0000 (16:00 -0400)]
AudioService: Write base stream volume changes to the event log.

 - Add a new volume_changed event, reported at the stream level.
 - Only include changes to base streams (no aliases).
 - Include the caller for each change.  A caller is either:
   -  a pkg name (for external calls or known media sessions)
   -  a system server class's log tag (for internal calls,
      disambiguates "android")

Bug: 19599935
Change-Id: Ia61b68ff1e7e2907a24972790ec052bfe099e665

9 years agoMerge "Make Bitmap_createFromParcel check the color count."
Leon Scroggins III [Thu, 12 Mar 2015 12:24:10 +0000 (12:24 +0000)]
Merge "Make Bitmap_createFromParcel check the color count."

9 years agoMove the "Replace" popup option to the Text Selection ActionMode.
Clara Bayarri [Mon, 2 Mar 2015 16:09:09 +0000 (16:09 +0000)]
Move the "Replace" popup option to the Text Selection ActionMode.

As a first step in unifying the cut/copy/paste ActionMode in Editor
with the paste/replace popup, I'm moving the replace option to
the CAB ActionMode. Paste is already there, so for now all options
are together.

Missing things to address in upcoming CLs:
- Invoke the ActionMode in all cases where the popup shows up now,
ensuring only the options that are currently available show up.
- Get rid of the current popup
- Make the ActionMode a floating toolbar (pending feature completion)
- Define a keyboard shortcut for replace?

Note that since the ActionMode still shows up in the ActionBar and
replace has no icon it now appears as text and takes up lots of
space. This will improve when we can switch to using a floating
toolbar.

Change-Id: Ib6b60bae9b58e4db96b9c4cee556e19d3f1bb466

9 years agoam 1c24b3f1: Merge "Fix build, broken by https://android-review.googlesource.com...
Lorenzo Colitti [Thu, 12 Mar 2015 08:00:53 +0000 (08:00 +0000)]
am 1c24b3f1: Merge "Fix build, broken by https://android-review.googlesource.com/#/c/115890/"

* commit '1c24b3f110e0521a3840c3dfce9a86343fa02672':
  Fix build, broken by https://android-review.googlesource.com/#/c/115890/

9 years agoMerge "Fix build, broken by https://android-review.googlesource.com/#/c/115890/"
Lorenzo Colitti [Thu, 12 Mar 2015 07:49:23 +0000 (07:49 +0000)]
Merge "Fix build, broken by https://android-review.googlesource.com/#/c/115890/"

9 years agoFix build, broken by https://android-review.googlesource.com/#/c/115890/
Lorenzo Colitti [Thu, 12 Mar 2015 07:48:12 +0000 (16:48 +0900)]
Fix build, broken by https://android-review.googlesource.com/#/c/115890/

Change-Id: Ieafa2fb0a7f539d8f933ad9c98e3be80457da6e5

9 years agoam 2f196e6c: Merge "Remove dead code, mostly DataStateTracker."
Lorenzo Colitti [Thu, 12 Mar 2015 07:38:50 +0000 (07:38 +0000)]
am 2f196e6c: Merge "Remove dead code, mostly DataStateTracker."

* commit '2f196e6c81e50b70d56c1cc06fd2aec147b58ed8':
  Remove dead code, mostly DataStateTracker.

9 years agoMerge "Remove dead code, mostly DataStateTracker."
Lorenzo Colitti [Thu, 12 Mar 2015 07:27:27 +0000 (07:27 +0000)]
Merge "Remove dead code, mostly DataStateTracker."

9 years agoam a4ed5e94: am e770c5e4: am c44430a3: Merge "Tools attribute improvements for Recycl...
Deepanshu Gupta [Thu, 12 Mar 2015 02:01:57 +0000 (02:01 +0000)]
am a4ed5e94: am e770c5e4: am c44430a3: Merge "Tools attribute improvements for RecyclerView LayoutManager." into lmp-mr1-dev

* commit 'a4ed5e94117a2c6c1734138faed09490245c602f':
  Tools attribute improvements for RecyclerView LayoutManager.

9 years agoam e770c5e4: am c44430a3: Merge "Tools attribute improvements for RecyclerView Layout...
Deepanshu Gupta [Thu, 12 Mar 2015 01:55:16 +0000 (01:55 +0000)]
am e770c5e4: am c44430a3: Merge "Tools attribute improvements for RecyclerView LayoutManager." into lmp-mr1-dev

* commit 'e770c5e45a139d709976f8c1dbb821733968b5a8':
  Tools attribute improvements for RecyclerView LayoutManager.

9 years agoam c44430a3: Merge "Tools attribute improvements for RecyclerView LayoutManager....
Deepanshu Gupta [Thu, 12 Mar 2015 01:41:57 +0000 (01:41 +0000)]
am c44430a3: Merge "Tools attribute improvements for RecyclerView LayoutManager." into lmp-mr1-dev

* commit 'c44430a36813dc4afb6000279254e578bc5d0391':
  Tools attribute improvements for RecyclerView LayoutManager.

9 years agoMerge "Add rename support to FingerprintManager"
Jim Miller [Thu, 12 Mar 2015 01:20:05 +0000 (01:20 +0000)]
Merge "Add rename support to FingerprintManager"

9 years agoAdd rename support to FingerprintManager
Jim Miller [Thu, 12 Mar 2015 00:41:58 +0000 (17:41 -0700)]
Add rename support to FingerprintManager

Bug 19592835

Change-Id: I656b3932caf2cfdb9a330522d171a59af2c7a2d1

9 years agoMerge "Tools attribute improvements for RecyclerView LayoutManager." into lmp-mr1-dev
Deepanshu Gupta [Thu, 12 Mar 2015 01:16:44 +0000 (01:16 +0000)]
Merge "Tools attribute improvements for RecyclerView LayoutManager." into lmp-mr1-dev

9 years agoam 1a27a3fb: am 46005888: am 0146922a: am 633f4829: am 7256fb4f: am a6b0ddb7: Merge...
Rich Slogar [Thu, 12 Mar 2015 01:14:21 +0000 (01:14 +0000)]
am 1a27a3fb: am 46005888: am 0146922a: am 633f4829: am 7256fb4f: am a6b0ddb7: Merge "docs: build image updates" into lmp-docs

* commit '1a27a3fb4eceefcf412218d73de0cff0cc68c67d':
  docs: build image updates

9 years agoam 65215edd: am f0d324e5: am 71ba1230: am efc09c64: am 78660423: Merge "Fix cyclic...
Deepanshu Gupta [Thu, 12 Mar 2015 01:08:57 +0000 (01:08 +0000)]
am 65215edd: am f0d324e5: am 71ba1230: am efc09c64: am 78660423: Merge "Fix cyclic dependency in BlendComposite and BlendingMode." into lmp-dev

* commit '65215edd7acada70c2bcb060daec6ff718ae92ba':
  Fix cyclic dependency in BlendComposite and BlendingMode.

9 years agoam 46005888: am 0146922a: am 633f4829: am 7256fb4f: am a6b0ddb7: Merge "docs: build...
Rich Slogar [Thu, 12 Mar 2015 01:07:20 +0000 (01:07 +0000)]
am 46005888: am 0146922a: am 633f4829: am 7256fb4f: am a6b0ddb7: Merge "docs: build image updates" into lmp-docs

* commit '4600588868b7df38084915793db8eeb38e90ca5a':
  docs: build image updates

9 years agoam f0d324e5: am 71ba1230: am efc09c64: am 78660423: Merge "Fix cyclic dependency...
Deepanshu Gupta [Thu, 12 Mar 2015 00:59:39 +0000 (00:59 +0000)]
am f0d324e5: am 71ba1230: am efc09c64: am 78660423: Merge "Fix cyclic dependency in BlendComposite and BlendingMode." into lmp-dev

* commit 'f0d324e531e395674f71b3944623bd17fe74b372':
  Fix cyclic dependency in BlendComposite and BlendingMode.

9 years agoam 0146922a: am 633f4829: am 7256fb4f: am a6b0ddb7: Merge "docs: build image updates...
Rich Slogar [Thu, 12 Mar 2015 00:59:35 +0000 (00:59 +0000)]
am 0146922a: am 633f4829: am 7256fb4f: am a6b0ddb7: Merge "docs: build image updates" into lmp-docs

* commit '0146922a6fee8af01ffd6ea201cbb6de0dbd4ed8':
  docs: build image updates

9 years agoam c7fc094d: am d44af610: am b3cfb334: Merge "Fix rare NPE in BridgeContext." into...
Deepanshu Gupta [Thu, 12 Mar 2015 00:56:52 +0000 (00:56 +0000)]
am c7fc094d: am d44af610: am b3cfb334: Merge "Fix rare NPE in BridgeContext." into lmp-mr1-dev

* commit 'c7fc094d319998572087e983e21c62de9f318139':
  Fix rare NPE in BridgeContext.

9 years agoam a695f87d: am fa3c6650: am 71518174: Merge "Fix project settings." into lmp-mr1-dev
Deepanshu Gupta [Thu, 12 Mar 2015 00:56:47 +0000 (00:56 +0000)]
am a695f87d: am fa3c6650: am 71518174: Merge "Fix project settings." into lmp-mr1-dev

* commit 'a695f87db757e89ee99d3c672037b479dce3e4e7':
  Fix project settings.

9 years agoam 05cba2f8: am 338a5a88: am b171be1a: Merge "Add RecyclerView support." into lmp...
Deepanshu Gupta [Thu, 12 Mar 2015 00:56:41 +0000 (00:56 +0000)]
am 05cba2f8: am 338a5a88: am b171be1a: Merge "Add RecyclerView support." into lmp-mr1-dev

* commit '05cba2f8acd88d40e1bb149915fe590d4a21b74d':
  Add RecyclerView support.

9 years agoam 71ba1230: am efc09c64: am 78660423: Merge "Fix cyclic dependency in BlendComposite...
Deepanshu Gupta [Thu, 12 Mar 2015 00:52:53 +0000 (00:52 +0000)]
am 71ba1230: am efc09c64: am 78660423: Merge "Fix cyclic dependency in BlendComposite and BlendingMode." into lmp-dev

* commit '71ba12308e338595d8068ff788bb5c8abfcfe515':
  Fix cyclic dependency in BlendComposite and BlendingMode.

9 years agoam 633f4829: am 7256fb4f: am a6b0ddb7: Merge "docs: build image updates" into lmp...
Rich Slogar [Thu, 12 Mar 2015 00:52:49 +0000 (00:52 +0000)]
am 633f4829: am 7256fb4f: am a6b0ddb7: Merge "docs: build image updates" into lmp-docs

* commit '633f482907d6c9cce672341f0d0a4d6c5c2b7f78':
  docs: build image updates

9 years agoam 7256fb4f: am a6b0ddb7: Merge "docs: build image updates" into lmp-docs
Rich Slogar [Thu, 12 Mar 2015 00:45:40 +0000 (00:45 +0000)]
am 7256fb4f: am a6b0ddb7: Merge "docs: build image updates" into lmp-docs

* commit '7256fb4fdd088cd0a827452cbdd8bd243da00881':
  docs: build image updates

9 years agoam efc09c64: am 78660423: Merge "Fix cyclic dependency in BlendComposite and Blending...
Deepanshu Gupta [Thu, 12 Mar 2015 00:45:40 +0000 (00:45 +0000)]
am efc09c64: am 78660423: Merge "Fix cyclic dependency in BlendComposite and BlendingMode." into lmp-dev

* commit 'efc09c644fa4e8354d54485aab6c0b18868284eb':
  Fix cyclic dependency in BlendComposite and BlendingMode.

9 years agoam d44af610: am b3cfb334: Merge "Fix rare NPE in BridgeContext." into lmp-mr1-dev
Deepanshu Gupta [Thu, 12 Mar 2015 00:45:35 +0000 (00:45 +0000)]
am d44af610: am b3cfb334: Merge "Fix rare NPE in BridgeContext." into lmp-mr1-dev

* commit 'd44af6108b18f3de05ed3f61d056d9c5b36ff8be':
  Fix rare NPE in BridgeContext.

9 years agoam fa3c6650: am 71518174: Merge "Fix project settings." into lmp-mr1-dev
Deepanshu Gupta [Thu, 12 Mar 2015 00:45:31 +0000 (00:45 +0000)]
am fa3c6650: am 71518174: Merge "Fix project settings." into lmp-mr1-dev

* commit 'fa3c665019ace11140b3c5677d02c9711fc4d86d':
  Fix project settings.

9 years agoam 338a5a88: am b171be1a: Merge "Add RecyclerView support." into lmp-mr1-dev
Deepanshu Gupta [Thu, 12 Mar 2015 00:45:27 +0000 (00:45 +0000)]
am 338a5a88: am b171be1a: Merge "Add RecyclerView support." into lmp-mr1-dev

* commit '338a5a88fe8ecf8a724fcfaa2888a7c0fe53cb34':
  Add RecyclerView support.

9 years agoam b3cfb334: Merge "Fix rare NPE in BridgeContext." into lmp-mr1-dev
Deepanshu Gupta [Thu, 12 Mar 2015 00:39:25 +0000 (00:39 +0000)]
am b3cfb334: Merge "Fix rare NPE in BridgeContext." into lmp-mr1-dev

* commit 'b3cfb334893a0b302cd6a0a998f27ca2e8ba7f9d':
  Fix rare NPE in BridgeContext.