OSDN Git Service

android-x86/frameworks-base.git
8 years agoMerge "Enabling SoftAP Configuration Backup." into mm-wireless-dev
Ritesh Reddy [Wed, 10 Feb 2016 18:04:38 +0000 (18:04 +0000)]
Merge "Enabling SoftAP Configuration Backup." into mm-wireless-dev
am: c4a1188afd

* commit 'c4a1188afd81b4b773e30ec184839bc1a82b355d':
  Enabling SoftAP Configuration Backup.

8 years agoMerge "Whitelisted ACTION_OPEN_EXTERNAL_DIRECTORY to use file:// URIs." into nyc-dev
Felipe Leme [Wed, 10 Feb 2016 18:02:20 +0000 (18:02 +0000)]
Merge "Whitelisted ACTION_OPEN_EXTERNAL_DIRECTORY to use file:// URIs." into nyc-dev

8 years agoMerge "Enabling SoftAP Configuration Backup." into mm-wireless-dev
Ritesh Reddy [Wed, 10 Feb 2016 17:48:31 +0000 (17:48 +0000)]
Merge "Enabling SoftAP Configuration Backup." into mm-wireless-dev

8 years agoWhitelisted ACTION_OPEN_EXTERNAL_DIRECTORY to use file:// URIs.
Felipe Leme [Wed, 10 Feb 2016 17:23:57 +0000 (09:23 -0800)]
Whitelisted ACTION_OPEN_EXTERNAL_DIRECTORY to use file:// URIs.

BUG: 27109099
BUG: 26742218
Change-Id: I4848b30e6efbda72ff04a6786bac32f34d528f84

8 years agoKeep metadata of documents as disconnected status after the device is
Daichi Hirono [Sun, 7 Feb 2016 06:17:16 +0000 (15:17 +0900)]
Keep metadata of documents as disconnected status after the device is
disconnected.

To restore Document IDs when the device is reconnected, we need to keep
the metadata in database so that we can use it as hint to remap document
ID with new MTP IDs.

BUG=26212981

Change-Id: Idcc93c41c09d082a709281022c56188dabc80515
(cherry picked from commit 53f5af3f2ba1328d301a0f8a4ae3f574ccc5da65)

8 years agoMerge "Check for null on app restrictions managing app APIs" into nyc-dev
Esteban Talavera [Wed, 10 Feb 2016 16:43:49 +0000 (16:43 +0000)]
Merge "Check for null on app restrictions managing app APIs" into nyc-dev

8 years agoMerge "Require delegated cert installer and app restriction manager to exist" into...
Rubin Xu [Wed, 10 Feb 2016 16:29:34 +0000 (16:29 +0000)]
Merge "Require delegated cert installer and app restriction manager to exist" into nyc-dev

8 years agoRequire delegated cert installer and app restriction manager to exist
Rubin Xu [Wed, 10 Feb 2016 14:54:15 +0000 (14:54 +0000)]
Require delegated cert installer and app restriction manager to exist

Enforce that apps with delegated powers to exist on device before
empowering them. This is consistent with DevicePolicyManagerService's
internal logic to clear the delegation power once the package is removed.
For delegated cert installer, only enforce this new restriction on
device admins targeting N or later.

Bug: 26233778
Change-Id: Ia8f45dfd5290958cebb36991c4b6baa03e8c28ae

8 years agoCheck for null on app restrictions managing app APIs
Esteban Talavera [Wed, 10 Feb 2016 16:24:28 +0000 (16:24 +0000)]
Check for null on app restrictions managing app APIs

Change-Id: I3d3cc9b4a4bd6a2526fd0bd7d8662c6b07183208

8 years agoMerge "Revert "Extract QS animations to QSContainer"" into nyc-dev
Jason Monk [Wed, 10 Feb 2016 16:16:37 +0000 (16:16 +0000)]
Merge "Revert "Extract QS animations to QSContainer"" into nyc-dev

8 years agoRevert "Extract QS animations to QSContainer"
Jason Monk [Wed, 10 Feb 2016 16:16:15 +0000 (16:16 +0000)]
Revert "Extract QS animations to QSContainer"

This reverts commit 04dd9d008a314709d4ab80216e2db6a7bb3a2a38.

Change-Id: I76f059fe54ad4417c45e008de5291da0f24099e1

