OSDN Git Service

android-x86/frameworks-base.git
8 years agoImplement PgUp/PgDn support.
Ben Kwa [Wed, 3 Feb 2016 07:00:02 +0000 (23:00 -0800)]
Implement PgUp/PgDn support.

- Clean up our LayoutManager code.  We actually only need a single
  layout manager, since a GridLayoutManager is a LinearLayoutManager,
  and list layout is simply grid layout with one column.  Make it so.

- Use the layout manager to compute item offsets for one page's worth of
  items.  Use that to implement page up/page down.

BUG=25195770

Change-Id: I23ddd5fd38532682e7f099b44e188d8c3fec02be

8 years agoMerge "Fail if setProfileEnabled is called outside a managed profile." into nyc-dev
Nicolas Prévot [Mon, 8 Feb 2016 14:14:06 +0000 (14:14 +0000)]
Merge "Fail if setProfileEnabled is called outside a managed profile." into nyc-dev
am: e64f3da729

* commit 'e64f3da729ae6a00fb627f00b8a97e7c5feb8bcb':
  Fail if setProfileEnabled is called outside a managed profile.

8 years agoMerge "Import translations. DO NOT MERGE"
Geoff Mendal [Mon, 8 Feb 2016 14:09:40 +0000 (14:09 +0000)]
Merge "Import translations. DO NOT MERGE"

8 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 8 Feb 2016 14:08:49 +0000 (06:08 -0800)]
Import translations. DO NOT MERGE

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

8 years agoMerge "Fail if setProfileEnabled is called outside a managed profile." into nyc-dev
Nicolas Prévot [Mon, 8 Feb 2016 14:08:20 +0000 (14:08 +0000)]
Merge "Fail if setProfileEnabled is called outside a managed profile." into nyc-dev

8 years agoFail if setProfileEnabled is called outside a managed profile.
Nicolas Prevot [Fri, 5 Feb 2016 11:52:22 +0000 (11:52 +0000)]
Fail if setProfileEnabled is called outside a managed profile.

BUG:26709495
Change-Id: I98adf2dab1e7b27fef926144c460af8823fe96e7

8 years agoMerge "Import translations. DO NOT MERGE"
Geoff Mendal [Mon, 8 Feb 2016 13:50:26 +0000 (13:50 +0000)]
Merge "Import translations. DO NOT MERGE"

8 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 8 Feb 2016 13:46:18 +0000 (05:46 -0800)]
Import translations. DO NOT MERGE

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

8 years agoMerge "Import translations. DO NOT MERGE"
Geoff Mendal [Mon, 8 Feb 2016 13:34:27 +0000 (13:34 +0000)]
Merge "Import translations. DO NOT MERGE"

8 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 8 Feb 2016 13:22:13 +0000 (05:22 -0800)]
Import translations. DO NOT MERGE

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

8 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 8 Feb 2016 13:09:47 +0000 (05:09 -0800)]
Import translations. DO NOT MERGE

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

8 years agoFix FrameworksServicesTests.apk to include libc++.so am: 5f3dec374f
Paul Jensen [Mon, 8 Feb 2016 11:49:55 +0000 (11:49 +0000)]
Fix FrameworksServicesTests.apk to include libc++.so am: 5f3dec374f
am: 0ab80e6c26

* commit '0ab80e6c261339d17585522a6b69d98a16779c0b':
  Fix FrameworksServicesTests.apk to include libc++.so

8 years agoFix FrameworksServicesTests.apk to include libc++.so
Paul Jensen [Mon, 8 Feb 2016 11:41:25 +0000 (11:41 +0000)]
Fix FrameworksServicesTests.apk to include libc++.so
am: 5f3dec374f

* commit '5f3dec374fac97365ec95ec407a1cffc2c3907c9':
  Fix FrameworksServicesTests.apk to include libc++.so

8 years agoMerge "Introduce dimension of text edit related floating window."
Seigo Nonaka [Mon, 8 Feb 2016 11:39:15 +0000 (11:39 +0000)]
Merge "Introduce dimension of text edit related floating window."

