OSDN Git Service

android-x86/frameworks-base.git
9 years agoAdd LayoutLibDelegate for new Bitmap method.
Deepanshu Gupta [Thu, 21 May 2015 23:03:24 +0000 (16:03 -0700)]
Add LayoutLibDelegate for new Bitmap method.

Original method added in: 721ae5fec5f1fd4f93aa2a361a0ac298e15ce353

Change-Id: Ie14d132459638cf103c390fae3f4c0c02bef2f34

9 years agoMerge "Fix phone account component name for voicemail status entries." into mnc-dev
Nancy Chen [Thu, 21 May 2015 22:01:33 +0000 (22:01 +0000)]
Merge "Fix phone account component name for voicemail status entries." into mnc-dev

9 years agoMerge "Do not clear IMM#mCurRootView in IMM#finishInputLocked()." into mnc-dev
Yohei Yukawa [Thu, 21 May 2015 21:47:33 +0000 (21:47 +0000)]
Merge "Do not clear IMM#mCurRootView in IMM#finishInputLocked()." into mnc-dev

9 years agoDo not clear IMM#mCurRootView in IMM#finishInputLocked().
Yohei Yukawa [Thu, 21 May 2015 07:15:05 +0000 (00:15 -0700)]
Do not clear IMM#mCurRootView in IMM#finishInputLocked().

This is a follow up CL for I219394178e4172bc47864297f1418e677dba.

As explained in the commit message of I219394178e4172bc47864297f,
IMM#mCurRootView needs to be synchronized with the actual window
focus more precisely to fix Bug 20820914. Hence we should not
clear IMM#mCurRootView in IMM#finishInputLocked() anymore.
Ideally this CL should have been included in the previous CL.

Manually tested following scenarios.
- Repro steps in Bug 6413553.  Made sure that IMM#mCurRootView
  is cleared after switching back from the current application to
  the previous application with back key.
- Test application that calls WebView#showFindDialog(). Made sure
  that LatinIME works fine when switching text fields.  This is
  non-trivial because android.webkit.FindActionModeCallback is
  changed in the previous CL I219394178e4172bc47864297f1418e677db.
- Repro steps in Bug 21144633.  Made sure that we can enter
  recipient's name in the messaging app.

This CL depends on I219394178e4172bc47864297f1418e677dba25e5.

Bug: 20820914
Change-Id: Id6afc8fc64512225578c62557b96c7dc2e969adf

9 years agoAlways tell Keyguard about occluded state
Jorim Jaggi [Thu, 21 May 2015 00:20:40 +0000 (17:20 -0700)]
Always tell Keyguard about occluded state

If there was a window with FLAG_DISMISS_KEYGUARD first, when the
device was unlocked, mWinDismissingKeyguard was set to that window.

Now, a window with FLAG_SHOW_WHEN_LOCKED came on top, so we set the
Keyguard as occluded, but we didn't reset the window that is
dismissing Keyguard.

After that, the old window with FLAG_DISMISS_KEYGUARD was the focused
window again. However, since we didn't reset mWinDismissingKeyguard,
we ended up with DISMISS_KEYGUARD_CONTINUE, and lockscreen was not
occluded anymore. However, we never really told Keyguard about it
because DISMISS_KEYGUARD_CONTINUE was set instead of
DISMISS_KEYGUARD_START.

The first fix of this bug is to always tell Keyguard about the
current occluded state. The second fix is to reset
mWinDismissingKeyguard in case a window SHOW_WHEN_LOCKED comes on top.

Bug: 20102975
Change-Id: I7c778df09a1e393b9eeaf51fd2013012cb40fea9

9 years agoKeep status bar visible when animating in negative heights
Jorim Jaggi [Thu, 21 May 2015 01:42:16 +0000 (18:42 -0700)]
Keep status bar visible when animating in negative heights

So we don't accidentally invoke bouncer and introduce jank
when expanding again.

Bug: 18502113
Change-Id: I0206cf1f48779d0d0fc661cb27852e2d202245ba

9 years agoMerge "[mnc-dev] Hide list/grid menu items for copy dest action...in mnc-dev!" into...
Steve McKay [Thu, 21 May 2015 20:27:36 +0000 (20:27 +0000)]
Merge "[mnc-dev] Hide list/grid menu items for copy dest action...in mnc-dev!" into mnc-dev