8 years agoExpose measurement results to interested callers.
Erik Kline [Wed, 10 Feb 2016 15:58:17 +0000 (15:58 +0000)]
Expose measurement results to interested callers.
am: 106cdf6c94

* commit '106cdf6c94c455462316555b7ac59ec79c3b40fa':
  Expose measurement results to interested callers.

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-dev
Geoff Mendal [Wed, 10 Feb 2016 15:42:20 +0000 (15:42 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-dev
Geoff Mendal [Wed, 10 Feb 2016 15:42:05 +0000 (15:42 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-dev
Geoff Mendal [Wed, 10 Feb 2016 15:41:39 +0000 (15:41 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-dev
Geoff Mendal [Wed, 10 Feb 2016 15:41:11 +0000 (15:41 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-dev
Geoff Mendal [Wed, 10 Feb 2016 15:40:50 +0000 (15:40 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev

8 years agoImport translations. DO NOT MERGE
Geoff Mendal [Wed, 10 Feb 2016 15:39:33 +0000 (10:39 -0500)]
Import translations. DO NOT MERGE

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

8 years agoImport translations. DO NOT MERGE
Geoff Mendal [Wed, 10 Feb 2016 15:38:51 +0000 (07:38 -0800)]
Import translations. DO NOT MERGE

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

8 years agoMerge "Update test to stub the correct method." into nyc-dev
Jeremy Joslin [Wed, 10 Feb 2016 15:38:19 +0000 (15:38 +0000)]
Merge "Update test to stub the correct method." into nyc-dev

8 years agoImport translations. DO NOT MERGE
Geoff Mendal [Wed, 10 Feb 2016 15:36:12 +0000 (07:36 -0800)]
Import translations. DO NOT MERGE

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

8 years agoUpdate test to stub the correct method.
Jeremy Joslin [Wed, 10 Feb 2016 15:34:46 +0000 (07:34 -0800)]
Update test to stub the correct method.

NetworkScorerAppManager was recently updated to use
queryBroadcastReceiversAsUser() in place of
queryBroadcastReceivers() but its unit test wasn't changed accordingly.

Change-Id: Ib41195fe8b9cf8c8da9a9090a4f26e1cde3db4f0

8 years agoExpose measurement results to interested callers.
Erik Kline [Wed, 3 Feb 2016 05:12:23 +0000 (14:12 +0900)]
Expose measurement results to interested callers.

With this it's possible for callers to:

    Network network = ...
    LinkProperties lp = ...

    NetworkDiagnostics netdiag = new NetworkDiagnostics(network, lp, 5000);
    netdiag.startMeasurements();
    netdiag.waitForMeasurements();

    boolean result = true;
    for (Measurement m : netdiag.getMeasurements()) {
        if (!m.checkSucceeded()) {
            result = false;
            // Additional error handling here.
        }
    }

    return result;

Bug: 21832299
Bug: 26780890
Change-Id: Iaf7ff029e2c6a998b574c23d0dcde8d57a467a22

8 years agoImport translations. DO NOT MERGE
Geoff Mendal [Wed, 10 Feb 2016 15:23:03 +0000 (07:23 -0800)]
Import translations. DO NOT MERGE

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

8 years agoImport translations. DO NOT MERGE
Geoff Mendal [Wed, 10 Feb 2016 15:19:37 +0000 (07:19 -0800)]
Import translations. DO NOT MERGE

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

8 years agoUpdate the subdir icon to svg.
Ben Kwa [Sat, 6 Feb 2016 00:05:14 +0000 (16:05 -0800)]
Update the subdir icon to svg.

BUG=21705832

Change-Id: I400b5402c0efd34d79be3e8b05b2154dd8c48735
(cherry picked from commit 032c283ef32f72d038b8a989366b184d68ccfd0e)

8 years agoMove focus-related code out of DirectoryFragment.
Ben Kwa [Tue, 9 Feb 2016 19:27:45 +0000 (11:27 -0800)]
Move focus-related code out of DirectoryFragment.

BUG=25195767

Change-Id: Ibf2247a81e8903924037b5f01305593219a8c068

8 years agoMerge "Extract QS animations to QSContainer" into nyc-dev
Jason Monk [Wed, 10 Feb 2016 15:06:06 +0000 (15:06 +0000)]
Merge "Extract QS animations to QSContainer" into nyc-dev

8 years agoExtract QS animations to QSContainer
Jason Monk [Tue, 9 Feb 2016 15:51:40 +0000 (10:51 -0500)]
Extract QS animations to QSContainer

Move some of the logic for QS animations into QSContainer with a
stable interface for NotificationPanelView to call.

This also moves the QSPanel out of the scroll container and up
to live in with the header (QSContainer is the parent of both
the header and the QSPanel now).

Change-Id: I197b93bab05c336a8a8debea781e7ad3053b0b1d

8 years agoImport translations. DO NOT MERGE
Geoff Mendal [Wed, 10 Feb 2016 14:11:40 +0000 (14:11 +0000)]
Import translations. DO NOT MERGE
am: b46d66d5d8  -s ours

* commit 'b46d66d5d86b1be95ff6f315feca5406183a4a85':
  Import translations. DO NOT MERGE

8 years agoMerge "Allow apps to know what users think of their notifications." into nyc-dev
Julia Reynolds [Wed, 10 Feb 2016 14:10:23 +0000 (14:10 +0000)]
Merge "Allow apps to know what users think of their notifications." into nyc-dev

8 years agoImport translations. DO NOT MERGE
Geoff Mendal [Wed, 10 Feb 2016 14:01:06 +0000 (09:01 -0500)]
Import translations. DO NOT MERGE

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

8 years agoMerge "Do not invalidate drawable if tint doesn't change" into nyc-dev
Jorim Jaggi [Wed, 10 Feb 2016 06:08:34 +0000 (06:08 +0000)]
Merge "Do not invalidate drawable if tint doesn't change" into nyc-dev

8 years agoDo not invalidate drawable if tint doesn't change
Jorim Jaggi [Wed, 10 Feb 2016 05:36:41 +0000 (21:36 -0800)]
Do not invalidate drawable if tint doesn't change

Change-Id: I99d7a679ba3aa4978f2915f1a52f23dbce7fd971

8 years agoMerge "Fix build" into nyc-dev
Svetoslav Ganov [Wed, 10 Feb 2016 04:46:07 +0000 (04:46 +0000)]
Merge "Fix build" into nyc-dev

8 years agoFix build
Svet Ganov [Wed, 10 Feb 2016 04:45:13 +0000 (20:45 -0800)]
Fix build

Change-Id: I7c0601f873e37c7ebf71068ba81366704672bd70

8 years agoMerge "Don't die if dirKey hasn't been set in Selection." into nyc-dev
Steve McKay [Wed, 10 Feb 2016 03:05:47 +0000 (03:05 +0000)]
Merge "Don't die if dirKey hasn't been set in Selection." into nyc-dev

8 years agoDon't die if dirKey hasn't been set in Selection.
Steve McKay [Wed, 10 Feb 2016 03:04:24 +0000 (19:04 -0800)]
Don't die if dirKey hasn't been set in Selection.

Some times the raw selection in State can be saved....raw.

Change-Id: Ibf4efab31fffc99baa25ba415f8b53c110aa81f3

8 years agoMerge "Add an API to query the package name of the services shared lib" into nyc-dev
Svetoslav Ganov [Wed, 10 Feb 2016 03:00:09 +0000 (03:00 +0000)]
Merge "Add an API to query the package name of the services shared lib" into nyc-dev

8 years agoPreserve selection across device rotation.
Steve McKay [Tue, 9 Feb 2016 03:09:42 +0000 (19:09 -0800)]
Preserve selection across device rotation.

Also, update Selection model to use a discrete provisional selection,
   rather than a superset "total" selection

Bug: 27075323
Change-Id: I855e6b66010b3cdd599cc0a9f0046a7efadca5fe

8 years agoAdd an API to query the package name of the services shared lib
Svet Ganov [Wed, 10 Feb 2016 02:49:23 +0000 (18:49 -0800)]
Add an API to query the package name of the services shared lib

The servcies shared lib contains components apps can invoke such
as services to bind to, activities to start, UI choosers, etc.
This lib is built from AOSP code but an OEM may chage its
package name. For example, Google renames the package names for
GMS apps from android.foo.bar to com.google.android.foo.bar.
While we have more than one shared lib that are a part of the
platform (currently shared and services libs) the serivces lib
is the only one clients need to start components in, thus need
to know its package name. This change adds an API to query the
package name of the services shared lib. The API is hidden as
currently the only clients are a part of the system.

Change-Id: Ied48fa4819024522791764b22b3336d4f4b42cc3

8 years agoMerge "Automatically open roots pane if default dir is empty." into nyc-dev
Steve McKay [Wed, 10 Feb 2016 02:28:12 +0000 (02:28 +0000)]
Merge "Automatically open roots pane if default dir is empty." into nyc-dev

8 years agoCheck parent existance when adding/removing documents.
Daichi Hirono [Sun, 7 Feb 2016 05:23:43 +0000 (14:23 +0900)]
Check parent existance when adding/removing documents.

BUG=26212981
Change-Id: I8109e2324c027ec2182c6f521d57f3fe078a8660
(cherry picked from commit df803ec6ebd47ddc7f97ea8ef13aa359ecc7fb95)

8 years agoFix flakiness of testFilesList_LiveUpdate.
Tomasz Mikolajewski [Mon, 8 Feb 2016 06:36:04 +0000 (15:36 +0900)]
Fix flakiness of testFilesList_LiveUpdate.

Change-Id: I87618d5640e2e17de3188554d561abc5f3a3152a
(cherry picked from commit 1008c2d4878abde1890560ef48eec229a4253445)

8 years agoMerge "Don't apply fancy back logic when drawer is not present." into nyc-dev
Steve McKay [Wed, 10 Feb 2016 02:00:37 +0000 (02:00 +0000)]
Merge "Don't apply fancy back logic when drawer is not present." into nyc-dev

8 years agoAdd Developer menu entry to disable Bluetooth absolute volume
Andre Eisenbach [Wed, 10 Feb 2016 01:28:58 +0000 (17:28 -0800)]
Add Developer menu entry to disable Bluetooth absolute volume

NOTE: Original CL updated: Developer-related settings in
res/values/strings.xml are now in SettingsLib .

Bug: 27078729
Change-Id: I499c420b1eb8cafd674cd69f29ed64f6126307f0

8 years agoFix build
Chulwoo Lee [Wed, 10 Feb 2016 01:42:32 +0000 (17:42 -0800)]
Fix build

Change-Id: I9498ecda9b05c7166faf9f648f0b61682a88c4da

8 years agoMerge "Encode/Decode genres using CSV" into nyc-dev
Chulwoo Lee [Wed, 10 Feb 2016 01:33:54 +0000 (01:33 +0000)]
Merge "Encode/Decode genres using CSV" into nyc-dev

8 years agoEncode/Decode genres using CSV
Chulwoo Lee [Tue, 9 Feb 2016 00:47:50 +0000 (16:47 -0800)]
Encode/Decode genres using CSV

Currently, the delimiter of genres is comma, but it is also used in the
broadcast genre, so we decided to encode the genre to CSV format.
Let's support only a simple CSV not a complex cases like fully double
quoted string to simplify the encode/decode method and encourage the
TIS to use these methods for broadcast genres.

Bug: 25241891
Change-Id: Id745d4fee43dbcdc508c0f6fad83477b6209ecd8

8 years agoMerge "Language list heading: add padding and make it bold [DO NOT MERGE]" into nyc-dev
Roozbeh Pournader [Wed, 10 Feb 2016 01:02:49 +0000 (01:02 +0000)]
Merge "Language list heading: add padding and make it bold [DO NOT MERGE]" into nyc-dev

8 years agoLanguage list heading: add padding and make it bold [DO NOT MERGE]
Mihai Nita [Fri, 5 Feb 2016 19:33:37 +0000 (11:33 -0800)]
Language list heading: add padding and make it bold [DO NOT MERGE]

This makes it consistent with heading labels used in other areas
of the Settings app.

Bug: 26758145
Change-Id: I9b66e97b5a0a8b0646e4b345b25b6d93178fc8e6
(cherry picked from commit 5d1e9977350b85828f3ba533f3bf9d17917a9977)

8 years agoFix Keyboard overlap with navigation bar
Jorim Jaggi [Tue, 9 Feb 2016 03:17:07 +0000 (19:17 -0800)]
Fix Keyboard overlap with navigation bar

FLAG_FULLSCREEN is really the wrong flag for determining whether
to subtract the window insets in the decore view and layout
it with a reduced size - FLAG_LAYOUT_IN_SCREEN suits these needs
much better.

Bug: 26014496
Bug: 26984057
Change-Id: I5c7a0fb7468d3981b91b23aa4c8b1e4841202131

8 years agoFix build
Chris Craik [Wed, 10 Feb 2016 00:32:32 +0000 (16:32 -0800)]
Fix build

Change-Id: I24d82c44db9d9e04098a0d7cb9289d6b9fc19e41

8 years agoAutomatically open roots pane if default dir is empty.
Steve McKay [Wed, 10 Feb 2016 00:17:24 +0000 (16:17 -0800)]
Automatically open roots pane if default dir is empty.

Move drawer fiddling out of DirectoryFragment into respective
    FragmentTuner instance.

Bug: 27084308
Change-Id: Ia13fc2be1442e1a7164c2d67ea6ce4bcfda68bcc

8 years agoMerge "Further improvement to determining visiblility of tasks in home stack." into...
Wale Ogunwale [Wed, 10 Feb 2016 00:19:41 +0000 (00:19 +0000)]
Merge "Further improvement to determining visiblility of tasks in home stack." into nyc-dev

8 years agoMerge "Reduce jank during pinned stack animation" into nyc-dev
Wale Ogunwale [Wed, 10 Feb 2016 00:11:10 +0000 (00:11 +0000)]
Merge "Reduce jank during pinned stack animation" into nyc-dev

8 years agoMerge "Go to root from child directory when root tapped. Bug: 27060001" into nyc-dev
Aga Wronska [Tue, 9 Feb 2016 23:58:42 +0000 (23:58 +0000)]
Merge "Go to root  from child directory when root tapped. Bug: 27060001" into nyc-dev

8 years agoMerge "Implement PgUp/PgDn support. (cherry-pick DO NOT MERGE)" into nyc-dev
Ben Kwa [Tue, 9 Feb 2016 23:37:32 +0000 (23:37 +0000)]
Merge "Implement PgUp/PgDn support.  (cherry-pick DO NOT MERGE)" into nyc-dev

8 years agoMerge "Handle null list from getPackagesForOps" into nyc-dev
Tony Mantler [Tue, 9 Feb 2016 23:30:20 +0000 (23:30 +0000)]
Merge "Handle null list from getPackagesForOps" into nyc-dev

8 years agoHandle null list from getPackagesForOps
Tony Mantler [Tue, 9 Feb 2016 22:12:43 +0000 (14:12 -0800)]
Handle null list from getPackagesForOps

b/27101914

Change-Id: I468da1a0f38f78e1cd7fec50e3bc78cec6fd2771

8 years agoMerge "Calculate clip bounds correctly when serializing" into nyc-dev
Chris Craik [Tue, 9 Feb 2016 23:04:53 +0000 (23:04 +0000)]
Merge "Calculate clip bounds correctly when serializing" into nyc-dev

8 years agoMerge "More encryption-aware triaging." into nyc-dev
Jeff Sharkey [Tue, 9 Feb 2016 23:00:54 +0000 (23:00 +0000)]
Merge "More encryption-aware triaging." into nyc-dev

8 years agoMerge "Add attestation API to Android KeyStore." into nyc-dev
Shawn Willden [Tue, 9 Feb 2016 22:57:23 +0000 (22:57 +0000)]
Merge "Add attestation API to Android KeyStore." into nyc-dev

8 years agoMore encryption-aware triaging.
Jeff Sharkey [Tue, 9 Feb 2016 22:56:11 +0000 (15:56 -0700)]
More encryption-aware triaging.

Most of these callers are okay having results omitted when a package
is uninstalled or encryption unaware.  For example, jobs and
notifications can only be enqueued by already running apps.

When clearing zen rules, keep around rules inserted by apps on
ejected external storage devices.

Make ServiceWatcher stricter by requiring that the matching package
be in the system image.

Bug: 2647120527105254
Change-Id: Ie41ea8042ac1a54e9cbe0c35cec89e70521e9bed

8 years agoDon't apply fancy back logic when drawer is not present.
Steve McKay [Tue, 9 Feb 2016 20:40:07 +0000 (12:40 -0800)]
Don't apply fancy back logic when drawer is not present.

Add test coverage. Booya!

Bug: 27078649
Change-Id: Id2ce53009ee212b3af8d143091859d30e2bc76b1

8 years agoMerge "Make ServiceWatcher encryption-aware." into nyc-dev
Jeff Sharkey [Tue, 9 Feb 2016 21:59:03 +0000 (21:59 +0000)]
Merge "Make ServiceWatcher encryption-aware." into nyc-dev

8 years agoMerge "Make InputMethodInfo#isEncryptionAware() strict." into nyc-dev
Yohei Yukawa [Tue, 9 Feb 2016 21:48:33 +0000 (21:48 +0000)]
Merge "Make InputMethodInfo#isEncryptionAware() strict." into nyc-dev

8 years agoMake InputMethodInfo#isEncryptionAware() strict.
Yohei Yukawa [Tue, 9 Feb 2016 21:39:50 +0000 (13:39 -0800)]
Make InputMethodInfo#isEncryptionAware() strict.

This is a follow up CL to the previous CL [1], which unintentionally
relied on whether the entire application rather than the
InputMethodService is marked to be encryption-aware.  This wasn't
obvious because right now LatinIME is entirely marked to be
encryption-aware, which probably needs to be reconsidered in subsequent
CLs.

This CL drops "encryptionAware" line from InputMethodInfo#dump() as it
is redundant.  The same information is already dumped in the
'ServiceInfo' section.

 [1] Icf921fe3661eccf4a589b08b616d05decc561356
     69811a98f161a04af8e8ec9978c3a5efe1ea0f29

Bug: 26279466
Change-Id: I6cea5fe5731f4a6a64ea722b854b99c5154a15ae

8 years agoMerge "Delete only the target user" into nyc-dev
Svetoslav Ganov [Tue, 9 Feb 2016 20:54:29 +0000 (20:54 +0000)]
Merge "Delete only the target user" into nyc-dev

8 years agoDelete only the target user
Svetoslav Ganov [Tue, 9 Feb 2016 20:50:49 +0000 (12:50 -0800)]
Delete only the target user

bug:27094971

Change-Id: I5b43d59ff6edeefc0e05a6ec90d04d388e707c29

8 years agoReduce jank during pinned stack animation
Wale Ogunwale [Sat, 6 Feb 2016 21:58:29 +0000 (13:58 -0800)]
Reduce jank during pinned stack animation

- Don’t launch Pip overlay activities during pinned stack animation.
This causes extra CPU load and takes a way resources from the running
animation.
- Finish Pip overlay activities before starting pinned stack resize
animation. Reduces the amount of work the system needs to do to keep
the overlays in-sync with the other activities in the pinned stack.
- Use AM.resizeStack with null bounds to take Pip to fullscreen so that
we can animate the bounds changed.
- Also, fixed Activity.enterPictureInPicture API to animate the transition
if Pip is entered from the app instead of Pip manager.

Bug: 25672053
Change-Id: I82399c10f1b8c675ea3861ba973dc8ecfbfbe50f

8 years agoAAPT2: Switch to protobuf for intermediate format
Adam Lesinski [Thu, 4 Feb 2016 23:59:23 +0000 (15:59 -0800)]
AAPT2: Switch to protobuf for intermediate format

Without needing to conform to the runtime data format,
it is much easier to add new features such as debugging symbols
and carrying over product data to link time.

This also simplifies the runtime format parser and serializer,
which will change much less frequently than the protobuf intermediate
format.

Change-Id: I209787bbf087db0a58a534cb8511c51d21133e00

8 years agoMerge "Importance slider logging." into nyc-dev
Julia Reynolds [Tue, 9 Feb 2016 19:58:32 +0000 (19:58 +0000)]
Merge "Importance slider logging." into nyc-dev

8 years agoMerge "Use Context#createConfigurationContext()." into nyc-dev
Yohei Yukawa [Tue, 9 Feb 2016 19:56:58 +0000 (19:56 +0000)]
Merge "Use Context#createConfigurationContext()." into nyc-dev

8 years agoAllow apps to know what users think of their notifications.
Julia Reynolds [Tue, 9 Feb 2016 19:54:08 +0000 (14:54 -0500)]
Allow apps to know what users think of their notifications.

- App wide blocking
- Topic importance

Change-Id: I9026e5c26c5dbcab1c86c385beede891f961933f

8 years agoMerge changes Icf921fe3,Ie1a8ee22 into nyc-dev
Yohei Yukawa [Tue, 9 Feb 2016 19:49:19 +0000 (19:49 +0000)]
Merge changes Icf921fe3,Ie1a8ee22 into nyc-dev

* changes:
  Add a utility method to InputMethodInfo for FBE.
  Fix style issues in InputMethodInfo.java.

8 years agoMerge "Add RSN Information Element ID" into mm-wireless-dev
Randy Pan [Tue, 9 Feb 2016 19:32:18 +0000 (19:32 +0000)]
Merge "Add RSN Information Element ID" into mm-wireless-dev
am: 2750b41d0b

* commit '2750b41d0b50eb66c8aada11d62666f934ca950d':
  Add RSN Information Element ID

8 years agoMerge "Fix a crash in SystemUI when using CarNavigationBar." into nyc-dev
Rakesh Iyer [Tue, 9 Feb 2016 19:28:36 +0000 (19:28 +0000)]
Merge "Fix a crash in SystemUI when using CarNavigationBar." into nyc-dev

8 years agoMerge "Removed the notification scroller top stack" into nyc-dev
Selim Cinek [Tue, 9 Feb 2016 19:25:04 +0000 (19:25 +0000)]
Merge "Removed the notification scroller top stack" into nyc-dev

8 years agoMerge "Add RSN Information Element ID" into mm-wireless-dev
Randy Pan [Tue, 9 Feb 2016 19:13:32 +0000 (19:13 +0000)]
Merge "Add RSN Information Element ID" into mm-wireless-dev

8 years agoMerge "Update documentation for offset and size" into nyc-dev
Glenn Kasten [Tue, 9 Feb 2016 19:06:22 +0000 (19:06 +0000)]
Merge "Update documentation for offset and size" into nyc-dev

8 years agoMerge "updates to FrameStatsObserver API" into nyc-dev
Andres Morales [Tue, 9 Feb 2016 19:00:31 +0000 (19:00 +0000)]
Merge "updates to FrameStatsObserver API" into nyc-dev

8 years agoFix build break
Selim Gurun [Tue, 9 Feb 2016 18:55:33 +0000 (10:55 -0800)]
Fix build break

Bug: 26874366
Change-Id: Ic7634cb9d823d4f74d2893f4c46a77a5af02a0a1

8 years agoFix a crash in SystemUI when using CarNavigationBar.
Rakesh Iyer [Tue, 9 Feb 2016 18:51:50 +0000 (10:51 -0800)]
Fix a crash in SystemUI when using CarNavigationBar.

CarNavigationBar overrides getCurrentView() in phone NavigationBarView
but the dump() method in NavigationBarView uses mCurrentView directly,
which may be null in the auto case. Callign getCurrentView() returns
the correct overriden view.

This patch makes the change to dump() to use getCurrentView().

Bug: 27046536
Change-Id: I92e5655325247d27faac1e33d8622783652bdb10

8 years agoUpdate documentation for offset and size
Glenn Kasten [Sat, 31 Oct 2015 01:25:38 +0000 (18:25 -0700)]
Update documentation for offset and size

Change-Id: Id9d5ef62767155cc8597795b43c4422f623574ed

8 years agoupdates to FrameStatsObserver API
Andres Morales [Wed, 3 Feb 2016 00:19:40 +0000 (16:19 -0800)]
updates to FrameStatsObserver API

- Rename to FrameMetrics to avoid collision with existing
  android.view.FrameStats class
- Make FrameMetricsObserver implementation detail,
  exposing FrameMetricsListener interface as public API
  and wrapping in FrameStatsObserver to maintain state
- Remove dropped frame count call, in favor of passing as
  parameter to callback method.
- Move away from raw timestamp access in favor of Metric IDs
  which represent higher-level, more stable stages in a frame
  lifecycle and match the categories exposed in the onscreen
  bars.
- Support many-to-many Window<->FrameMetricsListener relationship

Change-Id: I00e741d664d4c868b1b6d0131a23f8316bd8c5c2

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
(cherry picked from commit acdbc6e740ffbd465488b6eb0cf9388d43ae860a)

8 years agoMerge "Introduce a use32bitAbi flag" into nyc-dev
Selim Gurun [Tue, 9 Feb 2016 18:32:27 +0000 (18:32 +0000)]
Merge "Introduce a use32bitAbi flag" into nyc-dev

8 years agoMerge "Update TelecomManager docs regarding PhoneAccounts" into nyc-dev
Brad Ebinger [Tue, 9 Feb 2016 18:26:26 +0000 (18:26 +0000)]
Merge "Update TelecomManager docs regarding PhoneAccounts" into nyc-dev

8 years agoMerge "WifiEnterpriseConfig: allow getting and setting of ca_path" into mm-wireless-dev
Samuel Tan [Tue, 9 Feb 2016 18:23:43 +0000 (18:23 +0000)]
Merge "WifiEnterpriseConfig: allow getting and setting of ca_path" into mm-wireless-dev
am: 8629390701

* commit '8629390701efe0ed74730a06ab2fc868a7ca265d':
  WifiEnterpriseConfig: allow getting and setting of ca_path

8 years agoIntroduce a use32bitAbi flag
Selim Gurun [Sat, 6 Feb 2016 01:50:53 +0000 (17:50 -0800)]
Introduce a use32bitAbi flag

Bug: 26874366

On Multiarch apps, it might be necessary to prioritize 32bit Abi ahead
of 64bit ones. The use32bitAbi flag enables this.

This CL also reverts the public api changes in  I2c1fd1d036efe72b28b5fe996416df69a583959f and Ie3ecea6d84e2cb1522e736a21c3a3a24ac62eb27. Previously
the same functionality was provided using a raw abi string that
utilized cpuabioverride flag.

Change-Id: Idce3cbfedd11ef9079ce8a2901e69d30b1cf9ef4

8 years agoMerge "WifiEnterpriseConfig: allow getting and setting of ca_path" into mm-wireless-dev
Samuel Tan [Tue, 9 Feb 2016 18:18:04 +0000 (18:18 +0000)]
Merge "WifiEnterpriseConfig: allow getting and setting of ca_path" into mm-wireless-dev

8 years agoMake ACTION_RADIO_OFF protected
Pavel Zhamaitsiak [Mon, 1 Feb 2016 20:04:44 +0000 (12:04 -0800)]
Make ACTION_RADIO_OFF protected

Bug: 25113145
Change-Id: Idcb88cb1fd06d4761ef1f634136f8ec697bf0851
(cherry picked from commit ae6688ca5d2b506eff29ba27c7532513f2da7da8)

8 years agoImportance slider logging.
Julia Reynolds [Tue, 9 Feb 2016 17:57:02 +0000 (12:57 -0500)]
Importance slider logging.

Change-Id: I3c4ad73d1460e4d28cb1a10846159128590d2b20

8 years agoImplement PgUp/PgDn support. (cherry-pick DO NOT MERGE)
Ben Kwa [Wed, 3 Feb 2016 07:00:02 +0000 (23:00 -0800)]
Implement PgUp/PgDn support.  (cherry-pick DO NOT MERGE)

- 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
(cherry picked from commit 4d4bf9a21a16bae3497f94dbb558a2ede9d989ee)

8 years agoMerge "don't allow assistant to block notifications." into nyc-dev
Chris Wren [Tue, 9 Feb 2016 17:49:43 +0000 (17:49 +0000)]
Merge "don't allow assistant to block notifications." into nyc-dev

8 years agoMerge changes I1eda3134,Ia7ad36a3 into nyc-dev
Winson Chung [Tue, 9 Feb 2016 17:45:04 +0000 (17:45 +0000)]
Merge changes I1eda3134,Ia7ad36a3 into nyc-dev

* changes:
  Updating paging animation to spec.
  Adding logging for timeout and other features.

8 years agoMerge "Whitelist camera permission for SetupWizard" into nyc-dev
Steven Ng [Tue, 9 Feb 2016 17:32:00 +0000 (17:32 +0000)]
Merge "Whitelist camera permission for SetupWizard" into nyc-dev

8 years agoMerge "Fixed bad auto-generated method name." into mm-wireless-dev
Jan Nordqvist [Tue, 9 Feb 2016 17:28:33 +0000 (17:28 +0000)]
Merge "Fixed bad auto-generated method name." into mm-wireless-dev
am: cf132a1bbc

* commit 'cf132a1bbc676489cfa757317edf8af90c10a105':
  Fixed bad auto-generated method name.

8 years agoMerge "Fixed bad auto-generated method name." into mm-wireless-dev
Jan Nordqvist [Tue, 9 Feb 2016 17:24:20 +0000 (17:24 +0000)]
Merge "Fixed bad auto-generated method name." into mm-wireless-dev