8 years agoIntroduce dimension of text edit related floating window.
Seigo Nonaka [Fri, 29 Jan 2016 06:45:36 +0000 (15:45 +0900)]
Introduce dimension of text edit related floating window.

This is a follow up CL of I5a9bcbe29400d6193eb0532a5e711a78a12383cd.
Floating toolbar and suggestion window has a same elevation and
layout_margin. Introduce dimension value for elevation and
layout_margin and refer them.

Bug: 15347319

Change-Id: I6c635398241b60415437707285faeac76a1a4b6d

8 years agoMerge "Migrate all tests to ActivityTest."
Tomasz Mikolajewski [Mon, 8 Feb 2016 09:12:00 +0000 (09:12 +0000)]
Merge "Migrate all tests to ActivityTest."

8 years agoMigrate all tests to ActivityTest.
Tomasz Mikolajewski [Thu, 4 Feb 2016 08:46:35 +0000 (17:46 +0900)]
Migrate all tests to ActivityTest.

ActivityInstrumentationTestCase2 takes care of starting and closing
the activity, which prevents flakyness.

Change-Id: I2d3908f6605a67a3c2d11e18a9c4799443828df9

8 years agoFix FrameworksServicesTests.apk to include libc++.so
Paul Jensen [Mon, 8 Feb 2016 02:55:45 +0000 (21:55 -0500)]
Fix FrameworksServicesTests.apk to include libc++.so

libc++.so is no longer accessible to the app, so it must be
bundled in the app. This should get ApfTest passing again.

Change-Id: Ide004cb84f7f50feffb8f5acb46b7001dcffd208

8 years agoMerge "Relax mapping rule to make the mapping logic simple."
Daichi Hirono [Mon, 8 Feb 2016 02:18:29 +0000 (02:18 +0000)]
Merge "Relax mapping rule to make the mapping logic simple."

8 years agoAnother intent sent by both system and apps.
Jeff Sharkey [Sun, 7 Feb 2016 19:51:31 +0000 (12:51 -0700)]
Another intent sent by both system and apps.

Bug: 26219772
Change-Id: I4e52c6836e65b983800ef59ad7a1ade5b3a2bea2

8 years agoRelax mapping rule to make the mapping logic simple.
Daichi Hirono [Sun, 7 Feb 2016 04:20:22 +0000 (13:20 +0900)]
Relax mapping rule to make the mapping logic simple.

MtpDocumentsProvider remembers the mapping between SAF's ID and MTP's
ID. Sometimes we need to do heuristic to restore the mapping when MTP
device is reconnected.

Previously we do the mapping files that shares the same name more
strictly. For example,

1. Found file name "test.txt". Assign document ID "1".
2. MTP device is disconnected and the MTP ID of "1" is lost.
3. Found two files that have same name "test.txt" in the same directory.

Previously we don't reuse existing document ID "1" for neither of two
"test.txt" because it's not 1-to-1 mapping and we cannot determine which
one should be mapped with existing document ID. It means we need the
complete list of files in a directory to remap IDs. It takes long time
to fetch all file names in a directory when a directory has 100+
files. It's rare that a MTP device has the two files sharing the same
name in the same directory. Also the strict rule makes the mapping code
more complex.

The CL relax the rule of mapping, and it allows to reuse existing
document ID even if it is not 1-to-1 mapping. For the previous example,
it assigns "1" for either of "test.txt".

BUG=27053734
Change-Id: I19406fafc21f13ab94ba99411ce5e7f55ce7f658

8 years agoMerge "Migrate default app data on non-FBE devices."
Jeff Sharkey [Sun, 7 Feb 2016 03:57:32 +0000 (03:57 +0000)]
Merge "Migrate default app data on non-FBE devices."

8 years agoMigrate default app data on non-FBE devices.
Jeff Sharkey [Sun, 7 Feb 2016 02:46:15 +0000 (19:46 -0700)]
Migrate default app data on non-FBE devices.

