OSDN Git Service

android-x86/frameworks-base.git
8 years agoMerge \"QS: Show date even on small screens\" into nyc-dev
Jason Monk [Wed, 8 Jun 2016 20:28:04 +0000 (20:28 +0000)]
Merge \"QS: Show date even on small screens\" into nyc-dev
am: 883da638e2

Change-Id: I4bc7594fa5004c8d58933d9432a70353474f07e4

8 years agoresolve merge conflicts of fbf366d to nyc-mr1-dev
Jason Monk [Wed, 8 Jun 2016 20:24:16 +0000 (16:24 -0400)]
resolve merge conflicts of fbf366d to nyc-mr1-dev

Change-Id: If2c3d07d680c36b206fe49a8e8e7dc20619a5c42

8 years agoMerge "Re-add Internal API for cross-task Activity used by assistant." into nyc-mr1-dev
TreeHugger Robot [Wed, 8 Jun 2016 20:23:02 +0000 (20:23 +0000)]
Merge "Re-add Internal API for cross-task Activity used by assistant." into nyc-mr1-dev

8 years agoMerge \"Fix crash when an app with an active quicksettings tile is updated to no...
Will Harmon [Wed, 8 Jun 2016 20:20:57 +0000 (20:20 +0000)]
Merge \"Fix crash when an app with an active quicksettings tile is updated to no longer have that tile.\" into nyc-dev
am: 4455fc734c

Change-Id: I3f5e4eb86d8a14393a853669a401090046a31da3

8 years agoMerge \"Settings: Better handling for disabled tiles\" into nyc-dev
Jason Monk [Wed, 8 Jun 2016 20:20:52 +0000 (20:20 +0000)]
Merge \"Settings: Better handling for disabled tiles\" into nyc-dev
am: 27eadb6f1d

Change-Id: Iaf1558df689ba4ea033b081ba1c24b5d45d7e36c

8 years agoMerge \"Return correct default theme on API >= 24\" into nyc-dev
Alan Viverette [Wed, 8 Jun 2016 20:20:44 +0000 (20:20 +0000)]
Merge \"Return correct default theme on API >= 24\" into nyc-dev
am: afaa1e9db1

Change-Id: If520e4590d5d5b2832e3e53b25e95f6ca5e3b497

8 years agoMerge \"Handle alarm firing outside of DND period.\" into nyc-dev
Julia Reynolds [Wed, 8 Jun 2016 20:20:43 +0000 (20:20 +0000)]
Merge \"Handle alarm firing outside of DND period.\" into nyc-dev
am: e1451c4e30

Change-Id: I2fe8f9dbc048a830e6c06b4797151aaf306ca481

8 years agoMerge \"Wrap closeQuietly() on finally block.\" into nyc-dev
Felipe Leme [Wed, 8 Jun 2016 20:20:41 +0000 (20:20 +0000)]
Merge \"Wrap closeQuietly() on finally block.\" into nyc-dev
am: fb5995cfbb

Change-Id: I5f649b54038b586be375394d35fd34453213df0a

8 years agoMerge "resolve merge conflicts of 718f321 to nyc-mr1-dev" into nyc-mr1-dev
TreeHugger Robot [Wed, 8 Jun 2016 20:03:50 +0000 (20:03 +0000)]
Merge "resolve merge conflicts of 718f321 to nyc-mr1-dev" into nyc-mr1-dev

8 years agoMerge "Add launch power hint for activity launch end" into nyc-mr1-dev
Wei Wang [Wed, 8 Jun 2016 19:53:24 +0000 (19:53 +0000)]
Merge "Add launch power hint for activity launch end" into nyc-mr1-dev

8 years agoMerge "QS: Fix leak in QSAnimator" into nyc-dev
Jason Monk [Wed, 8 Jun 2016 19:12:05 +0000 (19:12 +0000)]
Merge "QS: Fix leak in QSAnimator" into nyc-dev

8 years agoMerge "QS: Show date even on small screens" into nyc-dev
Jason Monk [Wed, 8 Jun 2016 19:11:40 +0000 (19:11 +0000)]
Merge "QS: Show date even on small screens" into nyc-dev

8 years agoMerge "Fix crash when an app with an active quicksettings tile is updated to no longe...
Jason Monk [Wed, 8 Jun 2016 19:11:15 +0000 (19:11 +0000)]
Merge "Fix crash when an app with an active quicksettings tile is updated to no longer have that tile." into nyc-dev

