Jason Monk
8efeae7eb4
am 2e647efe: Merge "Move LOCK_TO_APP_EXIT_LOCKED from System to Secure" into lmp-mr1-dev
...
automerge: 5c69f5b
2014-11-03 14:42:18 +00:00
Narayan Kamath
cd4910ef60
am 2e1bd46a: am ef5d43a7: Merge "Revert "Revert "Remove unused apache related API."""
...
* commit '2e1bd46a1567fa987df04dd8eef66e91b50ef4f3':
Revert "Revert "Remove unused apache related API.""
2014-11-03 14:38:02 +00:00
Jason Monk
2e647efe01
Merge "Move LOCK_TO_APP_EXIT_LOCKED from System to Secure" into lmp-mr1-dev
2014-11-03 14:36:02 +00:00
Narayan Kamath
2e1bd46a15
am ef5d43a7: Merge "Revert "Revert "Remove unused apache related API."""
...
* commit 'ef5d43a7cf694ffac8b0069aa5026862d6b32735':
Revert "Revert "Remove unused apache related API.""
2014-11-03 14:31:11 +00:00
Narayan Kamath
4b8f1846ca
Revert "Revert "Remove unused apache related API.""
...
This reverts commit 31f54ef815
2014-11-03 13:32:10 +00:00
Narayan Kamath
4a51d06402
am 9301eafb: Merge "Fix getPackageInfo("android") in the system server." into lmp-mr1-dev
...
automerge: 726e9ea
2014-11-03 12:52:14 +00:00
Narayan Kamath
9301eafbcc
Merge "Fix getPackageInfo("android") in the system server." into lmp-mr1-dev
2014-11-03 12:45:16 +00:00
Jeff Brown
5177979bbd
am e333e674: Add a function to boost screen brightness temporarily. automerge: 0ed053e
...
automerge: a80162f
2014-11-01 15:04:52 +00:00
Alex Klyubin
a409cdf161
am dcf5af38: am 8129b8b4: am dd8accfe: Merge "Mention ECDHE_PSK bug in Javadoc of PskKeyManager." into lmp-docs automerge: 2f1c76f
...
automerge: 42340b9
2014-11-01 15:00:10 +00:00
Jeff Brown
0ed053ef53
am e333e674: Add a function to boost screen brightness temporarily.
...
* commit 'e333e674a758c39885d4d9779a1aad387fb0e6aa':
Add a function to boost screen brightness temporarily.
2014-11-01 14:10:46 +00:00
Alex Klyubin
2f1c76f074
am dcf5af38: am 8129b8b4: am dd8accfe: Merge "Mention ECDHE_PSK bug in Javadoc of PskKeyManager." into lmp-docs
...
* commit 'dcf5af38bfd306af77613aa051393bf7d8e8fb44':
Mention ECDHE_PSK bug in Javadoc of PskKeyManager.
2014-11-01 14:08:40 +00:00
Jeff Brown
e333e674a7
Add a function to boost screen brightness temporarily.
...
When PowerManager.boostScreenBrightness() is called, the screen
brightness is set to maximum for 5 seconds. This action is
also considered to be user activity.
Bug: 17934954
Change-Id: I1cb4a03a60705c6c1c5cc9ff84b1c5dbd2932fcd
2014-10-31 18:45:11 -07:00
Svet Ganov
28d51a39a1
am 182f0a13: Merge "Crash apps that print malformed or password protected PDFs." into lmp-mr1-dev
...
automerge: 4f5b8a6
2014-11-01 00:27:30 +00:00
Svet Ganov
182f0a136f
Merge "Crash apps that print malformed or password protected PDFs." into lmp-mr1-dev
2014-11-01 00:22:08 +00:00
Svet Ganov
fce84f035c
Crash apps that print malformed or password protected PDFs.
...
If apps are writing malformed content (typically not a PDF file) or if the
PDF content they provide to the print system is password protected, are now
crashed as both of these are app bugs.
bug:17636435
Change-Id: Ifce6a3199e587448dd38f6a84290a965c24b698b
2014-11-01 00:06:08 +00:00
Adam Powell
987f7168d5
am d8c941ff: Merge "Don\'t update OverScroller fling state if no time has passed since start" into lmp-mr1-dev
...
automerge: 35261e4
2014-10-31 23:49:49 +00:00
Adam Powell
d8c941ff46
Merge "Don't update OverScroller fling state if no time has passed since start" into lmp-mr1-dev
2014-10-31 23:42:43 +00:00
Dianne Hackborn
58f2a1e8a4
am f34fa3e7: Merge "Improve low on RAM reporting." into lmp-mr1-dev
...
automerge: 1816361
2014-10-31 23:23:40 +00:00
Dianne Hackborn
f34fa3e7aa
Merge "Improve low on RAM reporting." into lmp-mr1-dev
2014-10-31 22:44:24 +00:00
Christopher Lane
c56a9d10f7
am be36ebc2: Merge "Add convenience method for getting the complex unit type" into lmp-mr1-dev
...
automerge: 38d6cf9
2014-10-31 22:07:30 +00:00
Christopher Lane
be36ebc28d
Merge "Add convenience method for getting the complex unit type" into lmp-mr1-dev
2014-10-31 22:01:35 +00:00
Christopher Lane
9f357ae9f0
Add convenience method for getting the complex unit type
...
Bug: 18193912
Change-Id: Ida29c12c6c3f07ac0657e70d2ab07f2fc4f2cb20
2014-10-31 14:52:06 -07:00
George Mount
0d6624d35a
am fa21e757: Merge "Ensure views are attached prior to starting enter transition." into lmp-mr1-dev
...
automerge: 7bce500
2014-10-31 21:38:13 +00:00
George Mount
fa21e75734
Merge "Ensure views are attached prior to starting enter transition." into lmp-mr1-dev
2014-10-31 21:30:20 +00:00
Adam Powell
311506afbb
Don't update OverScroller fling state if no time has passed since start
...
If no time has passed when we try to update fling state, skip the
update computation since there is nothing to do.
Fixes a bug where we could return NaN from
OverScroller#getCurrentVelocity.
Bug 17700698
Change-Id: I65042d4d26a29593f66781b58456c2d1e85381c6
2014-10-31 14:03:01 -07:00
Adam Powell
dec2509d70
am b9eabc5c: Merge "Allow swipe down to dismiss for ResolverDrawerLayout" into lmp-mr1-dev
...
automerge: 63bb338
2014-10-31 20:35:42 +00:00
Adam Powell
b9eabc5c2b
Merge "Allow swipe down to dismiss for ResolverDrawerLayout" into lmp-mr1-dev
2014-10-31 20:28:48 +00:00
Amith Yamasani
84df64d400
am 8079a812: Merge "Backup and restore battery saver trigger level" into lmp-mr1-dev
...
automerge: 80e5f45
2014-10-31 20:00:57 +00:00
Svetoslav
eaaa38aea0
am b1ecf0d7: Merge "Adding APIs to enable apps to influence accessibility traversal." into lmp-mr1-dev
...
automerge: 97fcd2b
2014-10-31 19:58:57 +00:00
Amith Yamasani
8079a812aa
Merge "Backup and restore battery saver trigger level" into lmp-mr1-dev
2014-10-31 19:55:52 +00:00
Svetoslav
b1ecf0d776
Merge "Adding APIs to enable apps to influence accessibility traversal." into lmp-mr1-dev
2014-10-31 19:53:32 +00:00
Jason Monk
94cfd9d7c4
Move LOCK_TO_APP_EXIT_LOCKED from System to Secure
...
To prepare for controlling from settings.
While here, add lock to app settings to backups.
Bug: 16957435
Change-Id: I059140cd07a7a0d5ceb4e0bfe5e0176cb96629d3
2014-10-31 14:47:13 -04:00
Amith Yamasani
94005240ec
Backup and restore battery saver trigger level
...
Bug: 17836827
Change-Id: Icb6bf071a0966a8fb9a03fadd0f8b3daa5ad11f8
2014-10-31 11:35:13 -07:00
Dianne Hackborn
6edb5c665d
Improve low on RAM reporting.
...
- Don't print every little native process.
- Print in different sections, so if one is too long we don't get the
rest truncated in the log.
- Include other info from meminfo -- ksm and free/used/lost summary.
Change-Id: Iea4ec3860212667e195d2b60b3ded23bfec78436
2014-10-31 10:35:15 -07:00
Alex Klyubin
dcf5af38bf
am 8129b8b4: am dd8accfe: Merge "Mention ECDHE_PSK bug in Javadoc of PskKeyManager." into lmp-docs
...
* commit '8129b8b471e782708be945e40fa82d2c20ebceef':
Mention ECDHE_PSK bug in Javadoc of PskKeyManager.
2014-10-31 15:48:44 +00:00
Kenny Guy
6a7a24cc5a
am 88cfb428: Merge "Tidy up unused hidden methods in LauncherApps" into lmp-mr1-dev
...
automerge: d305bf3
2014-10-31 12:57:46 +00:00
Kenny Guy
88cfb428d4
Merge "Tidy up unused hidden methods in LauncherApps" into lmp-mr1-dev
2014-10-31 12:47:38 +00:00
Kenny Guy
dd6cb55b0e
Tidy up unused hidden methods in LauncherApps
...
Bug: 17483329
Change-Id: Ic4fbb180bafaa4d2c5ba332fe228c3d9baf4761c
2014-10-31 11:23:12 +00:00
Sander Alewijnse
a1ceb92964
am 94efda63: am a0edff4e: Merge "Change javadoc of setAccountManagementDisabled." into lmp-mr1-dev
...
* commit '94efda638e9789cacfbdffae6c6d6fae1dd41667':
Change javadoc of setAccountManagementDisabled.
2014-10-31 10:20:08 +00:00
Sander Alewijnse
a0edff4e94
Merge "Change javadoc of setAccountManagementDisabled." into lmp-mr1-dev
2014-10-31 10:05:36 +00:00
Adam Powell
5dd072d884
Allow swipe down to dismiss for ResolverDrawerLayout
...
Let the user swipe the intent resolver UI off of the screen to get rid
of it. So satisfying!
Also fix a bug where transitioning between touching the area outside
of the drawer to the drawer itself would misbehave or otherwise
dismiss when it shouldn't.
Bug 18026675
Change-Id: I456cc22b9575dc4c65e45154dc81201fe2045adc
2014-10-30 19:51:41 -07:00
Alan Viverette
e0e16794af
am 19745dc0: am 0c189ca5: Merge "Only draw AbsListView selector when focused or pressed" into lmp-mr1-dev
...
* commit '19745dc0f1686dbcadd0107a18e4336ce2de2729':
Only draw AbsListView selector when focused or pressed
2014-10-31 00:38:56 +00:00
George Mount
104257bac6
am cfff5427: am 57928195: Merge "Fix NPE when snapshot ImageView uses ScaleType.MATRIX." into lmp-mr1-dev
...
* commit 'cfff54270b7b09e66eb618b51706c3f8779fb110':
Fix NPE when snapshot ImageView uses ScaleType.MATRIX.
2014-10-31 00:38:48 +00:00
Alan Viverette
1dfcd0cc96
am e1f9f231: am 685a8770: Merge "Fix inset check in ThreadedRenderer" into lmp-mr1-dev
...
* commit 'e1f9f2311035177a91dd568c7ec9a821a76b9e24':
Fix inset check in ThreadedRenderer
2014-10-31 00:38:39 +00:00
Craig Mautner
6a80527f61
am 3bfd2b7b: am 159da3db: Merge "Add enter-animation-done callback for system windows" into lmp-mr1-dev
...
* commit '3bfd2b7b8fb83d47d4a624993c096e1f716df551':
Add enter-animation-done callback for system windows
2014-10-31 00:29:52 +00:00
Alan Viverette
b65a27da39
am d93421b1: am afffc5c2: Merge "Remove scroll view from correct parent in AlertController" into lmp-mr1-dev
...
* commit 'd93421b1438607f7656c7b65163c6681526693b0':
Remove scroll view from correct parent in AlertController
2014-10-31 00:29:29 +00:00
John Spurlock
68fdbd0179
am a0adb0bd: am fc2b9039: Merge "Unhide Settings.ACTION_BATTERY_SAVER_SETTINGS." into lmp-mr1-dev
...
* commit 'a0adb0bd46389b7ac0474b7727cdbdb36d0d48a0':
Unhide Settings.ACTION_BATTERY_SAVER_SETTINGS.
2014-10-31 00:28:28 +00:00
Alan Viverette
71c2789930
am e9e7d012: am 272e2f73: Merge "Ensure we don\'t pass null values in to Theme.resolveAttributes" into lmp-mr1-dev
...
* commit 'e9e7d012dd7df56227854fd0887b6f0476db8b67':
Ensure we don't pass null values in to Theme.resolveAttributes
2014-10-31 00:28:11 +00:00
Lorenzo Colitti
fa186dbd3d
am f2c90942: am bbb2c5b2: Merge "Add support for running 464xlat on wifi as well." into lmp-mr1-dev
...
* commit 'f2c9094293529f42b7183f0373b41a5278581a81':
Add support for running 464xlat on wifi as well.
2014-10-31 00:16:09 +00:00
Chris Banes
3726cd1285
am 95e3322c: am e436cb39: Merge "Fix ActionMenuView vertical alignment of items" into lmp-mr1-dev
...
* commit '95e3322c93fbfa4806f5ec0c63478854b4b29396':
Fix ActionMenuView vertical alignment of items
2014-10-31 00:15:48 +00:00