When a system app requests "forceDeviceEncrypted" they expect their
default app storage to point at a consistent location regardless of
device FBE support.  So when booting upgraded non-FBE devices, we
may need to migrate any data from CE to DE.  Note that on non-FBE
devices these are just semantic locations with identical protection.

This migration *only* works for non-FBE devices; changing
forceDeviceEncrypted flags on an FBE device always requires a full
data wipe.

Bug: 26668510
Change-Id: Ic5dfeaaf2db26c385901a638ca8ec35eb3c52859

8 years agoMerge "UsageStatsBackup Bug Fix"
Ritesh Reddy [Sat, 6 Feb 2016 19:42:14 +0000 (19:42 +0000)]
Merge "UsageStatsBackup Bug Fix"

8 years agoMerge "Add flag to "am start" to enable native debugging"
Tamas Berghammer [Sat, 6 Feb 2016 13:18:58 +0000 (13:18 +0000)]
Merge "Add flag to "am start" to enable native debugging"

8 years agoMerge "Always get an auth token when we verify."
Paul Crowley [Sat, 6 Feb 2016 08:43:28 +0000 (08:43 +0000)]
Merge "Always get an auth token when we verify."

8 years agoFix build
Chris Craik [Sat, 6 Feb 2016 02:17:35 +0000 (18:17 -0800)]
Fix build

Change-Id: I1ad30ae50cbdff9267d0121a446e6adbe3ad17ee

8 years agoMerge "Hotspot 2.0 release 2 client app."
Jan Nordqvist [Sat, 6 Feb 2016 01:40:13 +0000 (01:40 +0000)]
Merge "Hotspot 2.0 release 2 client app."

8 years agoMerge "Move several property queries to Properties class"
Chris Craik [Sat, 6 Feb 2016 01:39:34 +0000 (01:39 +0000)]
Merge "Move several property queries to Properties class"

8 years agoMove several property queries to Properties class
Chris Craik [Fri, 5 Feb 2016 23:59:29 +0000 (15:59 -0800)]
Move several property queries to Properties class

bug:17478770

This removes a lot of redundant property query code, and puts the
queries all in one place, so defining them automatically will be simpler
in the future.

Change-Id: I0428550e6081f07bc6554ffdf73b22284325abb8

8 years agoHotspot 2.0 release 2 client app.
Jan Nordqvist [Fri, 5 Feb 2016 23:30:26 +0000 (15:30 -0800)]
Hotspot 2.0 release 2 client app.

Change-Id: Ic8f93a3c9fede3f25c03b0153826ac5c49771b60

8 years agoMerge "Track BLE scans in BatteryStats"
Adam Lesinski [Sat, 6 Feb 2016 00:52:38 +0000 (00:52 +0000)]
Merge "Track BLE scans in BatteryStats"

8 years agoMerge "Use the right ClassLoader when restoring."
Jeff Sharkey [Sat, 6 Feb 2016 00:15:41 +0000 (00:15 +0000)]
Merge "Use the right ClassLoader when restoring."

8 years agoUse the right ClassLoader when restoring.
Jeff Sharkey [Sat, 6 Feb 2016 00:13:16 +0000 (17:13 -0700)]
Use the right ClassLoader when restoring.

If we're restoring after a background process death, the Parcelable
creator cache is cold, and since we're handing in a null ClassLoader
the best the platform can do is try the default ClassLoader which
knows nothing about the running app.

That's why ClassLoaderCreator exists, so use it to snag the relevant
ClassLoader and pass it along.

Bug: 26075620
Change-Id: I6fd977d6178dd0f5f9c465597f5806a08097ac7c

8 years agoresolve merge conflicts of 9ea5295597 to master.
John Reck [Fri, 5 Feb 2016 23:59:55 +0000 (15:59 -0800)]
resolve merge conflicts of 9ea5295597 to master.

Change-Id: I68b883e8a1bb17abd4cf151d057dd07e53a80f50

8 years agoMerge "libhwui: handle eglSwapBuffers with EGL_BAD_NATIVE_WINDOW error case"
John Reck [Fri, 5 Feb 2016 23:52:12 +0000 (23:52 +0000)]
Merge "libhwui: handle eglSwapBuffers with EGL_BAD_NATIVE_WINDOW error case"
am: 857b65657d