8 years agoFix crash when an app with an active quicksettings tile is updated to no longer have...
Will Harmon [Mon, 6 Jun 2016 19:54:59 +0000 (12:54 -0700)]
Fix crash when an app with an active quicksettings tile is updated to no longer have that tile.

Fixes: 28721139
Change-Id: Ib53c7cc08e9378420a5fed3459c1e17864b28802

8 years agoMerge "Settings: Better handling for disabled tiles" into nyc-dev
Jason Monk [Wed, 8 Jun 2016 19:10:08 +0000 (19:10 +0000)]
Merge "Settings: Better handling for disabled tiles" into nyc-dev

8 years agoresolve merge conflicts of 718f321 to nyc-mr1-dev
Amith Yamasani [Wed, 8 Jun 2016 18:40:55 +0000 (11:40 -0700)]
resolve merge conflicts of 718f321 to nyc-mr1-dev

Change-Id: I0021aa5be1822082d8ff026cafa8c8b6b56b90b5

8 years agoMerge "Return correct default theme on API >= 24" into nyc-dev
Ian Pedowitz [Wed, 8 Jun 2016 18:27:59 +0000 (18:27 +0000)]
Merge "Return correct default theme on API >= 24" into nyc-dev

8 years agoMerge "Handle alarm firing outside of DND period." into nyc-dev
Julia Reynolds [Wed, 8 Jun 2016 18:19:12 +0000 (18:19 +0000)]
Merge "Handle alarm firing outside of DND period." into nyc-dev

8 years agoMerge \"Change unit of I/O statistics to MiB\" into nyc-dev
Tianjie Xu [Wed, 8 Jun 2016 18:04:32 +0000 (18:04 +0000)]
Merge \"Change unit of I/O statistics to MiB\" into nyc-dev
am: 00681d0e78

Change-Id: I150ccc3c3164ee487bf4c726b080d885f8b39696

8 years agoMerge "Wrap closeQuietly() on finally block." into nyc-dev
TreeHugger Robot [Wed, 8 Jun 2016 17:59:47 +0000 (17:59 +0000)]
Merge "Wrap closeQuietly() on finally block." into nyc-dev

8 years agoMerge "Add a separate read permission for oem unlock state" into nyc-dev
Amith Yamasani [Wed, 8 Jun 2016 17:55:39 +0000 (17:55 +0000)]
Merge "Add a separate read permission for oem unlock state" into nyc-dev

8 years agoMerge "Change unit of I/O statistics to MiB" into nyc-dev
Tianjie Xu [Wed, 8 Jun 2016 17:25:15 +0000 (17:25 +0000)]
Merge "Change unit of I/O statistics to MiB" into nyc-dev

8 years agoMerge "Disable some QS functionality in retail demo mode." into nyc-mr1-dev
Sudheer Shanka [Wed, 8 Jun 2016 17:15:03 +0000 (17:15 +0000)]
Merge "Disable some QS functionality in retail demo mode." into nyc-mr1-dev

8 years agoMerge "ShortcutManager: deal with changing resource IDs on app update" into nyc-mr1-dev
Makoto Onuki [Wed, 8 Jun 2016 16:59:59 +0000 (16:59 +0000)]
Merge "ShortcutManager: deal with changing resource IDs on app update" into nyc-mr1-dev

8 years agoMerge \"docs: Updates for picture-in-picture docs for N DP4\" into nyc-dev
Daniel Yu [Wed, 8 Jun 2016 16:34:09 +0000 (16:34 +0000)]
Merge \"docs: Updates for picture-in-picture docs for N DP4\" into nyc-dev
am: 22dec763a3

Change-Id: Ia70ede8a50300cebba25263976dd350ccc9b30de

8 years agoMerge "docs: Updates for picture-in-picture docs for N DP4" into nyc-dev
Dan Yu [Wed, 8 Jun 2016 16:22:26 +0000 (16:22 +0000)]
Merge "docs: Updates for picture-in-picture docs for N DP4" into nyc-dev

8 years agoMerge "ShortcutManager: Optimize package scanning" into nyc-mr1-dev
Makoto Onuki [Wed, 8 Jun 2016 16:16:39 +0000 (16:16 +0000)]
Merge "ShortcutManager: Optimize package scanning" into nyc-mr1-dev

