OSDN Git Service

android-x86/frameworks-base.git
8 years agoMerge "Clean up updating bounds after config/display info change" into nyc-dev
Jorim Jaggi [Thu, 28 Apr 2016 06:03:49 +0000 (06:03 +0000)]
Merge "Clean up updating bounds after config/display info change" into nyc-dev

8 years agoMerge "Fix API review comments, add remove callback." into nyc-dev
Martijn Coenen [Thu, 28 Apr 2016 05:34:03 +0000 (05:34 +0000)]
Merge "Fix API review comments, add remove callback." into nyc-dev

8 years agoMerge "Make isCaptivePortal perform both HTTP and HTTPS probes." into nyc-dev
TreeHugger Robot [Thu, 28 Apr 2016 04:01:09 +0000 (04:01 +0000)]
Merge "Make isCaptivePortal perform both HTTP and HTTPS probes." into nyc-dev

8 years agoMerge changes Idb555b01,If8acf31b into nyc-dev
TreeHugger Robot [Thu, 28 Apr 2016 03:58:45 +0000 (03:58 +0000)]
Merge changes Idb555b01,If8acf31b into nyc-dev

* changes:
  Show forced resizable based on top activity
  Don't move forced resizable info activity to the front

8 years agoClean up updating bounds after config/display info change
Jorim Jaggi [Thu, 28 Apr 2016 03:37:45 +0000 (20:37 -0700)]
Clean up updating bounds after config/display info change

We always update the display info before handling the configuration
change. Thus, we remove this weird interleaving asynchronous beast
of code and handle rotation and density in updateBoundsAfterConfigChange
and everything else in updateDisplayInfo.

Sending an asynchronous message to resize the stack only causes race
condition and issues.

Change-Id: Ifa86f62e816917822a8c1d42d13d4bf1ad9bc5bf
Fixes: 28316517
Bug: 28184044

8 years agoMerge "Don't wait for visible if there is no running activity left." into nyc-dev
Chong Zhang [Thu, 28 Apr 2016 03:40:59 +0000 (03:40 +0000)]
Merge "Don't wait for visible if there is no running activity left." into nyc-dev

8 years agoMerge "Do not add duplicates to mWaitingVisibleActivities" into nyc-dev
Chong Zhang [Thu, 28 Apr 2016 03:25:48 +0000 (03:25 +0000)]
Merge "Do not add duplicates to mWaitingVisibleActivities" into nyc-dev

8 years agoShow forced resizable based on top activity
Jorim Jaggi [Wed, 27 Apr 2016 22:40:20 +0000 (15:40 -0700)]
Show forced resizable based on top activity

Also don't show it for noDisplay activities.

Bug: 28223489
Change-Id: Idb555b019b5cebdcf16a0cfaa19d64263874735f

8 years agoMake isCaptivePortal perform both HTTP and HTTPS probes.
Lorenzo Colitti [Tue, 19 Apr 2016 12:57:31 +0000 (21:57 +0900)]
Make isCaptivePortal perform both HTTP and HTTPS probes.

Also a couple of minor cleanups and logging tweaks.

Bug: 26075613
Change-Id: I67b09e96d72764179339b616072bb2ce06aabf33

8 years agoDon't move forced resizable info activity to the front
Jorim Jaggi [Wed, 27 Apr 2016 05:41:06 +0000 (22:41 -0700)]
Don't move forced resizable info activity to the front

If we start the forced resizable activity with an existing task,
avoid moving that task to the front. This can cause that a previous
task that was moved to the back gets moved to the front again just
because we started that activity. That's not good.

Bug: 28223489
Change-Id: If8acf31b8be98b82665de1015d5621331c37fb64

8 years agoMerge "Fix contrast enforcement for RemoteInputView" into nyc-dev
TreeHugger Robot [Thu, 28 Apr 2016 01:33:41 +0000 (01:33 +0000)]
Merge "Fix contrast enforcement for RemoteInputView" into nyc-dev

8 years agoMerge "Some cleanup for <uses-library> change." into nyc-dev
Jeff Hao [Thu, 28 Apr 2016 01:31:14 +0000 (01:31 +0000)]
Merge "Some cleanup for <uses-library> change." into nyc-dev

8 years agoDon't wait for visible if there is no running activity left.
Chong Zhang [Wed, 27 Apr 2016 21:11:12 +0000 (14:11 -0700)]
Don't wait for visible if there is no running activity left.

We could run into this situation on some devices (eg. clockworks),
the next activity doesn't get launched until we destroy this one.

allResumedActivitiesVisible() will return false if there is no other
activity running at all. Check top running activity and it's visibility
instead.

bug: 28400334
Change-Id: Ib8957e499580a10206fdd4e27da19fbc2bdb5843

8 years agoMerge "Fix docs build by adding include <endian.h>" into nyc-dev
Peng Xu [Thu, 28 Apr 2016 01:13:43 +0000 (01:13 +0000)]
Merge "Fix docs build by adding include <endian.h>" into nyc-dev