* commit '857b65657d453801e9b73f998043603456dac813':
  libhwui: handle eglSwapBuffers with EGL_BAD_NATIVE_WINDOW error case

8 years agoMerge "libhwui: handle eglSwapBuffers with EGL_BAD_NATIVE_WINDOW error case"
John Reck [Fri, 5 Feb 2016 23:38:10 +0000 (23:38 +0000)]
Merge "libhwui: handle eglSwapBuffers with EGL_BAD_NATIVE_WINDOW error case"

8 years agoMerge "Check wallpaper visibility to determine if wallpaper is obscuring apps."
Chong Zhang [Fri, 5 Feb 2016 23:32:56 +0000 (23:32 +0000)]
Merge "Check wallpaper visibility to determine if wallpaper is obscuring apps."

8 years agoMerge "Tweaks to file:// Uri StrictMode checks."
Jeff Sharkey [Fri, 5 Feb 2016 23:21:29 +0000 (23:21 +0000)]
Merge "Tweaks to file:// Uri StrictMode checks."

8 years agoTweaks to file:// Uri StrictMode checks.
Jeff Sharkey [Fri, 5 Feb 2016 23:19:10 +0000 (16:19 -0700)]
Tweaks to file:// Uri StrictMode checks.

Whitelist two more legacy intent actions, and don't enforce the
StrictMode checks when resolving intents that might be coming from
legacy apps.  Newer apps would have already been yelled at directly
before getting to the resolver.

Bug: 2697651626977622
Change-Id: Ibf72a361ed68c52cfaac16c32ab40e79005a42e7

8 years agoMerge "Carrier config to support overriding block suppress duration after emergency...
Abhijith Shastry [Fri, 5 Feb 2016 23:08:28 +0000 (23:08 +0000)]
Merge "Carrier config to support overriding block suppress duration after emergency contact."

8 years agoCarrier config to support overriding block suppress duration after emergency contact.
Abhijith Shastry [Fri, 5 Feb 2016 01:28:03 +0000 (17:28 -0800)]
Carrier config to support overriding block suppress duration after emergency contact.

BUG: 26989170
Change-Id: I6d8f13dd4f2b69730826cc8440a22c7154255ac8

8 years agoCheck wallpaper visibility to determine if wallpaper is obscuring apps.
Chong Zhang [Fri, 5 Feb 2016 22:42:36 +0000 (14:42 -0800)]
Check wallpaper visibility to determine if wallpaper is obscuring apps.

bug: 26948569
Change-Id: I710893ee086dce441cb5e2744fc721d3e1a2fd8a

8 years agoMerge "Fix typo in KeyInfo Javadoc." am: e8fbc20e12
Alex Klyubin [Fri, 5 Feb 2016 22:37:31 +0000 (22:37 +0000)]
Merge "Fix typo in KeyInfo Javadoc." am: e8fbc20e12
am: b21416e287

* commit 'b21416e2875973706d8b922428225194d9625875':
  Fix typo in KeyInfo Javadoc.

8 years agoMerge "Fix typo in KeyInfo Javadoc."
Alex Klyubin [Fri, 5 Feb 2016 22:33:09 +0000 (22:33 +0000)]
Merge "Fix typo in KeyInfo Javadoc."
am: e8fbc20e12

* commit 'e8fbc20e12da685acddffc01c41ccf134f051ce9':
  Fix typo in KeyInfo Javadoc.

8 years agoMerge "Dynamic audio policies: fix AttributeMatchCriterion addition in mix"
Jean-Michel Trivi [Fri, 5 Feb 2016 22:27:25 +0000 (22:27 +0000)]
Merge "Dynamic audio policies: fix AttributeMatchCriterion addition in mix"

8 years agoMerge "Fix typo in KeyInfo Javadoc."
Alex Klyubin [Fri, 5 Feb 2016 22:26:56 +0000 (22:26 +0000)]
Merge "Fix typo in KeyInfo Javadoc."