8 years agoWrap closeQuietly() on finally block.
Felipe Leme [Wed, 8 Jun 2016 16:12:37 +0000 (09:12 -0700)]
Wrap closeQuietly() on finally block.

BUG: 29123428
Change-Id: Ife7a919343ce4b73eef759bbc87dd37f12a71bca

8 years agoReturn correct default theme on API >= 24
Alan Viverette [Wed, 8 Jun 2016 15:45:15 +0000 (11:45 -0400)]
Return correct default theme on API >= 24

This method was broken, but it was returning light theme on N preview
builds, so we'll keep it consistent as we move into N release.

Bug: 29192690
Change-Id: I0d16abbe48756070dcd653c39d0da4124ea66b28

8 years agoMerge \"Make Settings->Apps can handle work apps even work profile not enabled yet...
Ricky Wai [Wed, 8 Jun 2016 14:46:47 +0000 (14:46 +0000)]
Merge \"Make Settings->Apps can handle work apps even work profile not enabled yet\" into nyc-dev
am: 18c8690b7e

Change-Id: I8daa485fcf810c5c5bb40903216f8b989658b5ca

8 years agoMerge \"Fix #29073394: Need to bind to scorer after user is unlocked.\" into nyc-dev
Jeremy Joslin [Wed, 8 Jun 2016 14:39:09 +0000 (14:39 +0000)]
Merge \"Fix #29073394: Need to bind to scorer after user is unlocked.\" into nyc-dev
am: 464f7e4983

Change-Id: I40be62c7cb0c5802e9cfa3eb913c899c77d3df0e

8 years agoMerge "Make Settings->Apps can handle work apps even work profile not enabled yet...
Ricky Wai [Wed, 8 Jun 2016 14:33:55 +0000 (14:33 +0000)]
Merge "Make Settings->Apps can handle work apps even work profile not enabled yet" into nyc-dev

8 years agoMerge "Fix #29073394: Need to bind to scorer after user is unlocked." into nyc-dev
TreeHugger Robot [Wed, 8 Jun 2016 14:32:42 +0000 (14:32 +0000)]
Merge "Fix #29073394: Need to bind to scorer after user is unlocked." into nyc-dev

8 years agoRe-add Internal API for cross-task Activity used by assistant.
George Mount [Wed, 8 Jun 2016 14:13:37 +0000 (07:13 -0700)]
Re-add Internal API for cross-task Activity used by assistant.

Bug: 29091742

This reverts commit 563df3b328f5488aaa33b894748029ed00d0e263.

This also fixes the problems experienced by b/29128683.

Change-Id: I8e3d485cb818ea9e03ca475cba88934f6f903f11

8 years agoMerge \"Import translations. DO NOT MERGE\" into nyc-dev
Baligh Uddin [Wed, 8 Jun 2016 13:21:51 +0000 (13:21 +0000)]
Merge \"Import translations. DO NOT MERGE\" into nyc-dev
am: 002ccec5c1  -s ours

Change-Id: I1d774f175bfff7e90b9253fe84222964f5d97677

8 years agoMerge \"Import translations. DO NOT MERGE\" into nyc-dev
Baligh Uddin [Wed, 8 Jun 2016 13:10:46 +0000 (13:10 +0000)]
Merge \"Import translations. DO NOT MERGE\" into nyc-dev
am: e573989e05  -s ours

Change-Id: Ia70e5266178ab687bac8299f6609825b54787b3c

8 years agoMerge \"Import translations. DO NOT MERGE\" into nyc-dev
Baligh Uddin [Wed, 8 Jun 2016 13:10:44 +0000 (13:10 +0000)]
Merge \"Import translations. DO NOT MERGE\" into nyc-dev
am: c20ea2eb43  -s ours

Change-Id: Ide205acdf26a282bd80ca2eb68b23f1a442c36a4

8 years agoMerge \"Import translations. DO NOT MERGE\" into nyc-dev
Baligh Uddin [Wed, 8 Jun 2016 13:10:41 +0000 (13:10 +0000)]
Merge \"Import translations. DO NOT MERGE\" into nyc-dev
am: 64d6fddc4b  -s ours

Change-Id: Ica64b4dbd45e67e8ed9bcad575126aaccb2bbf17

8 years agoMerge \"Import translations. DO NOT MERGE\" into nyc-dev
Baligh Uddin [Wed, 8 Jun 2016 13:10:38 +0000 (13:10 +0000)]
Merge \"Import translations. DO NOT MERGE\" into nyc-dev
am: 2d3c74a2fd  -s ours