9 years agoMerge "Close race condition in binderDied()" into mnc-dev
Christopher Tate [Thu, 21 May 2015 20:27:11 +0000 (20:27 +0000)]
Merge "Close race condition in binderDied()" into mnc-dev

9 years ago[mnc-dev] Hide list/grid menu items for copy dest action...in mnc-dev!
Steve McKay [Wed, 20 May 2015 21:07:22 +0000 (14:07 -0700)]
[mnc-dev] Hide list/grid menu items for copy dest action...in mnc-dev!

BUG=21259006
Change-Id: Ic31dfa1a1cffa4340769c08db3e3cb3fb46e31d5
(cherry picked from commit e04e02d027b731448d68995a202c8867c4985fa3)

9 years agoFix phone account component name for voicemail status entries.
Nancy Chen [Tue, 19 May 2015 03:12:21 +0000 (20:12 -0700)]
Fix phone account component name for voicemail status entries.

Currently was using toString(), switch to "flattenToString" so it is
consistent with the call log.

Bug: 20954214

Change-Id: Ia9ed67bf463e4a2d4d9a02e00243d49238be17fe

9 years agoMerge "Fix overflow in NinePatchImpl." into mnc-dev
Leon Scroggins III [Thu, 21 May 2015 19:05:45 +0000 (19:05 +0000)]
Merge "Fix overflow in NinePatchImpl." into mnc-dev

9 years agoMerge "Add documentation about hack in commit: f8ea750455" into mnc-dev
Deepanshu Gupta [Thu, 21 May 2015 18:59:30 +0000 (18:59 +0000)]
Merge "Add documentation about hack in commit: f8ea750455" into mnc-dev

9 years agoFixed a bug where a notification could get below the empty shade view
Selim Cinek [Thu, 21 May 2015 05:13:55 +0000 (22:13 -0700)]
Fixed a bug where a notification could get below the empty shade view

This lead to a temporary flash when a notification came in with
the empty shade view being visible.

Bug: 20972545
Change-Id: I2b06f63dd43bf53bb2d1da0cddb635a709663f71

9 years agoAdd documentation about hack in commit: f8ea750455
Deepanshu Gupta [Thu, 21 May 2015 18:47:36 +0000 (11:47 -0700)]
Add documentation about hack in commit: f8ea750455

Change-Id: I9ce871a67fb67e02e0c4df1eb5c3261ea52a914b

9 years agoProtecting against the correct flag for the input consumer
Selim Cinek [Thu, 21 May 2015 05:48:40 +0000 (22:48 -0700)]
Protecting against the correct flag for the input consumer

Also allow hiding the navbar if immersive or immersivesticky.

Bug: 21089476
Change-Id: I540e668746056a0e4bb077898792afd225e4e19e

9 years agoMerge "Add debug for bug 21055376." into mnc-dev
Craig Mautner [Thu, 21 May 2015 18:34:31 +0000 (18:34 +0000)]
Merge "Add debug for bug 21055376." into mnc-dev

9 years agoMerge "Camera2: Fix spelling mistake" into mnc-dev
Eino-Ville Talvala [Thu, 21 May 2015 18:15:29 +0000 (18:15 +0000)]
Merge "Camera2: Fix spelling mistake" into mnc-dev

9 years agoAdd debug for bug 21055376.
Craig Mautner [Thu, 21 May 2015 18:12:51 +0000 (11:12 -0700)]
Add debug for bug 21055376.

Change-Id: I1e93fb225f2639af031cdfa748a7898f31ad5a94

9 years agoCamera2: Fix spelling mistake
Eino-Ville Talvala [Thu, 21 May 2015 18:10:51 +0000 (11:10 -0700)]
Camera2: Fix spelling mistake

Change-Id: I8c764d4c2ada34b126cb0097e8eefb710a08e310

9 years agoMerge "Camera2: Fix CaptureRequest @see links" into mnc-dev
Eino-Ville Talvala [Thu, 21 May 2015 18:09:37 +0000 (18:09 +0000)]
Merge "Camera2: Fix CaptureRequest @see links" into mnc-dev

9 years agoMerge "Add intents for enabling phone accounts." into mnc-dev
Santos Cordon [Thu, 21 May 2015 17:32:36 +0000 (17:32 +0000)]
Merge "Add intents for enabling phone accounts." into mnc-dev