8 years agoMerge "Fix GridView isHeading computation"
Steven Dao [Fri, 5 Feb 2016 22:23:53 +0000 (22:23 +0000)]
Merge "Fix GridView isHeading computation"

8 years agoMerge "IMS: Constants For Audio Quality, Supp. Services" into mm-wireless-dev
Tyler Gunn [Fri, 5 Feb 2016 22:18:26 +0000 (22:18 +0000)]
Merge "IMS: Constants For Audio Quality, Supp. Services" into mm-wireless-dev
am: 6c4aac0bde

* commit '6c4aac0bdee2678818f577490c4acfdeeba81c59':
  IMS: Constants For Audio Quality, Supp. Services

8 years agoFix typo in KeyInfo Javadoc.
Alex Klyubin [Fri, 5 Feb 2016 22:18:19 +0000 (14:18 -0800)]
Fix typo in KeyInfo Javadoc.

Change-Id: I801005a93aee71b93b3d6cf3f7c38361493ff203

8 years agoMerge "IMS: Constants For Audio Quality, Supp. Services" into mm-wireless-dev
Tyler Gunn [Fri, 5 Feb 2016 22:13:32 +0000 (22:13 +0000)]
Merge "IMS: Constants For Audio Quality, Supp. Services" into mm-wireless-dev

8 years agoFix GridView isHeading computation
Steven Dao [Fri, 5 Feb 2016 21:51:55 +0000 (13:51 -0800)]
Fix GridView isHeading computation

- Same issue that was previously in the ListView

Change-Id: I3a3105b46bdadc43ea679b4d29d0719a67c291bc

8 years agohwui: set buffer destroyed swap mode explicitly
Christian Poetzsch [Fri, 5 Feb 2016 14:22:01 +0000 (14:22 +0000)]
hwui: set buffer destroyed swap mode explicitly

Not using EGL_SWAP_BEHAVIOR_PRESERVED_BIT as config attribute for
eglChooseConfig doesn't automatically mean the swap behavior is buffer
destroyed. This is driver implementation specific and on some hw this
can still be buffer preserved. Make sure it is buffer destroyed by
explicitly setting it for every new surface when requested.

Change-Id: Ie2c7c89b0d20e35832b488c6263bb4d9dd844a75
Signed-off-by: Christian Poetzsch <christian.potzsch@imgtec.com>
8 years agoMerge "Add a debug assert to track down infinite loop"
John Reck [Fri, 5 Feb 2016 21:40:14 +0000 (21:40 +0000)]
Merge "Add a debug assert to track down infinite loop"

8 years agoMerge "Ref count the nodes in VectorDrawable"
Doris Liu [Fri, 5 Feb 2016 21:31:23 +0000 (21:31 +0000)]
Merge "Ref count the nodes in VectorDrawable"

8 years agoMerge "Revert "Revert "VectorDrawable native rendering - Step 4 of MANY"""
Doris Liu [Fri, 5 Feb 2016 21:31:05 +0000 (21:31 +0000)]
Merge "Revert "Revert "VectorDrawable native rendering - Step 4 of MANY"""

8 years agoMerge "Prevent NPE in ContactsContract"
Makoto Onuki [Fri, 5 Feb 2016 21:30:38 +0000 (21:30 +0000)]
Merge "Prevent NPE in ContactsContract"

8 years agoPrevent NPE in ContactsContract
Makoto Onuki [Fri, 5 Feb 2016 21:23:21 +0000 (13:23 -0800)]
Prevent NPE in ContactsContract

Bug 26730982

Change-Id: I36fdfffba79e0696175edd42bb131f92cba47499

8 years agoMerge "Fix potential crash when getSensorList returns error"
Peng Xu [Fri, 5 Feb 2016 21:07:22 +0000 (21:07 +0000)]
Merge "Fix potential crash when getSensorList returns error"

8 years agoMerge "Fix some battery icon issues"
Jason Monk [Fri, 5 Feb 2016 21:07:14 +0000 (21:07 +0000)]
Merge "Fix some battery icon issues"