8 years agoMerge "Fix issue #28431297: Crash in system process" into nyc-dev
Dianne Hackborn [Thu, 28 Apr 2016 01:07:24 +0000 (01:07 +0000)]
Merge "Fix issue #28431297: Crash in system process" into nyc-dev

8 years agoMerge "Fixed a crash when the transformed view was updated while dragging" into nyc-dev
TreeHugger Robot [Thu, 28 Apr 2016 01:05:23 +0000 (01:05 +0000)]
Merge "Fixed a crash when the transformed view was updated while dragging" into nyc-dev

8 years agoMerge "Apply restored wallpaper via API rather than rename-into-place" into nyc-dev
Chris Tate [Thu, 28 Apr 2016 00:56:00 +0000 (00:56 +0000)]
Merge "Apply restored wallpaper via API rather than rename-into-place" into nyc-dev

8 years agoMerge "Make sure FIRST_LAUNCH is after PACKAGE_ADDED" into nyc-dev
Chris Tate [Thu, 28 Apr 2016 00:40:59 +0000 (00:40 +0000)]
Merge "Make sure FIRST_LAUNCH is after PACKAGE_ADDED" into nyc-dev

8 years agoDo not add duplicates to mWaitingVisibleActivities
Chong Zhang [Thu, 28 Apr 2016 00:29:28 +0000 (17:29 -0700)]
Do not add duplicates to mWaitingVisibleActivities

processStoppingActivitiesLocked() only removes one record each time, so
instead of stopping on the next window visible (or next idle), it now
requires two such calls to move the app to destroyed, if there's only
one report, the app never gets removed.

bug: 28417200

Change-Id: I7c5eac240074ed0434a72643a8d52f1726ab906c

8 years agoMerge "Fix NPE when WindowManagerDebugConfig.DEBUG_SCREENSHOT is true" into nyc-dev
Jaewan Kim [Thu, 28 Apr 2016 00:10:59 +0000 (00:10 +0000)]
Merge "Fix NPE when WindowManagerDebugConfig.DEBUG_SCREENSHOT is true" into nyc-dev

8 years agoFix contrast enforcement for RemoteInputView
Adrian Roos [Wed, 27 Apr 2016 23:34:35 +0000 (16:34 -0700)]
Fix contrast enforcement for RemoteInputView

Previously, the disabled color was used for the contrast
calculations, which resulted in too dark RemoteInputView
backgrounds.

Change-Id: I99e8b2fa64a22a59fdc5d1be8a6aff5af3523a27
Fixes: 28429720

8 years agoMerge "Add a security warning to PdfRenderer doc." into nyc-dev
TreeHugger Robot [Thu, 28 Apr 2016 00:06:02 +0000 (00:06 +0000)]
Merge "Add a security warning to PdfRenderer doc." into nyc-dev

8 years agoFix issue #28431297: Crash in system process
Dianne Hackborn [Thu, 28 Apr 2016 00:03:52 +0000 (17:03 -0700)]
Fix issue #28431297: Crash in system process

Don't allow null URIs to get put into the notification path.

Change-Id: I4f68f438960c8a90c7b417feaa2e19968a3a200a

8 years agoMerge "RemoteInput: add logging and metrics" into nyc-dev
Adrian Roos [Thu, 28 Apr 2016 00:03:01 +0000 (00:03 +0000)]
Merge "RemoteInput: add logging and metrics" into nyc-dev

8 years agoMerge "Prevent dismissal on RemoteInputView" into nyc-dev
Adrian Roos [Thu, 28 Apr 2016 00:02:43 +0000 (00:02 +0000)]
Merge "Prevent dismissal on RemoteInputView" into nyc-dev

8 years agoMerge "Fixes 2 race conditions in MetricsLoggerService" into nyc-dev
Hugo Benichi [Wed, 27 Apr 2016 23:50:45 +0000 (23:50 +0000)]
Merge "Fixes 2 race conditions in MetricsLoggerService" into nyc-dev

8 years agoMerge "zygote: Remove NativeLoader initialization step" into nyc-dev
Dimitry Ivanov [Wed, 27 Apr 2016 23:37:10 +0000 (23:37 +0000)]
Merge "zygote: Remove NativeLoader initialization step" into nyc-dev

8 years agoMerge "Add low power stats to batteryhistory" into nyc-dev
Badhri Jagan Sridharan [Wed, 27 Apr 2016 23:32:16 +0000 (23:32 +0000)]
Merge "Add low power stats to batteryhistory" into nyc-dev

8 years agoFixed a crash when the transformed view was updated while dragging
Selim Cinek [Wed, 27 Apr 2016 01:17:57 +0000 (18:17 -0700)]
Fixed a crash when the transformed view was updated while dragging

The transformed view could get updated during the transition
leading to a crash sometimes. We're now handling this better and
make sure the correct values are set.