9 years agoMerge "Cleanup Keystore API" into mnc-dev
Chad Brubaker [Thu, 21 May 2015 17:26:43 +0000 (17:26 +0000)]
Merge "Cleanup Keystore API" into mnc-dev

9 years agoMerge "Update the documentation for ActionMode.Callback2#onGetContentRect" into mnc-dev
Clara Bayarri [Thu, 21 May 2015 17:24:12 +0000 (17:24 +0000)]
Merge "Update the documentation for ActionMode.Callback2#onGetContentRect" into mnc-dev

9 years agoMerge "Fix application moves." into mnc-dev
Narayan Kamath [Thu, 21 May 2015 17:23:15 +0000 (17:23 +0000)]
Merge "Fix application moves." into mnc-dev

9 years agoUpdate the documentation for ActionMode.Callback2#onGetContentRect
Clara Bayarri [Thu, 21 May 2015 16:45:19 +0000 (17:45 +0100)]
Update the documentation for ActionMode.Callback2#onGetContentRect

Received feedback from a team that it was not clear what the rect
had to include.

Change-Id: I03ca54ee1092e8af3a2078c42104e1ce88490cd1

9 years agoMerge "Extra for ACTION_RINGTONE_PICKER for AudioAttributes flags" into mnc-dev
Jean-Michel Trivi [Thu, 21 May 2015 16:24:00 +0000 (16:24 +0000)]
Merge "Extra for ACTION_RINGTONE_PICKER for AudioAttributes flags" into mnc-dev

9 years agoMerge "Test for non-null AudioTrack() object in android_media_AudioTrack_setOutputDev...
Paul McLean [Thu, 21 May 2015 16:21:47 +0000 (16:21 +0000)]
Merge "Test for non-null AudioTrack() object in android_media_AudioTrack_setOutputDevice()." into mnc-dev

9 years agoFix overflow in NinePatchImpl.
Leon Scroggins III [Thu, 21 May 2015 13:48:15 +0000 (09:48 -0400)]
Fix overflow in NinePatchImpl.

Cast numXDivs to a size_t before adding 1, so that if numXDivs is 255
it does not overflow. Move the calculation outside of alloca().

BUG:20727488
Change-Id: I2ecc9d650338acba7316554cb72195e02816b1f8

9 years agoTest for non-null AudioTrack() object in android_media_AudioTrack_setOutputDevice().
Paul McLean [Thu, 21 May 2015 15:51:18 +0000 (08:51 -0700)]
Test for non-null AudioTrack() object in android_media_AudioTrack_setOutputDevice().

Change-Id: Ibf77bb0757720aa25eaaf6e603ab446257430453

9 years agoMerge "Fix reading attributes for playback restrictions" into mnc-dev
Jean-Michel Trivi [Thu, 21 May 2015 16:16:10 +0000 (16:16 +0000)]
Merge "Fix reading attributes for playback restrictions" into mnc-dev

9 years agoMerge "Do not show soft keyboard when locked out on keyguard UI" into mnc-dev
Xiyuan Xia [Thu, 21 May 2015 16:15:50 +0000 (16:15 +0000)]
Merge "Do not show soft keyboard when locked out on keyguard UI" into mnc-dev

9 years agoMerge "AudioService: indicate system ready to AudioFlinger" into mnc-dev
Eric Laurent [Thu, 21 May 2015 16:13:02 +0000 (16:13 +0000)]
Merge "AudioService: indicate system ready to AudioFlinger" into mnc-dev