8 years agoFix potential crash when getSensorList returns error
Peng Xu [Fri, 5 Feb 2016 06:27:20 +0000 (22:27 -0800)]
Fix potential crash when getSensorList returns error

bug: b/19937981

Change-Id: Ibfb8c625609923b4e60fa73685dbeb10944ab2b9

8 years agoAdd a debug assert to track down infinite loop
John Reck [Fri, 5 Feb 2016 21:03:47 +0000 (13:03 -0800)]
Add a debug assert to track down infinite loop

Bug: 26980851
Change-Id: I326983ab367782048311b6cf06d800f72837e38e

8 years agoMerge "Prepare user storage just before using it."
Jeff Sharkey [Fri, 5 Feb 2016 21:01:19 +0000 (21:01 +0000)]
Merge "Prepare user storage just before using it."

8 years agoFix some battery icon issues
Jason Monk [Fri, 5 Feb 2016 20:54:10 +0000 (15:54 -0500)]
Fix some battery icon issues

Bug: 26818515
Change-Id: I93f3fb19f82ba8c169b2d0c8d43f1c28b2e71ae9

8 years agoMerge "Update QS defaults list"
Jason Monk [Fri, 5 Feb 2016 20:03:07 +0000 (20:03 +0000)]
Merge "Update QS defaults list"

8 years agoMerge "Have nav bar handle density changes"
Jason Monk [Fri, 5 Feb 2016 20:01:36 +0000 (20:01 +0000)]
Merge "Have nav bar handle density changes"

8 years agoMerge "Fix external status bar icon sizes"
Jason Monk [Fri, 5 Feb 2016 19:59:42 +0000 (19:59 +0000)]
Merge "Fix external status bar icon sizes"

8 years agoMerge "move assistant to system API"
Chris Wren [Fri, 5 Feb 2016 19:57:39 +0000 (19:57 +0000)]
Merge "move assistant to system API"

8 years agomove assistant to system API
Chris Wren [Fri, 5 Feb 2016 19:55:35 +0000 (14:55 -0500)]
move assistant to system API

Bug: 26693581
Change-Id: I7e29b8521e2c33683b8032e63da734cfde1dfcc9

8 years agoUpdate QS defaults list
Jason Monk [Fri, 5 Feb 2016 19:55:05 +0000 (14:55 -0500)]
Update QS defaults list

Also allow custom tiles to be in the default list.

Bug: 26425051
Change-Id: I88af8b251dda333f1392e9959c8505e85f4cbafa

8 years agoMerge "Remove com.google.android.syncadapters.contacts from exception list"
Makoto Onuki [Fri, 5 Feb 2016 19:51:16 +0000 (19:51 +0000)]
Merge "Remove com.google.android.syncadapters.contacts from exception list"

8 years agoRemove com.google.android.syncadapters.contacts from exception list
Makoto Onuki [Fri, 5 Feb 2016 19:43:47 +0000 (11:43 -0800)]
Remove com.google.android.syncadapters.contacts from exception list

Bug 26902400
Bug 26481405

Change-Id: I3b4d0217ee033f727074f68ebe6a1c1461509d04

8 years agoMerge "Rewrite app standby stats"
Amith Yamasani [Fri, 5 Feb 2016 19:41:03 +0000 (19:41 +0000)]
Merge "Rewrite app standby stats"

8 years agoRewrite app standby stats
Amith Yamasani [Thu, 4 Feb 2016 02:02:06 +0000 (18:02 -0800)]
Rewrite app standby stats

Don't mix up with usage stats. Keep a separate db and history
based on elapsed time and screen on time.

Unit tests for AppIdleHistory class.

Bug: 26989006
Change-Id: If343785b46da1db67f7c1c1263854c2732a232c6

8 years agoMerge "Update javadoc for BlockedNumberContract."
Abhijith Shastry [Fri, 5 Feb 2016 19:36:06 +0000 (19:36 +0000)]
Merge "Update javadoc for BlockedNumberContract."

8 years agoFix external status bar icon sizes
Jason Monk [Fri, 5 Feb 2016 19:18:21 +0000 (14:18 -0500)]
Fix external status bar icon sizes