Change-Id: I1a311cb7c108afeec0fc1c92eb3359c622db7b87
Fixes: 27922191

8 years agoMerge "Fix MessagingStyle HUNs" into nyc-dev
Adrian Roos [Wed, 27 Apr 2016 23:17:06 +0000 (23:17 +0000)]
Merge "Fix MessagingStyle HUNs" into nyc-dev

8 years agoApply restored wallpaper via API rather than rename-into-place
Christopher Tate [Wed, 27 Apr 2016 22:47:13 +0000 (15:47 -0700)]
Apply restored wallpaper via API rather than rename-into-place

This plays nicer with SELinux and generally means we can be more robust
about file security policies.

Bug 28403975

Change-Id: I857ee7073c0090c7515421f41c9334025e25bc79

8 years agoMerge "fix recursion for config change" into nyc-dev
Keun-young Park [Wed, 27 Apr 2016 23:04:49 +0000 (23:04 +0000)]
Merge "fix recursion for config change" into nyc-dev

8 years agoMerge "Broadcast USER_INITIALIZE after user is unlocked" into nyc-dev
Fyodor Kupolov [Wed, 27 Apr 2016 23:02:08 +0000 (23:02 +0000)]
Merge "Broadcast USER_INITIALIZE after user is unlocked" into nyc-dev

8 years agoFixed translations so that they become translatable
Selim Cinek [Wed, 27 Apr 2016 01:28:56 +0000 (18:28 -0700)]
Fixed translations so that they become translatable

Change-Id: I0b97327b44ca5a09dd925ad34e99684eeed59639
Fixes: 28375835

8 years agoMerge "Fixed a bug where the media template wasn't transforming right" into nyc-dev
Selim Cinek [Wed, 27 Apr 2016 23:00:04 +0000 (23:00 +0000)]
Merge "Fixed a bug where the media template wasn't transforming right" into nyc-dev

8 years agoMerge "Fixed a crash where the overflow number wasn't initialized" into nyc-dev
Selim Cinek [Wed, 27 Apr 2016 22:59:40 +0000 (22:59 +0000)]
Merge "Fixed a crash where the overflow number wasn't initialized" into nyc-dev

8 years agoMerge "Handle empty bigTexts more gracefully" into nyc-dev
Selim Cinek [Wed, 27 Apr 2016 22:58:57 +0000 (22:58 +0000)]
Merge "Handle empty bigTexts more gracefully" into nyc-dev

8 years agoMerge "Fix several accessibility magnification issues." into nyc-dev
Phil Weaver [Wed, 27 Apr 2016 22:50:34 +0000 (22:50 +0000)]
Merge "Fix several accessibility magnification issues." into nyc-dev

8 years agoSome cleanup for <uses-library> change.
Jeff Hao [Wed, 27 Apr 2016 22:50:16 +0000 (15:50 -0700)]
Some cleanup for <uses-library> change.

Addresses comments made in:
https://googleplex-android-review.git.corp.google.com/#/c/976512

Bug: 26880306
Change-Id: I382fb39f3bb5de5a03506f5526d909cf55530542

8 years agoFix docs build by adding include <endian.h>
Peng Xu [Wed, 27 Apr 2016 21:49:25 +0000 (14:49 -0700)]
Fix docs build by adding include <endian.h>

Added endian.h into include list to avoid build error in "docs".
The function "htobe64" in endian.h is used.

Change-Id: Ic76dab25d34c56b58b97849dfa7b103963392568

8 years agofix recursion for config change
Keun-young Park [Wed, 27 Apr 2016 22:02:07 +0000 (15:02 -0700)]
fix recursion for config change

- update mTempConfig from mCurConfig first to decide if
  config is changed or not. This fixes recursion of putting
  new config again from reconfigureDisplay
- ignore setNewConfiguration if there is no change in configuration
  This fixes another recursion due to config change -> app restart
  loop

bug: 28381048

Change-Id: I4c2e6072b269baf9fa11d4b8073f0800c0e0d28d

8 years agoMerge "Tethering and Data Saver: There Can Be Only One!" into nyc-dev
TreeHugger Robot [Wed, 27 Apr 2016 22:41:11 +0000 (22:41 +0000)]
Merge "Tethering and Data Saver: There Can Be Only One!" into nyc-dev

8 years agoMerge "Fixed that notifications didn't fade away when brightness changed" into nyc-dev
Selim Cinek [Wed, 27 Apr 2016 22:38:35 +0000 (22:38 +0000)]
Merge "Fixed that notifications didn't fade away when brightness changed" into nyc-dev

8 years agoMerge "Don't lose content change during rollback for loader already started" into...
TreeHugger Robot [Wed, 27 Apr 2016 22:25:37 +0000 (22:25 +0000)]
Merge "Don't lose content change during rollback for loader already started" into nyc-dev

8 years agoMerge "Fix remote input view clobbering" into nyc-dev
TreeHugger Robot [Wed, 27 Apr 2016 22:17:32 +0000 (22:17 +0000)]
Merge "Fix remote input view clobbering" into nyc-dev