9 years agoMerge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Thu, 21 May 2015 13:28:23 +0000 (13:28 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev

9 years agoMerge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Thu, 21 May 2015 13:22:40 +0000 (13:22 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev

9 years agoFix application moves.
Narayan Kamath [Thu, 21 May 2015 09:50:35 +0000 (10:50 +0100)]
Fix application moves.

We don't dex2oat during application moves, so we must scan
the package again scanPackageDirtyLI to deduce its ABI.

This is unnecessary (since a move cannot change ABIs), but we
need some additional refactoring to avoid a second scan.

bug: 21337469

Change-Id: I3e9dfd5db1c928847f9d527dc15d29a05ff40e7d

9 years agoMerge "Import translations. DO NOT MERGE" into mnc-dev
Baligh Uddin [Thu, 21 May 2015 13:20:17 +0000 (13:20 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev

9 years agoMerge "Import translations. DO NOT MERGE" into mnc-dev
Baligh Uddin [Thu, 21 May 2015 13:20:20 +0000 (13:20 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev

9 years agoMerge "Import translations. DO NOT MERGE" into mnc-dev
Baligh Uddin [Thu, 21 May 2015 13:20:14 +0000 (13:20 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev

9 years agoMerge "Import translations. DO NOT MERGE" into mnc-dev
Baligh Uddin [Thu, 21 May 2015 13:20:11 +0000 (13:20 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Thu, 21 May 2015 13:17:30 +0000 (06:17 -0700)]
Import translations. DO NOT MERGE

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

9 years agoMerge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Thu, 21 May 2015 13:16:22 +0000 (13:16 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Thu, 21 May 2015 13:13:24 +0000 (06:13 -0700)]
Import translations. DO NOT MERGE

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

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Thu, 21 May 2015 13:10:03 +0000 (06:10 -0700)]
Import translations. DO NOT MERGE

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

9 years agoLinkProperties function to compare provisioning and remove DNS servers
Erik Kline [Thu, 21 May 2015 07:15:02 +0000 (16:15 +0900)]
LinkProperties function to compare provisioning and remove DNS servers

Adds:
    - enum ProvisioningChange
    - LinkProperties#compareProvisioning()
          return a ProvisioningChange value describing the delta in
          provisioning between two LinkProperties objects
    - LinkProperties#removeDnsServer()
    - make "@hide public" isIPv4Provisioned() and isIPv6Provisioned()

Bug: 18581716
Change-Id: I3df90b2b89617f693346f2dbe72e77c88ce91ffd

9 years agoMerge "TIF: Build the list of available TV inputs as the current user" into mnc-dev
Jae Seo [Thu, 21 May 2015 05:27:06 +0000 (05:27 +0000)]
Merge "TIF: Build the list of available TV inputs as the current user" into mnc-dev

9 years agoImport translations. DO NOT MERGE
Baligh Uddin [Thu, 21 May 2015 04:59:08 +0000 (21:59 -0700)]
Import translations. DO NOT MERGE

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

9 years agoImport translations. DO NOT MERGE
Baligh Uddin [Thu, 21 May 2015 04:54:23 +0000 (21:54 -0700)]
Import translations. DO NOT MERGE

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

9 years agoTIF: Build the list of available TV inputs as the current user
Jae Seo [Thu, 21 May 2015 04:51:16 +0000 (21:51 -0700)]
TIF: Build the list of available TV inputs as the current user

Bug: 21313985
Change-Id: I8aa881570915d14d63e4ac0b8034044f8736443b

9 years agoImport translations. DO NOT MERGE
Baligh Uddin [Thu, 21 May 2015 04:51:28 +0000 (21:51 -0700)]
Import translations. DO NOT MERGE

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

9 years agoImport translations. DO NOT MERGE
Baligh Uddin [Thu, 21 May 2015 04:49:20 +0000 (21:49 -0700)]
Import translations. DO NOT MERGE

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

9 years agoMerge "Fix docs to not refer to non-public classes." into mnc-dev
Chet Haase [Thu, 21 May 2015 04:47:40 +0000 (04:47 +0000)]
Merge "Fix docs to not refer to non-public classes." into mnc-dev

9 years agoMerge "Fix: Crash when modifying text while using drag accelerator." into mnc-dev
Keisuke Kuroyanagi [Thu, 21 May 2015 04:07:55 +0000 (04:07 +0000)]
Merge "Fix: Crash when modifying text while using drag accelerator." into mnc-dev

9 years agoMerge "Volume: Include a11y bit in dialog dump." into mnc-dev
John Spurlock [Thu, 21 May 2015 03:35:11 +0000 (03:35 +0000)]
Merge "Volume: Include a11y bit in dialog dump." into mnc-dev

9 years agoVolume: Include a11y bit in dialog dump.
John Spurlock [Thu, 21 May 2015 03:33:43 +0000 (23:33 -0400)]
Volume: Include a11y bit in dialog dump.

Bug: 21340132
Change-Id: Ie9a347e7e0f08c7019b4a483a3a87a8cba6f37da

9 years agoExtra for ACTION_RINGTONE_PICKER for AudioAttributes flags
Jean-Michel Trivi [Thu, 21 May 2015 02:14:45 +0000 (19:14 -0700)]
Extra for ACTION_RINGTONE_PICKER for AudioAttributes flags

Add EXTRA_RINGTONE_AUDIO_ATTRIBUTES_FLAGS to allow specifying
  AudioAttributes flags that will be used when playing the
  Ringtone.

Bug 19407114

Change-Id: I56a77d7308b21afc0766356e1b6a2d76dca21221

9 years agoMerge "Fix overrides for BridgeResources." into mnc-dev
Deepanshu Gupta [Thu, 21 May 2015 01:50:22 +0000 (01:50 +0000)]
Merge "Fix overrides for BridgeResources." into mnc-dev

9 years agoFix overrides for BridgeResources.
Deepanshu Gupta [Thu, 21 May 2015 01:25:58 +0000 (18:25 -0700)]
Fix overrides for BridgeResources.

New method overloads have been introduces in android.content.Resources.
Change BridgeResources to overrides the appropriate ones. Also, fix the
implementation to the new behaviour.

Change-Id: I7b83b329f04286512f223c0fafc3f989f1b9a244

9 years agoMerge "Make DatePicker rendering not fail." into mnc-dev
Deepanshu Gupta [Thu, 21 May 2015 01:47:13 +0000 (01:47 +0000)]
Merge "Make DatePicker rendering not fail." into mnc-dev

9 years agoDo not show soft keyboard when locked out on keyguard UI
Xiyuan Xia [Tue, 19 May 2015 22:00:41 +0000 (15:00 -0700)]
Do not show soft keyboard when locked out on keyguard UI

- Split password entry enabled and input enabled into two states;
- Disable input during lock check;
- Disable password entry when locked out;
- Don't show soft keyboard if password entry is disabled on resume;
- Auto show soft keyboard when password entry becomes enabled;

Bug:20542149
Change-Id: Iffe3f205776143ac21e25e337d5b7a0e6994ebf2

9 years agoScan at boot time to detect newly-present full backup candidates
Christopher Tate [Wed, 20 May 2015 21:49:38 +0000 (14:49 -0700)]
Scan at boot time to detect newly-present full backup candidates

OTA or similar might have caused an app to appear without the usual
notifications being sent.  Make sure we pick up those apps as
appropriate for full-data backup.

Bug 19462310

Change-Id: Ic17bc72b14cc7599ae8ea540548fda932606b8f2

9 years agoFix docs to not refer to non-public classes.
Chet Haase [Thu, 21 May 2015 00:42:27 +0000 (17:42 -0700)]
Fix docs to not refer to non-public classes.

Issue #21328285 public Midi docs refer to internal utility class

Change-Id: Idddd5c98a78159190c6c34b17350f4630c33d6d5

9 years agoMerge "Fix ObservableScrollView's cancel dispatch" into mnc-dev
Adrian Roos [Thu, 21 May 2015 01:12:58 +0000 (01:12 +0000)]
Merge "Fix ObservableScrollView's cancel dispatch" into mnc-dev

9 years agoFix ObservableScrollView's cancel dispatch
Adrian Roos [Thu, 21 May 2015 01:08:58 +0000 (18:08 -0700)]
Fix ObservableScrollView's cancel dispatch

Bug: 21239185
Change-Id: I8005556a2a6fcd8981e615a6f5537a1d7e9ce6a7

9 years agoMake DatePicker rendering not fail.
Deepanshu Gupta [Thu, 21 May 2015 01:01:48 +0000 (18:01 -0700)]
Make DatePicker rendering not fail.

Ensures that having a DatePicker in the layout doesn't crash the
complete rendering. The rendering is still not perfect, but at least it
works.

- Return a non-null window token so that ViewPager thinks that it's
  attached to a window and doesn't skip populating the views.
- Fix a style not found issue.

Change-Id: Ied2b71de5b32bcb640bf4ec445e8a39509f800e9

9 years agoMerge "Move from native FingerprintService implementation to fingerprintd" into mnc-dev
Jim Miller [Thu, 21 May 2015 00:57:26 +0000 (00:57 +0000)]
Merge "Move from native FingerprintService implementation to fingerprintd" into mnc-dev

9 years agoAudioService: indicate system ready to AudioFlinger
Eric Laurent [Wed, 20 May 2015 21:49:08 +0000 (14:49 -0700)]
AudioService: indicate system ready to AudioFlinger

Indicate when JAVA services are ready to AudioFlinger so that
calls to power manager and scheduling service can be enabled.

Bug: 11520969.
Change-Id: Id977cab3208c34709011703d2dfdcf552e60371b

9 years agoMerge "Do not call out of the settings provider with a lock held" into mnc-dev
Svetoslav [Thu, 21 May 2015 00:35:12 +0000 (00:35 +0000)]
Merge "Do not call out of the settings provider with a lock held" into mnc-dev

9 years agoDo not call out of the settings provider with a lock held
Svetoslav [Thu, 21 May 2015 00:01:10 +0000 (17:01 -0700)]
Do not call out of the settings provider with a lock held

bug:20443441

Change-Id: I704520b75f5deaeeb1b4098cda0783c667e8cdd1

9 years agoMerge "Use screen-on time and wallclock time for idleness calc" into mnc-dev
Amith Yamasani [Thu, 21 May 2015 00:10:12 +0000 (00:10 +0000)]
Merge "Use screen-on time and wallclock time for idleness calc" into mnc-dev

9 years agoMerge "Use non deprecated method for creating ColorStateList" into mnc-dev
Deepanshu Gupta [Thu, 21 May 2015 00:03:05 +0000 (00:03 +0000)]
Merge "Use non deprecated method for creating ColorStateList" into mnc-dev

9 years agoMerge "Avoid resuming activity before launch." into mnc-dev
Craig Mautner [Thu, 21 May 2015 00:01:58 +0000 (00:01 +0000)]
Merge "Avoid resuming activity before launch." into mnc-dev

9 years agoAdd intents for enabling phone accounts.
Santos Cordon [Wed, 20 May 2015 23:55:59 +0000 (16:55 -0700)]
Add intents for enabling phone accounts.

Bug: 20303449
Change-Id: If0057d42373b6964193c562ae8a8487a0299da76

9 years agoUse non deprecated method for creating ColorStateList
Deepanshu Gupta [Wed, 20 May 2015 23:49:42 +0000 (16:49 -0700)]
Use non deprecated method for creating ColorStateList

Change-Id: I9fce928276c8a2af55eb0615a4895abb6a973be5

9 years agoFix line breaking.
Deepanshu Gupta [Wed, 20 May 2015 23:47:06 +0000 (16:47 -0700)]
Fix line breaking.

Essentially moves line breaking measurement later in the process when
character widths have already been computed.

Change-Id: I17c5bc10d373d8906c5caf86604ce8504650cd7f

9 years agoMerge "Inject anonymous inner classes of injected classes" into mnc-dev
Deepanshu Gupta [Wed, 20 May 2015 23:32:03 +0000 (23:32 +0000)]
Merge "Inject anonymous inner classes of injected classes" into mnc-dev

9 years agoInject anonymous inner classes of injected classes
Deepanshu Gupta [Wed, 20 May 2015 21:51:37 +0000 (14:51 -0700)]
Inject anonymous inner classes of injected classes

When injecting classes in LayoutLib (eg. CreateInfo), so that LayoutLib
can refer back to the changes, also inject the anonymous inner classes.
Without this, the injected classes are not loadable. Although, LayoutLib
itself doesn't load these classes, but some tests do.

Change-Id: Ib5f6b779ef4d79dec8d614d3dbb26eeac88a1064

9 years agoMerge "Update platformDir search in tests." into mnc-dev
Deepanshu Gupta [Wed, 20 May 2015 23:30:10 +0000 (23:30 +0000)]
Merge "Update platformDir search in tests." into mnc-dev

9 years agoMerge "Fix AudioTrack, AudioRecord, AudioFormat API" into mnc-dev
Andy Hung [Wed, 20 May 2015 23:01:37 +0000 (23:01 +0000)]
Merge "Fix AudioTrack, AudioRecord, AudioFormat API" into mnc-dev

9 years agoFix AudioTrack, AudioRecord, AudioFormat API
Andy Hung [Tue, 19 May 2015 22:44:31 +0000 (15:44 -0700)]
Fix AudioTrack, AudioRecord, AudioFormat API

Rename getNativeFrameCount to getBufferSizeInFrames
Remove throw declaration on IllegalArgumentException and
IllegalStateException

Bug: 20887665
Bug: 21304902
Change-Id: Ia85d8010be46524b9a8b93105b16b7b9480f6bd9

9 years agoUse screen-on time and wallclock time for idleness calc
Amith Yamasani [Tue, 19 May 2015 23:51:30 +0000 (16:51 -0700)]
Use screen-on time and wallclock time for idleness calc

12 hours of screen-on time and 2 days of wallclock time
must elapse before considering an app idle.

Bug: 20066058
Change-Id: Ie7b584b40e644d868aa2708876723c3391fd432e

9 years agoAvoid resuming activity before launch.
Craig Mautner [Wed, 20 May 2015 21:59:57 +0000 (14:59 -0700)]
Avoid resuming activity before launch.

The locktask logic would always bring a locked task to the front and
then resume it when locking. When a task is to be locked at launch that
would cause it to resume immediately before onLaunch was called. Which
would cause havoc because the token was not yet in
ActivityThread.mActivities. This lead to premature finish() calls and
looping restarts.

This change causes the resume to only be called when an app calls
startLockTask. Otherwise the resume call is skipped.

Plus additional locktask debug logging.

Fixes bug 21031298.

Change-Id: I756b0d607827d0ec7a123377db04d9377c41776d

9 years agoam 782def77: am 80cf2210: Add config_forceVoiceInteractionServicePackage to allow...
Cedric Ho [Wed, 20 May 2015 22:22:23 +0000 (22:22 +0000)]
am 782def77: am 80cf2210: Add config_forceVoiceInteractionServicePackage to allow a device to config its VoiceInteractionService package and ignore the regular setting.

* commit '782def772adacaf029d7d9850605923066665424':
  Add config_forceVoiceInteractionServicePackage to allow a device to config its VoiceInteractionService package and ignore the regular setting.

9 years agoMerge "Fixed that touches where incorrectly consumed when fullscreen" into mnc-dev
Selim Cinek [Wed, 20 May 2015 22:21:37 +0000 (22:21 +0000)]
Merge "Fixed that touches where incorrectly consumed when fullscreen" into mnc-dev

9 years agoFixed that touches where incorrectly consumed when fullscreen
Selim Cinek [Wed, 20 May 2015 01:08:14 +0000 (18:08 -0700)]
Fixed that touches where incorrectly consumed when fullscreen

The fake window that was added when View.SYSTEM_UI_FULL_SCREEN was
set consumed all touches, even those going to the SystemUI and not
just those of windows below. The input consumer is now correctly
positioned in the window order to only capture the right touches.
Clicks to the volume panel and the heads up now correctly go to the
right place instead of just unhiding the SystemUI bars.

Bug: 21089476
Change-Id: Ib53dfc0b33b70084ca607d0f044db30b6e6c91d6

9 years agoMerge "Clean RenderScript warnings" into mnc-dev
Jean-Luc Brouillet [Wed, 20 May 2015 22:17:11 +0000 (22:17 +0000)]
Merge "Clean RenderScript warnings" into mnc-dev

9 years agoam 80cf2210: Add config_forceVoiceInteractionServicePackage to allow a device to...
Cedric Ho [Wed, 20 May 2015 21:56:27 +0000 (21:56 +0000)]
am 80cf2210: Add config_forceVoiceInteractionServicePackage to allow a device to config its VoiceInteractionService package and ignore the regular setting.

* commit '80cf2210226bc652181abafe606b69ebce63af78':
  Add config_forceVoiceInteractionServicePackage to allow a device to config its VoiceInteractionService package and ignore the regular setting.

9 years agoMove from native FingerprintService implementation to fingerprintd
Jim Miller [Tue, 12 May 2015 03:45:25 +0000 (20:45 -0700)]
Move from native FingerprintService implementation to fingerprintd

This adds a new service, fingerprintd, that manages fingerprint
hardware from a separate process.  It provides a binder interface that
FingerprintManager uses to talk to the fingerprint HAL.

Change-Id: I84d8e407c1f1a7d1a396e246c382459ad38810ae

9 years agoMerge "Eliminate requireGlContext" into mnc-dev
John Reck [Wed, 20 May 2015 21:38:56 +0000 (21:38 +0000)]
Merge "Eliminate requireGlContext" into mnc-dev

9 years agoMerge "Add Carrier Presence to CP2: Phone" into mnc-dev
Etan Cohen [Wed, 20 May 2015 21:37:37 +0000 (21:37 +0000)]
Merge "Add Carrier Presence to CP2: Phone" into mnc-dev

9 years agoAdjust clock size to spec
Jorim Jaggi [Wed, 20 May 2015 21:30:47 +0000 (14:30 -0700)]
Adjust clock size to spec

Bug: 21111048
Change-Id: I73c6e57421dec4d929e5f87d812b5c2c495d250d

9 years agoMerge "Update the Statement Service. DO NOT MERGE" into mnc-dev
Joseph Wen [Wed, 20 May 2015 21:19:17 +0000 (21:19 +0000)]
Merge "Update the Statement Service. DO NOT MERGE" into mnc-dev

9 years agoMerge "LCE feature enhancement" into mnc-dev
fenglu [Wed, 20 May 2015 21:09:07 +0000 (21:09 +0000)]
Merge "LCE feature enhancement" into mnc-dev

9 years agoFix reading attributes for playback restrictions
Jean-Michel Trivi [Wed, 20 May 2015 20:58:18 +0000 (13:58 -0700)]
Fix reading attributes for playback restrictions

Playback restrictions can be lifted with the correct flag,
  FLAG_BYPASS_INTERRUPTION_POLICY, but this flag is for the
  system only. As such, it must be read by querying "all
  the flags" with AudioAttributes.getAllFlags() which is a
  system API which returns all the system flags. getFlags()
  only returns the public SDK flags.

Bug 19407114

Change-Id: I22dadfaf5d1b48b3c0754e1e6af00b734d790fec

9 years agoAdd config_forceVoiceInteractionServicePackage to allow a device to config its VoiceI...
Cedric Ho [Tue, 19 May 2015 22:44:31 +0000 (15:44 -0700)]
Add config_forceVoiceInteractionServicePackage to allow a device to config its VoiceInteractionService package and ignore the regular setting.

Change-Id: Ic40d90f1a7a9942f5e82080668552239bbed9b03

9 years agoMerge "camera: Add AIDL interface for CameraServiceProxy." into mnc-dev
Ruben Brunk [Wed, 20 May 2015 20:44:26 +0000 (20:44 +0000)]
Merge "camera: Add AIDL interface for CameraServiceProxy." into mnc-dev

9 years agoClean RenderScript warnings
Jean-Luc Brouillet [Tue, 19 May 2015 21:59:42 +0000 (14:59 -0700)]
Clean RenderScript warnings

Change-Id: Ia7a98c1c977c839c74ae8081e70b5deb4b60c25d

9 years agoUpdate the Statement Service. DO NOT MERGE
Joseph Wen [Thu, 23 Apr 2015 19:45:07 +0000 (15:45 -0400)]
Update the Statement Service. DO NOT MERGE

For security reason, disallow HTTP include files if the source asset is
a HTTPS site or an Android app.
Change the include statement field name from "delegate" to "include".

Bug: 20323096
Change-Id: Ifc12b61657c9c89a670b9d7c3220853321c15dea

9 years agoMerge "Allow DO/PO to go back to normal permission state." into mnc-dev
Svet Ganov [Wed, 20 May 2015 20:09:36 +0000 (20:09 +0000)]
Merge "Allow DO/PO to go back to normal permission state." into mnc-dev

9 years agoAllow DO/PO to go back to normal permission state.
Svet Ganov [Wed, 20 May 2015 17:45:43 +0000 (10:45 -0700)]
Allow DO/PO to go back to normal permission state.

We have APIs for a DO/PO to fix a permission in a granted or
denied state in which the user cannot manage this permission
through the UI. However, there is no way to go back to the
default state in which the user gets to choose the permission
grant state.

Change-Id: I2562a1d8b1385cd740b44812844ef14c895c2902

9 years agoLower fingerprint permission protection level
Jorim Jaggi [Wed, 20 May 2015 19:04:41 +0000 (12:04 -0700)]
Lower fingerprint permission protection level

Bug: 21307136
Change-Id: Iafdb42c6a82b27a5297ad14ffaa289b14fffad23