Bug: 26850030
Change-Id: I6de129aa1b6c73b0c1ad5373e59c2ad398b2dc7a

8 years agoMerge "Adapted the notification header colors to spec"
Selim Cinek [Fri, 5 Feb 2016 19:22:00 +0000 (19:22 +0000)]
Merge "Adapted the notification header colors to spec"

8 years agoDynamic audio policies: fix AttributeMatchCriterion addition in mix
Jean-Michel Trivi [Sat, 30 Jan 2016 00:33:55 +0000 (16:33 -0800)]
Dynamic audio policies: fix AttributeMatchCriterion addition in mix

When adding an AttributeMatchCriterion for a mix, build the instance
  with the constructor that matches the rule.

Bug 26798796

Change-Id: I130f4bdab51644685413d294096d35d9685ea5eb

8 years agoRef count the nodes in VectorDrawable
Doris Liu [Fri, 5 Feb 2016 00:16:27 +0000 (16:16 -0800)]
Ref count the nodes in VectorDrawable

Also added API check so that for pre-N we ignore invalid VD animation,
in order to avoid breaking old apps.

Bug: 26975469
Bug: 26949340
Change-Id: I498539ad6a05de3d886e7dcdc8a167e78333ab11

8 years agoMerge "Exclude tasks manipulated before user setup is complete from Recents"
Wale Ogunwale [Fri, 5 Feb 2016 19:04:55 +0000 (19:04 +0000)]
Merge "Exclude tasks manipulated before user setup is complete from Recents"

8 years agoMerge "Fix a small issue with the BT Tether callback value."
Jeremy Klein [Fri, 5 Feb 2016 18:50:57 +0000 (18:50 +0000)]
Merge "Fix a small issue with the BT Tether callback value."

8 years agoAdapted the notification header colors to spec
Selim Cinek [Fri, 5 Feb 2016 18:31:20 +0000 (10:31 -0800)]
Adapted the notification header colors to spec

Change-Id: Ifa9483a5e71f32be2df14912982076d7bf2a6e9a

8 years agoFix a small issue with the BT Tether callback value.
Jeremy Klein [Fri, 5 Feb 2016 18:37:32 +0000 (10:37 -0800)]
Fix a small issue with the BT Tether callback value.

It was incorrect when disabling bt tethering. Note that this had
no practical effect because there's no callback for disabling, but
the change is good for readability's sake.

Change-Id: Id80de58b24e94ec5a8ee38d94fb3016ae7835e43

8 years agoMerge "Restore DroidSansFallback to fonts.xml"
Roozbeh Pournader [Fri, 5 Feb 2016 18:35:13 +0000 (18:35 +0000)]
Merge "Restore DroidSansFallback to fonts.xml"

8 years agoMerge "NAN: for failed configurations - added configuration which failed." into mm...
Etan Cohen [Fri, 5 Feb 2016 18:31:21 +0000 (18:31 +0000)]
Merge "NAN: for failed configurations - added configuration which failed." into mm-wireless-dev
am: 02033f800b

* commit '02033f800bda142994e402f3f66aaecb1c9f41be':
  NAN: for failed configurations - added configuration which failed.

8 years agoHave nav bar handle density changes
Jason Monk [Fri, 5 Feb 2016 18:31:03 +0000 (13:31 -0500)]
Have nav bar handle density changes

Bug: 26038240
Change-Id: I05a9a9ca52b0c9ccba37835d38cca69465b3745e

8 years agoMerge "NAN: for failed configurations - added configuration which failed." into mm...
Etan Cohen [Fri, 5 Feb 2016 18:27:08 +0000 (18:27 +0000)]
Merge "NAN: for failed configurations - added configuration which failed." into mm-wireless-dev

8 years agoMerge "Remove several TetherUtil functions which are no longer needed."
Jeremy Klein [Fri, 5 Feb 2016 18:15:29 +0000 (18:15 +0000)]
Merge "Remove several TetherUtil functions which are no longer needed."