Change-Id: I44308cc36bf4f3dde8fe34cd0e225914fa3d602d

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-dev
Baligh Uddin [Wed, 8 Jun 2016 13:09:24 +0000 (13:09 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev

8 years agoSettings: Better handling for disabled tiles
Jason Monk [Tue, 7 Jun 2016 18:01:32 +0000 (14:01 -0400)]
Settings: Better handling for disabled tiles

Push disabling into SettingsDrawerActivity and add a blacklist to
make sure they disappear immediately.

Change-Id: I79b9c596373cf9634008f6be88f4808af70eb071
Fixes: 29080209

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-dev
Baligh Uddin [Wed, 8 Jun 2016 13:05:46 +0000 (13:05 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-dev
Baligh Uddin [Wed, 8 Jun 2016 13:05:42 +0000 (13:05 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-dev
Baligh Uddin [Wed, 8 Jun 2016 13:05:38 +0000 (13:05 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-dev
Baligh Uddin [Wed, 8 Jun 2016 13:05:36 +0000 (13:05 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev

8 years agoQS: Fix leak in QSAnimator
Jason Monk [Tue, 7 Jun 2016 20:06:59 +0000 (16:06 -0400)]
QS: Fix leak in QSAnimator

Change-Id: I54f1e083cf6ba6bfb5abc0f416680cbda1401980
Fixes: 29113833

8 years agoMerge \"Package changed/removed listeners for always-on VPN\" into nyc-dev
Robin Lee [Wed, 8 Jun 2016 10:50:42 +0000 (10:50 +0000)]
Merge \"Package changed/removed listeners for always-on VPN\" into nyc-dev
am: ee5e4cc836

Change-Id: I8f7054b5a2ac69677a0e124e9a616b3d58b604af

8 years agoMerge "Package changed/removed listeners for always-on VPN" into nyc-dev
TreeHugger Robot [Wed, 8 Jun 2016 10:46:41 +0000 (10:46 +0000)]
Merge "Package changed/removed listeners for always-on VPN" into nyc-dev

8 years agoMerge changes Ic98e3bcb,Idb0c55fc,Ia8649061,I5e7e5a87 into nyc-mr1-dev
TreeHugger Robot [Wed, 8 Jun 2016 06:35:31 +0000 (06:35 +0000)]
Merge changes Ic98e3bcb,Idb0c55fc,Ia8649061,I5e7e5a87 into nyc-mr1-dev

* changes:
  Give WakeupMessage the ability to transport an object as well.
  Don't treat the lingerExpired broadcast specially.
  Add a test for mobile data always on.
  Add a FakeSettingsProvider and use it in ConnectivityServiceTest.

8 years agoGive WakeupMessage the ability to transport an object as well.
Lorenzo Colitti [Tue, 7 Jun 2016 07:27:10 +0000 (16:27 +0900)]
Give WakeupMessage the ability to transport an object as well.

Bug: 23113288
Change-Id: Ic98e3bcb3ea8b0b28a309bd647fb4178311c46a3

8 years agoDon't treat the lingerExpired broadcast specially.
Lorenzo Colitti [Sun, 5 Jun 2016 14:45:25 +0000 (23:45 +0900)]
Don't treat the lingerExpired broadcast specially.

NetworkMonitor no longer uses the broadcast for lingering, it
uses WakeupMessage instead.

Bug: 23113288
Change-Id: Idb0c55fc68cb8f45b3213c7134213904f227852e

8 years agoAdd a test for mobile data always on.
Lorenzo Colitti [Sun, 5 Jun 2016 12:00:23 +0000 (21:00 +0900)]
Add a test for mobile data always on.

Bug: 23113288
Change-Id: Ia8649061a797367d135bb5576600a7cdc85a822e

8 years agoAdd a FakeSettingsProvider and use it in ConnectivityServiceTest.
Lorenzo Colitti [Sat, 4 Jun 2016 17:20:29 +0000 (02:20 +0900)]
Add a FakeSettingsProvider and use it in ConnectivityServiceTest.

This class makes it easier to test code that uses Settings:

1. Real device or emulator settings don't affect the code under
   test; all settings always start off empty.
2. It's possible to change settings from the test without
   affecting system settings.
3. No changes are needed to the code under test. The changes to
   the tests are simple: just add a fake ContentResolver to
   whatever mock Context is already used by the test, and make
   that ContentResolver use the fake provider.

Bug: 23113288
Change-Id: I5e7e5a87571444ae49ccf551705620675a36cd17

8 years agoImport translations. DO NOT MERGE
Baligh Uddin [Wed, 8 Jun 2016 03:49:52 +0000 (20:49 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 29169863
Change-Id: Ic7b964650e55d381c9b2f7a18f1358a5cc033d21

8 years agoMerge \"Revert \"Improve accessibility window title behavior\"\" into nyc-dev
Phil Weaver [Wed, 8 Jun 2016 02:24:42 +0000 (02:24 +0000)]
Merge \"Revert \"Improve accessibility window title behavior\"\" into nyc-dev
am: fc71309640

Change-Id: I7b0c0636a69e4cc06d525f60d8621879ce45be22

8 years agoMerge "Revert "Improve accessibility window title behavior"" into nyc-dev
Phil Weaver [Wed, 8 Jun 2016 02:19:33 +0000 (02:19 +0000)]
Merge "Revert "Improve accessibility window title behavior"" into nyc-dev

8 years agoMerge \"Check if task was top of stack before it\'s removed\" into nyc-dev
Chong Zhang [Wed, 8 Jun 2016 01:26:27 +0000 (01:26 +0000)]
Merge \"Check if task was top of stack before it\'s removed\" into nyc-dev
am: 94b4029f03

Change-Id: I58b62cd4b61952e82b2e2e6951b0f3a40511a340

8 years agoMerge "Merge \"Use getActivityToken() instead of mToken in isTopOfTask\" into nyc...
Android Build Merger (Role) [Wed, 8 Jun 2016 01:23:03 +0000 (01:23 +0000)]
Merge "Merge \"Use getActivityToken() instead of mToken in isTopOfTask\" into nyc-dev am: 723e5afa9e" into nyc-mr1-dev

8 years agoMerge \"Use getActivityToken() instead of mToken in isTopOfTask\" into nyc-dev
Chong Zhang [Wed, 8 Jun 2016 01:22:43 +0000 (01:22 +0000)]
Merge \"Use getActivityToken() instead of mToken in isTopOfTask\" into nyc-dev
am: 723e5afa9e

Change-Id: Ib739a55588b270e76cdb11c5356fd90c19c644dc

8 years agoMerge "Added a getPrimaryStorageSize() method." into nyc-mr1-dev
TreeHugger Robot [Wed, 8 Jun 2016 01:22:17 +0000 (01:22 +0000)]
Merge "Added a getPrimaryStorageSize() method." into nyc-mr1-dev

8 years agoMerge "Check if task was top of stack before it's removed" into nyc-dev
Chong Zhang [Wed, 8 Jun 2016 01:18:00 +0000 (01:18 +0000)]
Merge "Check if task was top of stack before it's removed" into nyc-dev

8 years agoMerge \"Duplicate file descriptor when dumping asynchronously.\" into nyc-dev
Felipe Leme [Wed, 8 Jun 2016 01:15:06 +0000 (01:15 +0000)]
Merge \"Duplicate file descriptor when dumping asynchronously.\" into nyc-dev
am: c02ba17898

Change-Id: Ief488d02aac6900453e5344959aad8c417d60c8d

8 years agoMerge "Use getActivityToken() instead of mToken in isTopOfTask" into nyc-dev
Chong Zhang [Wed, 8 Jun 2016 01:12:25 +0000 (01:12 +0000)]
Merge "Use getActivityToken() instead of mToken in isTopOfTask" into nyc-dev

8 years agoMerge "Duplicate file descriptor when dumping asynchronously." into nyc-dev
TreeHugger Robot [Wed, 8 Jun 2016 01:08:40 +0000 (01:08 +0000)]
Merge "Duplicate file descriptor when dumping asynchronously." into nyc-dev

8 years agoMerge \"Set fontScale in override config to be equal to global.\" into nyc-dev
Chong Zhang [Wed, 8 Jun 2016 01:04:12 +0000 (01:04 +0000)]
Merge \"Set fontScale in override config to be equal to global.\" into nyc-dev
am: c9adac6abb

Change-Id: If62da650207267872815af6f7e793b193e23d10e

8 years agoImport translations. DO NOT MERGE
Baligh Uddin [Wed, 8 Jun 2016 01:03:04 +0000 (18:03 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 29169863
Change-Id: Ieac4df1080a37509c12c420f15e64063e9c15fc4

8 years agoMerge "Set fontScale in override config to be equal to global." into nyc-dev
Chong Zhang [Wed, 8 Jun 2016 00:59:43 +0000 (00:59 +0000)]
Merge "Set fontScale in override config to be equal to global." into nyc-dev

8 years agoChange unit of I/O statistics to MiB
Tianjie Xu [Thu, 2 Jun 2016 19:38:17 +0000 (12:38 -0700)]
Change unit of I/O statistics to MiB

I/O in bytes are too large and it may cause overflow. Moreover, data with
large numbers are grouped in the same bucket of the histogram. This adds
difficulty to the analysis. Changing unit of I/O to MiB so that we can
have a better data distribution.

Bug: 28658632
Change-Id: Id9913d71e62b36ce5d5d2e57676953f4dbd0c7c9

8 years agoMerge \"Fix int overflow in SpannableStringBuilder.replace\" into nyc-dev
Siyamed Sinir [Wed, 8 Jun 2016 00:50:14 +0000 (00:50 +0000)]
Merge \"Fix int overflow in SpannableStringBuilder.replace\" into nyc-dev
am: 96c3e5504b

Change-Id: Ibac22676dcfcd8874bc2415f7fb4f76849896748

8 years agoMerge "Fix int overflow in SpannableStringBuilder.replace" into nyc-dev
Siyamed Sinir [Wed, 8 Jun 2016 00:46:27 +0000 (00:46 +0000)]
Merge "Fix int overflow in SpannableStringBuilder.replace" into nyc-dev

8 years agoMerge \"Frameworks/base: Fix FastPrintWriter infinite loop\" into nyc-dev
Andreas Gampe [Wed, 8 Jun 2016 00:45:34 +0000 (00:45 +0000)]
Merge \"Frameworks/base: Fix FastPrintWriter infinite loop\" into nyc-dev
am: c82a2b5358

Change-Id: I9ff1746643acbbf8663b6e1c5fce553e4f803df4

8 years agoMerge "Frameworks/base: Fix FastPrintWriter infinite loop" into nyc-dev
TreeHugger Robot [Wed, 8 Jun 2016 00:38:59 +0000 (00:38 +0000)]
Merge "Frameworks/base: Fix FastPrintWriter infinite loop" into nyc-dev

8 years agoMerge \"Move legacy full disk encryption code to Settings.\" into nyc-dev
Jim Miller [Wed, 8 Jun 2016 00:38:25 +0000 (00:38 +0000)]
Merge \"Move legacy full disk encryption code to Settings.\" into nyc-dev
am: 4401e24add

Change-Id: Ibe8709900618cc5d9c5ca18a88ca6fce8c552d54

8 years agoRevert "Improve accessibility window title behavior"
Phil Weaver [Wed, 8 Jun 2016 00:34:40 +0000 (00:34 +0000)]
Revert "Improve accessibility window title behavior"

Bug: 29127065

This reverts commit 2a7e4442bf9892842e0fc7eba9296e8fcf9f8ea5.

Change-Id: Ibc5527cfedd49c685ffd1b8ae59e87ed99c93d39

8 years agoImport translations. DO NOT MERGE
Baligh Uddin [Wed, 8 Jun 2016 00:32:37 +0000 (17:32 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 29169863
Change-Id: I3d2586f7265f533c4b1620349c1a52851b4586e0

8 years agoMerge "Move legacy full disk encryption code to Settings." into nyc-dev
TreeHugger Robot [Wed, 8 Jun 2016 00:31:28 +0000 (00:31 +0000)]
Merge "Move legacy full disk encryption code to Settings." into nyc-dev

8 years agoImport translations. DO NOT MERGE
Baligh Uddin [Wed, 8 Jun 2016 00:16:36 +0000 (17:16 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 29169863
Change-Id: Icab456e7a193fc6099bbd6e7ff207d542e98830e

8 years agoImport translations. DO NOT MERGE
Baligh Uddin [Wed, 8 Jun 2016 00:02:34 +0000 (17:02 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 29169863
Change-Id: I717395f19e8605b4ad4af00b8601ff59c3acb73c

8 years agoHandle alarm firing outside of DND period.
Julia Reynolds [Thu, 2 Jun 2016 16:53:42 +0000 (12:53 -0400)]
Handle alarm firing outside of DND period.

Change-Id: Ib8bb878709ab8b5db8aba7f31e239e44409e18d4
Fixes: 28459870

8 years agoMerge "Fix build break by adding missing parenthesis." into nyc-mr1-dev
Sharvil Nanavati [Tue, 7 Jun 2016 23:43:43 +0000 (23:43 +0000)]
Merge "Fix build break by adding missing parenthesis." into nyc-mr1-dev

8 years agoAdded a getPrimaryStorageSize() method.
Felipe Leme [Thu, 12 May 2016 19:56:28 +0000 (12:56 -0700)]
Added a getPrimaryStorageSize() method.

BUG: 24128505

Change-Id: I0b75d3c5505dadedf5d06868614b3a01765cc5d3

** Cherrypicked from master **

8 years agoFix build break by adding missing parenthesis.
Sharvil Nanavati [Tue, 7 Jun 2016 23:41:16 +0000 (16:41 -0700)]
Fix build break by adding missing parenthesis.

Change-Id: Ia9a47e24b25e3093f19aeea297a86964c8f00722

8 years agoDuplicate file descriptor when dumping asynchronously.
Felipe Leme [Tue, 7 Jun 2016 23:14:07 +0000 (16:14 -0700)]
Duplicate file descriptor when dumping asynchronously.

dumpDbInfo() uses an async task when dumping from the system thread, but
then the file descriptor is closed by the time the task is executed. As
such, the system databases are not dumped.

BUG: 29123428
Change-Id: Ibb8bbe503aa03c3ca13b2b1789f0ead0b869e9d5

8 years agoShortcutManager: deal with changing resource IDs on app update
Makoto Onuki [Thu, 2 Jun 2016 23:13:10 +0000 (16:13 -0700)]
ShortcutManager: deal with changing resource IDs on app update

- When an app is upgraded, all the resource IDs may change.  So
if a shortcut is previously published with an icon for res ID 100
and the publisher is upgraded, resource #100 may refer to something
different.

- So now the service also remembers resource names for icon resources,
as wells as string resources.  When an app is updated, the service
fetch the updated resource IDs by name.

- Also extract all string resources when a shortcut is published
and persist them, so that even when the original string resources are
removed from the app, the launcher can still show the extracted strings.

- When the system locale changes, re-extract all string resources.

- Also really hide the constants in ShortcutInfo that were
accidentally made public.

Change-Id: I23c29b45c1de5d76175229190a1533c9c62c5960

8 years agoMerge \"Add usage line for dump-profiles\" into nyc-dev
David Sehr [Tue, 7 Jun 2016 23:10:07 +0000 (23:10 +0000)]
Merge \"Add usage line for dump-profiles\" into nyc-dev
am: a85c1e8e69

Change-Id: I62cf1d3c0ea6295500fbb730dfa75e7046c8c06d

8 years agoFrameworks/base: Fix FastPrintWriter infinite loop
Andreas Gampe [Tue, 7 Jun 2016 23:02:23 +0000 (16:02 -0700)]
Frameworks/base: Fix FastPrintWriter infinite loop

Check for error condition in loop.

Bug: 29123428
Change-Id: I361ed27ecb8f05512d7e17f8045f3d34667d32d8

8 years agoMerge "Add usage line for dump-profiles" into nyc-dev
David Sehr [Tue, 7 Jun 2016 23:01:09 +0000 (23:01 +0000)]
Merge "Add usage line for dump-profiles" into nyc-dev

8 years agoMinor fixes to distribute cards and fab. am: 5ec3a404fb am: ba9c3d585f am: f5c85abac6
Dirk Dougherty [Tue, 7 Jun 2016 22:57:41 +0000 (22:57 +0000)]
Minor fixes to distribute cards and fab. am: 5ec3a404fb am: ba9c3d585f am: f5c85abac6
am: f91783c8a5

Change-Id: I1094dd6a0a256ce7dd4942ce02374b4b44786278

8 years agoSet fontScale in override config to be equal to global.
Chong Zhang [Sat, 4 Jun 2016 00:43:10 +0000 (17:43 -0700)]
Set fontScale in override config to be equal to global.

The default fontScale in EMPTY config is 1.0. This will result in
updateFrom always overriding the fontScale to 1.0 since it's non-zero.

We can't set it to 0.0 either as that will make the override config
not equal to EMPTY. The rest of the code doesn't work well with that.

So here we always set the override fontScale to be idential to global.

bug: 29113700
Change-Id: I1dbe507145b8190a9ae5e108948c833d4e037e1d

8 years agoMinor fixes to distribute cards and fab. am: 5ec3a404fb am: ba9c3d585f
Dirk Dougherty [Tue, 7 Jun 2016 22:53:20 +0000 (22:53 +0000)]
Minor fixes to distribute cards and fab. am: 5ec3a404fb am: ba9c3d585f
am: f5c85abac6

Change-Id: I2ea6f9370725235b9d63f6c5a843e42b09361315

8 years agoMinor fixes to distribute cards and fab. am: 5ec3a404fb
Dirk Dougherty [Tue, 7 Jun 2016 22:48:17 +0000 (22:48 +0000)]
Minor fixes to distribute cards and fab. am: 5ec3a404fb
am: ba9c3d585f

Change-Id: I6f250c2b9733562e388e2cd81ab9b7c365bb3c9a

8 years agoMinor fixes to distribute cards and fab.
Dirk Dougherty [Tue, 7 Jun 2016 22:45:30 +0000 (22:45 +0000)]
Minor fixes to distribute cards and fab.
am: 5ec3a404fb

Change-Id: I47c10ecd60b616bd0f343cb2309820c800d5a077

8 years agoMinor fixes to distribute cards and fab.
Dirk Dougherty [Tue, 7 Jun 2016 22:39:03 +0000 (15:39 -0700)]
Minor fixes to distribute cards and fab.

Change-Id: I125162be9d53faef0c477a2e2592624bb5869ff4

8 years agoMerge "Adds CDMA Voice Privacy Property to Call" into nyc-mr1-dev
Brad Ebinger [Tue, 7 Jun 2016 22:14:50 +0000 (22:14 +0000)]
Merge "Adds CDMA Voice Privacy Property to Call" into nyc-mr1-dev

8 years agoMerge "Fix flaky discoverable stress test." into nyc-mr1-dev
Sharvil Nanavati [Tue, 7 Jun 2016 22:14:21 +0000 (22:14 +0000)]
Merge "Fix flaky discoverable stress test." into nyc-mr1-dev

8 years agoFix flaky discoverable stress test.
Sharvil Nanavati [Tue, 7 Jun 2016 20:35:59 +0000 (13:35 -0700)]
Fix flaky discoverable stress test.

Bug: 28980767
Change-Id: I6858456f58118a3385b05d42361a5c9223ebbdc4

8 years agodocs: Added CL commands for data-saver testing am: b603eae9b3 am: 2d05938af9
Eric Schmidt [Tue, 7 Jun 2016 21:57:50 +0000 (21:57 +0000)]
docs: Added CL commands for data-saver testing am: b603eae9b3 am: 2d05938af9
am: d0ef8a0147

* commit 'd0ef8a01470e83c9161e398b804b5264d71a6bb3':
  docs: Added CL commands for data-saver testing

Change-Id: I14490c4309d6318436b8430035de8cb27329141e

8 years agodocs: Added CL commands for data-saver testing am: b603eae9b3
Eric Schmidt [Tue, 7 Jun 2016 21:52:54 +0000 (21:52 +0000)]
docs: Added CL commands for data-saver testing am: b603eae9b3
am: 2d05938af9

* commit '2d05938af9e572ca9582552ad966c18b7b83e94f':
  docs: Added CL commands for data-saver testing

Change-Id: Ic0f9a82f05dc32b162013df51c155f2a1a206c45

8 years agodocs: Added CL commands for data-saver testing
Eric Schmidt [Tue, 7 Jun 2016 21:47:47 +0000 (21:47 +0000)]
docs: Added CL commands for data-saver testing
am: b603eae9b3

* commit 'b603eae9b363ca292d721243819dfd701a194b65':
  docs: Added CL commands for data-saver testing

Change-Id: I1f5bf236f72db694ddedfe6552f188242d5f61a1

8 years agodocs: Added CL commands for data-saver testing
Eric Schmidt [Tue, 31 May 2016 22:56:48 +0000 (15:56 -0700)]
docs: Added CL commands for data-saver testing

Bug: 28951799
Change-Id: I03ae59b1d98b8e58dc859c8158b318718c8a9f13