8 years agoMake sure FIRST_LAUNCH is after PACKAGE_ADDED
Christopher Tate [Tue, 26 Apr 2016 00:08:56 +0000 (17:08 -0700)]
Make sure FIRST_LAUNCH is after PACKAGE_ADDED

If an app undergoes restore during install, it is considered 'started'
and the FIRST_LAUNCH broadcast needs to go out.  However, this must not
take place until after the restore operation has fully completed, in
order to avoid publishing the app's existence while it may still be in
an incoherent state.  We now make this broadcast part of POST_INSTALL
in the restore case.

Bundled apps are in the 'started' state regardless, so no FIRST_LAUNCH
broadcast is ever sent for them -- this CL does not change that
existing behavior even in the case of setup-time data restore of
factory-installed packages.

Bug 28173625

Change-Id: Ibcc3758576662dc447b75476173a0d008a9fe4da

8 years agoAdd a security warning to PdfRenderer doc.
Philip P. Moltmann [Wed, 27 Apr 2016 21:54:27 +0000 (14:54 -0700)]
Add a security warning to PdfRenderer doc.

Change-Id: Ia714d312665179366adae8e1923e4b9c339ebb59

8 years agoMerge "Always account for divider height when calculating list height" into nyc-dev
Alan Viverette [Wed, 27 Apr 2016 21:50:46 +0000 (21:50 +0000)]
Merge "Always account for divider height when calculating list height" into nyc-dev

8 years agoMerge "Support zero-length paths for a11y gestures." into nyc-dev
TreeHugger Robot [Wed, 27 Apr 2016 21:48:05 +0000 (21:48 +0000)]
Merge "Support zero-length paths for a11y gestures." into nyc-dev

8 years agoMerge "Add a 1st-time dialog for Data Saver title." into nyc-dev
TreeHugger Robot [Wed, 27 Apr 2016 21:42:04 +0000 (21:42 +0000)]
Merge "Add a 1st-time dialog for Data Saver title." into nyc-dev

8 years agoMerge "Fix crash when docking." into nyc-dev
Rob Carr [Wed, 27 Apr 2016 21:36:50 +0000 (21:36 +0000)]
Merge "Fix crash when docking." into nyc-dev

8 years agoMerge "Merge changes If868f090,I3b7c39c4,I0c2152ed,I79796636,I6dc87bac, ... into...
Android Build Merger (Role) [Wed, 27 Apr 2016 21:30:07 +0000 (21:30 +0000)]
Merge "Merge changes If868f090,I3b7c39c4,I0c2152ed,I79796636,I6dc87bac, ... into mnc-ub-dev am: 171a1c2" into nyc-dev

8 years agoMerge "Merge changes I4bf40d49,I8c1b82f0,I6128b520,Icf1428e3,I44704847, ... into...
Android Build Merger (Role) [Wed, 27 Apr 2016 21:29:57 +0000 (21:29 +0000)]
Merge "Merge changes I4bf40d49,I8c1b82f0,I6128b520,Icf1428e3,I44704847, ... into mnc-ub-dev am: 7659acc" into nyc-dev

8 years agoMerge "typo am: de6fde7 am: 55ba523 am: aaf1d09 am: 044913e" into nyc-dev
Android Build Merger (Role) [Wed, 27 Apr 2016 21:29:46 +0000 (21:29 +0000)]
Merge "typo am: de6fde7 am: 55ba523 am: aaf1d09 am: 044913e" into nyc-dev

8 years agoMerge "typo am: 3517069 am: 76f95c2 am: 7432ecf" into nyc-dev
Android Build Merger (Role) [Wed, 27 Apr 2016 21:29:33 +0000 (21:29 +0000)]
Merge "typo am: 3517069 am: 76f95c2 am: 7432ecf" into nyc-dev

8 years agoMerge "Merge "Docs: Gradle 2.1.0 Release Notes" into mnc-docs am: aa53fb1 am: c49e787...
Android Build Merger (Role) [Wed, 27 Apr 2016 21:29:22 +0000 (21:29 +0000)]
Merge "Merge "Docs: Gradle 2.1.0 Release Notes" into mnc-docs am: aa53fb1 am: c49e787 am: 4defc19 am: c070811" into nyc-dev

8 years agoMerge "Update the N Preview docs now that Studio 2.1 is stable. bug: 28342771 am...
Android Build Merger (Role) [Wed, 27 Apr 2016 21:29:11 +0000 (21:29 +0000)]
Merge "Update the N Preview docs now that Studio 2.1 is stable. bug: 28342771 am: 96e6abb am: 39a59d0 am: 86c6f97 am: c7984b5" into nyc-dev