8 years agoMerge "Only make home opaque when requesting visible behind false."
Filip Gruszczynski [Fri, 5 Feb 2016 18:09:05 +0000 (18:09 +0000)]
Merge "Only make home opaque when requesting visible behind false."

8 years agoMerge "api: Un-hide new reflection 1.8 APIs" am: 700ed048f9
Igor Murashkin [Fri, 5 Feb 2016 18:04:35 +0000 (18:04 +0000)]
Merge "api: Un-hide new reflection 1.8 APIs" am: 700ed048f9
am: 8ac2db4364

* commit '8ac2db4364e5c43ea6c3a90538b9b80933964750':
  api: Un-hide new reflection 1.8 APIs

8 years agoMerge "api: Un-hide new reflection 1.8 APIs"
Igor Murashkin [Fri, 5 Feb 2016 18:02:05 +0000 (18:02 +0000)]
Merge "api: Un-hide new reflection 1.8 APIs"
am: 700ed048f9

* commit '700ed048f9c860fb18439ef79a8b7b107e7fe054':
  api: Un-hide new reflection 1.8 APIs

8 years agoPrepare user storage just before using it.
Jeff Sharkey [Tue, 2 Feb 2016 00:03:54 +0000 (17:03 -0700)]
Prepare user storage just before using it.

Wire up preparing of user-specific app storage to existing user
lifecycle hooks.  This way we're sure the storage is ready to roll
just before we start reconciling app data directories.

This also has the nice property that we only prepare storage when
we know that keys are unlocked.

Bug: 25796509
Change-Id: Ic7df9ddbcfb1e20649d11b6cf68d424e3c365ee1

8 years agoUpdate javadoc for BlockedNumberContract.
Abhijith Shastry [Fri, 5 Feb 2016 00:33:32 +0000 (16:33 -0800)]
Update javadoc for BlockedNumberContract.

BUG: 26232372
Change-Id: I57330782fa439bed52c595986916eb24bfbceab0

8 years agoMerge "api: Un-hide new reflection 1.8 APIs"
Igor Murashkin [Fri, 5 Feb 2016 17:53:04 +0000 (17:53 +0000)]
Merge "api: Un-hide new reflection 1.8 APIs"

8 years agoapi: Un-hide new reflection 1.8 APIs
Igor Murashkin [Fri, 5 Feb 2016 05:04:29 +0000 (21:04 -0800)]
api: Un-hide new reflection 1.8 APIs

(cherry-picked from commit 2b11b688b841a00afe5eda8bda02409172751318)
Change-Id: Ica3dba651f4a9239c39c4c90fb8478a5f6ff8b71

8 years agoMerge "Move create folder and sort to overflow menu, cleanup back behavior."
Steve McKay [Fri, 5 Feb 2016 17:27:19 +0000 (17:27 +0000)]
Merge "Move create folder and sort to overflow menu, cleanup back behavior."

8 years agoMerge "Improve NFC-F transceive() docs." am: 1f4f7190a8
Martijn Coenen [Fri, 5 Feb 2016 17:26:37 +0000 (17:26 +0000)]
Merge "Improve NFC-F transceive() docs." am: 1f4f7190a8
am: 21ab24f5c7

* commit '21ab24f5c7a1659981fab2764e406f51e9d3eada':
  Improve NFC-F transceive() docs.

8 years agoMerge "NoMan support for FBE."
Julia Reynolds [Fri, 5 Feb 2016 17:10:23 +0000 (17:10 +0000)]
Merge "NoMan support for FBE."

8 years agoMerge "Update documentation to say write not read or play"
Glenn Kasten [Fri, 5 Feb 2016 17:02:53 +0000 (17:02 +0000)]
Merge "Update documentation to say write not read or play"

8 years agoMerge "Decrease the key progress increment step size to allow finer control of seekba...
Fergus Henderson [Fri, 5 Feb 2016 16:51:58 +0000 (16:51 +0000)]
Merge "Decrease the key progress increment step size to allow finer control of seekbar using keys. Bug:26926346 Change-Id: Ic7d290552c102d8602275f19dac4d57de4a53297"