8 years agoMerge "Android Studio 2.1 release notes and downloads. am: 8e48332 am: beab847 am...
Android Build Merger (Role) [Wed, 27 Apr 2016 21:29:00 +0000 (21:29 +0000)]
Merge "Android Studio 2.1 release notes and downloads. am: 8e48332 am: beab847 am: 6461bca am: 7499bc7" into nyc-dev

8 years agoMerge "Merge "Android Studio 2.1 release notes and downloads." into mnc-mr-docs am...
Android Build Merger (Role) [Wed, 27 Apr 2016 21:28:49 +0000 (21:28 +0000)]
Merge "Merge "Android Studio 2.1 release notes and downloads." into mnc-mr-docs am: c939dd0 am: 19f9481 am: 88b2780" into nyc-dev

8 years agoMerge "Merge "Remove static _book.yaml in favor of generated version (samples_navtree...
Android Build Merger (Role) [Wed, 27 Apr 2016 21:28:37 +0000 (21:28 +0000)]
Merge "Merge "Remove static _book.yaml in favor of generated version (samples_navtree_data.cs)." into mnc-mr-docs am: 2974e94 am: 1c1a85bc am: 61a6d2f" into nyc-dev

8 years agoMerge "Merge "docs: Added entry in USB vendor ID table for HP." into mnc-docs am...
Android Build Merger (Role) [Wed, 27 Apr 2016 21:28:26 +0000 (21:28 +0000)]
Merge "Merge "docs: Added entry in USB vendor ID table for HP." into mnc-docs am: b8767b7 am: 599796e am: f2f64b7 am: c78400e" into nyc-dev

8 years agoMerge "Merge "Update the N Preview docs now that Studio 2.1 is stable. bug: 28342771...
Android Build Merger (Role) [Wed, 27 Apr 2016 21:28:15 +0000 (21:28 +0000)]
Merge "Merge "Update the N Preview docs now that Studio 2.1 is stable. bug: 28342771" into mnc-mr-docs am: f8e0d7f am: b6491aa am: 0a33248" into nyc-dev

8 years agoMerge "Fixing network tags." into nyc-dev
Antonio Cansado [Wed, 27 Apr 2016 21:28:11 +0000 (21:28 +0000)]
Merge "Fixing network tags." into nyc-dev

8 years agoMerge "docs: Update SDK Manager for 2.0 changes b/26385384 am: 5f153b5 am: 559648a...
Android Build Merger (Role) [Wed, 27 Apr 2016 21:28:05 +0000 (21:28 +0000)]
Merge "docs: Update SDK Manager for 2.0 changes b/26385384 am: 5f153b5 am: 559648a am: 14f034a am: 9bfc51e" into nyc-dev

8 years agoMerge "Merge "docs: Update SDK Manager for 2.0 changes b/26385384" into mnc-mr-docs...
Android Build Merger (Role) [Wed, 27 Apr 2016 21:27:56 +0000 (21:27 +0000)]
Merge "Merge "docs: Update SDK Manager for 2.0 changes b/26385384" into mnc-mr-docs am: 0f6ab24 am: 4363c43 am: d8e0ae4" into nyc-dev

8 years agoMerge "Merge "doc: Removed duplicate card from distribute/users page" into mnc-docs...
Android Build Merger (Role) [Wed, 27 Apr 2016 21:27:44 +0000 (21:27 +0000)]
Merge "Merge "doc: Removed duplicate card from distribute/users page" into mnc-docs am: b515691 am: 4a5d857 am: f1a7aa6 am: 0a504d0" into nyc-dev

8 years agoMerge "Docs: Added that Method References work with earlier API levels am: 11e3f91...
Android Build Merger (Role) [Wed, 27 Apr 2016 21:27:30 +0000 (21:27 +0000)]
Merge "Docs: Added that Method References work with earlier API levels am: 11e3f91 am: 89b9ee0 am: a6fbfaf am: 8f00192" into nyc-dev

8 years agoMerge "Merge "Docs: Minor fix and restructuring to Vulkan validation-layer doc to...
Android Build Merger (Role) [Wed, 27 Apr 2016 21:27:19 +0000 (21:27 +0000)]
Merge "Merge "Docs: Minor fix and restructuring to Vulkan validation-layer doc to prevent devs from corrupting their NDK install." into mnc-mr-docs am: 19d1e73e41 am: 68af8d0 am: 1d52e49" into nyc-dev

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-dev
Baligh Uddin [Wed, 27 Apr 2016 21:26:44 +0000 (21:26 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-dev
Baligh Uddin [Wed, 27 Apr 2016 21:26:04 +0000 (21:26 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev

8 years agoMerge changes If868f090,I3b7c39c4,I0c2152ed,I79796636,I6dc87bac, ... into mnc-ub-dev
Kevin Hufnagle [Wed, 27 Apr 2016 21:25:28 +0000 (21:25 +0000)]
Merge changes If868f090,I3b7c39c4,I0c2152ed,I79796636,I6dc87bac, ... into mnc-ub-dev
am: 171a1c2

* commit '171a1c25467619af7a9268975d9b742914dc0bd6':

Change-Id: Iad7ca4e11e1fbe24b72ca74d816c83dedac4caf0

8 years agoMerge changes I4bf40d49,I8c1b82f0,I6128b520,Icf1428e3,I44704847, ... into mnc-ub-dev
Kevin Hufnagle [Wed, 27 Apr 2016 21:25:22 +0000 (21:25 +0000)]
Merge changes I4bf40d49,I8c1b82f0,I6128b520,Icf1428e3,I44704847, ... into mnc-ub-dev
am: 7659acc

* commit '7659acc0e7219cf562505ec09c1b4a31223f09ec':

Change-Id: I60f3fb7f1f4a88ff5c2bea721b2b6554decad677

8 years agotypo am: de6fde7 am: 55ba523 am: aaf1d09
smain@google.com [Wed, 27 Apr 2016 21:25:15 +0000 (21:25 +0000)]
typo am: de6fde7 am: 55ba523 am: aaf1d09
am: 044913e

* commit '044913ef93fb16a0a3fa3b6161bfdcf0e13a75a0':
  typo

Change-Id: I149d71c0465f44cb56dc2b3b3b3ad20e81dc713b

8 years agotypo am: 3517069 am: 76f95c2
smain@google.com [Wed, 27 Apr 2016 21:25:00 +0000 (21:25 +0000)]
typo am: 3517069 am: 76f95c2
am: 7432ecf

* commit '7432ecf8a38f1ebfa1370cae15725f9728f26470':
  typo

Change-Id: I24d977bc7a4b4bc815212b047ddca24db62190ad

8 years agoMerge "Docs: Gradle 2.1.0 Release Notes" into mnc-docs am: aa53fb1 am: c49e787 am...
Adarsh Fernando [Wed, 27 Apr 2016 21:24:39 +0000 (21:24 +0000)]
Merge "Docs: Gradle 2.1.0 Release Notes" into mnc-docs am: aa53fb1 am: c49e787 am: 4defc19
am: c070811

* commit 'c07081121939e7dc8c9093c8acf5103ca0e530fa':
  Docs: Gradle 2.1.0 Release Notes

Change-Id: I7993a48c45f4f1ead36ae7350f485243d8e133a9

8 years agoUpdate the N Preview docs now that Studio 2.1 is stable. bug: 28342771 am: 96e6abb...
smain@google.com [Wed, 27 Apr 2016 21:24:22 +0000 (21:24 +0000)]
Update the N Preview docs now that Studio 2.1 is stable. bug: 28342771 am: 96e6abb am: 39a59d0 am: 86c6f97
am: c7984b5

* commit 'c7984b5d62b511a17f3030641d44efc2b147a776':
  Update the N Preview docs now that Studio 2.1 is stable. bug: 28342771

Change-Id: I01396349b0ec8e88be46888f8a44f8f93c4c0f8d

8 years agoAndroid Studio 2.1 release notes and downloads. am: 8e48332 am: beab847 am: 6461bca
smain@google.com [Wed, 27 Apr 2016 21:24:10 +0000 (21:24 +0000)]
Android Studio 2.1 release notes and downloads. am: 8e48332 am: beab847 am: 6461bca
am: 7499bc7

* commit '7499bc755f1e4137ba4775498967c80807a48065':
  Android Studio 2.1 release notes and downloads.

Change-Id: I0e5d14f33d27ba4e019177833dc84f6b0fabb4c1

8 years agoMerge "Android Studio 2.1 release notes and downloads." into mnc-mr-docs am: c939dd0...
smain@google.com [Wed, 27 Apr 2016 21:23:59 +0000 (21:23 +0000)]
Merge "Android Studio 2.1 release notes and downloads." into mnc-mr-docs am: c939dd0 am: 19f9481
am: 88b2780

* commit '88b27807cc248607f713e97b1791186fc7e37313':
  Android Studio 2.1 release notes and downloads.

Change-Id: I55b8646648edbd6657b5bb781c6a239a828fe782

8 years agoMerge "Remove static _book.yaml in favor of generated version (samples_navtree_data...
Dirk Dougherty [Wed, 27 Apr 2016 21:23:49 +0000 (21:23 +0000)]
Merge "Remove static _book.yaml in favor of generated version (samples_navtree_data.cs)." into mnc-mr-docs am: 2974e94 am: 1c1a85bc
am: 61a6d2f

* commit '61a6d2f359e3ae81e7f962ba9fc02e0a92ceb300':
  Remove static _book.yaml in favor of generated version (samples_navtree_data.cs).

Change-Id: I9086d484fc307a7c1e39a06c317383d7b2e9c7be

8 years agoMerge "docs: Added entry in USB vendor ID table for HP." into mnc-docs am: b8767b7...
Kevin Hufnagle [Wed, 27 Apr 2016 21:23:39 +0000 (21:23 +0000)]
Merge "docs: Added entry in USB vendor ID table for HP." into mnc-docs am: b8767b7 am: 599796e am: f2f64b7
am: c78400e

* commit 'c78400e09598850ff9404933f2d3cfc887a92339':
  docs: Added entry in USB vendor ID table for HP.

Change-Id: I6d69fbd8324c77dc64bf87e0878c249a9cd099e0

8 years agoMerge "Update the N Preview docs now that Studio 2.1 is stable. bug: 28342771" into...
smain@google.com [Wed, 27 Apr 2016 21:23:28 +0000 (21:23 +0000)]
Merge "Update the N Preview docs now that Studio 2.1 is stable. bug: 28342771" into mnc-mr-docs am: f8e0d7f am: b6491aa
am: 0a33248

* commit '0a33248b1fe6a109bf33dbdf65497b00f12cba35':
  Update the N Preview docs now that Studio 2.1 is stable. bug: 28342771

Change-Id: I91e30aadca32f5cef8f00e8cd52f6e8aa90b2dd9

8 years agodocs: Update SDK Manager for 2.0 changes b/26385384 am: 5f153b5 am: 559648a am: 14f034a
Cheryl Potter [Wed, 27 Apr 2016 21:23:16 +0000 (21:23 +0000)]
docs: Update SDK Manager for 2.0 changes b/26385384 am: 5f153b5 am: 559648a am: 14f034a
am: 9bfc51e

* commit '9bfc51e3420b7c7addd842df41ad95cedc914a2c':
  docs: Update SDK Manager for 2.0 changes b/26385384

Change-Id: Ide12c014c12c970d6e6fde48e28254b94ea125c3

8 years agoMerge "docs: Update SDK Manager for 2.0 changes b/26385384" into mnc-mr-docs am:...
Cheryl Potter [Wed, 27 Apr 2016 21:23:02 +0000 (21:23 +0000)]
Merge "docs: Update SDK Manager for 2.0 changes b/26385384" into mnc-mr-docs am: 0f6ab24 am: 4363c43
am: d8e0ae4

* commit 'd8e0ae4768ec082ed979bb53fa461c0f3a4eb61f':
  docs: Update SDK Manager for 2.0 changes b/26385384

Change-Id: I60fe3068cf2216a9fc592ef3477c68bb947d9b94

8 years agoMerge "doc: Removed duplicate card from distribute/users page" into mnc-docs am:...
TreeHugger Robot [Wed, 27 Apr 2016 21:22:39 +0000 (21:22 +0000)]
Merge "doc: Removed duplicate card from distribute/users page" into mnc-docs am: b515691 am: 4a5d857 am: f1a7aa6
am: 0a504d0

* commit '0a504d03c10f76b7d2828a8fc2fd76a9fa57b309':
  doc: Removed duplicate card from distribute/users page

Change-Id: I0739f75675050de5b9bcb65ad31ffd63c66029ad

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-dev
Baligh Uddin [Wed, 27 Apr 2016 21:22:00 +0000 (21:22 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev

8 years agoDocs: Added that Method References work with earlier API levels am: 11e3f91 am: 89b9e...
Adarsh Fernando [Wed, 27 Apr 2016 21:21:51 +0000 (21:21 +0000)]
Docs: Added that Method References work with earlier API levels am: 11e3f91 am: 89b9ee0 am: a6fbfaf
am: 8f00192

* commit '8f001929cdf8c4aedc544da3ec99c7c1555351de':
  Docs: Added that Method References work with earlier API levels

Change-Id: I913b328242d944be6b4718cc3c32d095dc4b386d

8 years agoMerge "Docs: Minor fix and restructuring to Vulkan validation-layer doc to prevent...
David Friedman [Wed, 27 Apr 2016 21:21:31 +0000 (21:21 +0000)]
Merge "Docs: Minor fix and restructuring to Vulkan validation-layer doc to prevent devs from corrupting their NDK install." into mnc-mr-docs am: 19d1e73e41 am: 68af8d0
am: 1d52e49

* commit '1d52e49be27be077fafb16fcf700da80d7abc87b':
  Docs: Minor fix and restructuring to Vulkan validation-layer doc to prevent devs from corrupting their NDK install.

Change-Id: I6c0cb2412f8a84d90718bbcc99773328a2ca7389

8 years agoMerge "Add a missing null object check" into nyc-dev
Svetoslav Ganov [Wed, 27 Apr 2016 21:19:05 +0000 (21:19 +0000)]
Merge "Add a missing null object check" into nyc-dev

8 years agoAdd a missing null object check
Svetoslav Ganov [Wed, 27 Apr 2016 20:50:49 +0000 (13:50 -0700)]
Add a missing null object check

We now have a null object instead of null values and
there was a place where we returned null instead of
the correct null object.

bug:28423485

Change-Id: I2626768acdf8d19fc94aa5e978eb057818450fa5

8 years agoMerge "Update background data restrictions intent javadoc." into nyc-dev
TreeHugger Robot [Wed, 27 Apr 2016 21:15:58 +0000 (21:15 +0000)]
Merge "Update background data restrictions intent javadoc." into nyc-dev

8 years agoMerge "resolve merge conflicts of 0d00d28 to nyc-dev" into nyc-dev
Dirk Dougherty [Wed, 27 Apr 2016 21:07:15 +0000 (21:07 +0000)]
Merge "resolve merge conflicts of 0d00d28 to nyc-dev" into nyc-dev

8 years agoFix several accessibility magnification issues.
Phil Weaver [Thu, 10 Mar 2016 23:15:49 +0000 (15:15 -0800)]
Fix several accessibility magnification issues.

Clarifying region used for magnification as "magnificationRegion",
both in the public API and in the code. There's been significant
confusion about what "magnfifiedRegion" means. Removing
"availableRegion" from everywhere except where it's required, as
that region was identical to magnified/magnification region.

Trying to shut down magnification was a complex situation where
animations in progress and new magnification requests were tricky to
handle correctly. It was not possible to guarantee that the
magnification callbacks were unregistered consistently. There were
at least two situations that led to phone restarts:
1. If a triple tap was detected between unregistering the callbacks
and shutting down the input filter. In this case the magnification
request would go through.
2. If an animation had just started when magnification was turned
off, so the current magnification was 1.0 but the animator was
about to change it. In this case the callbacks would be unregistered,
and then the animator would start changing the magnification.

This change makes registering and unregistering magnification atomic.
It also makes MagnificationController stick around indefinitely once it
is created, registering and unregistering as needed to support
magnification gestures and services that control magnification. Services
that merely query the status of magnification no longer register for
callbacks.

One part of shutting down is turning off the animation and guaranteeing
that it won't try to make further changes. Adding a flag to
SpecAnimationBridge and a lock in that class so we can guarantee that
nothing happens when we aren't registered for magnification callbacks.

Also reconfiguring all accessibility options when a service stops to
make sure that only the features required by the current configuration
are enabled.

Bug: 27497138
Bug: 27821103
Change-Id: If697cbd34b117d82c8eee1ba7d0254089ee4241d

8 years agoMerge "Fix oval positioning when drawn with patheffect" into nyc-dev
Chris Craik [Wed, 27 Apr 2016 20:52:49 +0000 (20:52 +0000)]
Merge "Fix oval positioning when drawn with patheffect" into nyc-dev

8 years agoDon't lose content change during rollback for loader already started
Adam Powell [Wed, 27 Apr 2016 20:45:38 +0000 (13:45 -0700)]
Don't lose content change during rollback for loader already started

Framework edition

If a loader is already started when we try to rollback a content
change, force a new load instead of simply setting the flag to refresh
next time.

Bug 28406183

https://code.google.com/p/android/issues/detail?id=208278

Change-Id: If11d79088d30dd2dc48cf1b3d2882f3712b6cddb

8 years agoFixed a bug where the media template wasn't transforming right
Selim Cinek [Tue, 26 Apr 2016 23:58:21 +0000 (16:58 -0700)]
Fixed a bug where the media template wasn't transforming right

Bug: 28406828
Change-Id: Ie400fd62cc0efc8f0a77cc81a40a17c54aa90e65

8 years agoFixed a crash where the overflow number wasn't initialized
Selim Cinek [Tue, 26 Apr 2016 21:03:29 +0000 (14:03 -0700)]
Fixed a crash where the overflow number wasn't initialized

Change-Id: I2df85055d5670af3a6c78a2b62bc62c9297ead78
Fixes: 28008437

8 years agoHandle empty bigTexts more gracefully
Selim Cinek [Tue, 26 Apr 2016 17:39:17 +0000 (10:39 -0700)]
Handle empty bigTexts more gracefully

We're now falling back to the normal text if the bigtext is empty

Bug: 28318145
Change-Id: I5da237780407b62d21f79f7a754736ae1e4a8785

8 years agozygote: Remove NativeLoader initialization step
Dimitry Ivanov [Thu, 21 Apr 2016 23:18:24 +0000 (16:18 -0700)]
zygote: Remove NativeLoader initialization step

This now done by art Runtime::Start()

Bug: http://b/28320913
Change-Id: Icf9b11954b732c9f953e02bba9ae52eb91117457
(cherry picked from commit 6a850b3f11cff546c962fc87ffc961a267973cd4)

8 years agoMerge "Camera: codegen doc update (dynamic black level)" into nyc-dev
Yin-Chia Yeh [Wed, 27 Apr 2016 20:40:25 +0000 (20:40 +0000)]
Merge "Camera: codegen doc update (dynamic black level)" into nyc-dev

8 years agoMerge "Only log when system UID finds missing data paths." into nyc-dev
Jeff Sharkey [Wed, 27 Apr 2016 20:34:17 +0000 (20:34 +0000)]
Merge "Only log when system UID finds missing data paths." into nyc-dev