Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
177,605 Commits 3 Branches 0 Tags
38b5d057f08a1a05df44f94de1053f74739c6677
Commit Graph

48524 Commits

Author SHA1 Message Date
Dianne Hackborn
f34fa3e7aa Merge "Improve low on RAM reporting." into lmp-mr1-dev 2014-10-31 22:44:24 +00:00
Christopher Lane
1bb81dd46e am c56a9d10: am be36ebc2: Merge "Add convenience method for getting the complex unit type" into lmp-mr1-dev automerge: 38d6cf9 
* commit 'c56a9d10f7b5ffa9a6023f3dff043cbea8b3cb96':
  Add convenience method for getting the complex unit type
 2014-10-31 22:13:29 +00:00
Christopher Lane
c56a9d10f7 am be36ebc2: Merge "Add convenience method for getting the complex unit type" into lmp-mr1-dev 
automerge: 38d6cf9

* commit '38d6cf9cbee98b3fe66e6ccda223b3c4c01a0815':
  Add convenience method for getting the complex unit type
 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
486384ef46 am 0d6624d3: am fa21e757: Merge "Ensure views are attached prior to starting enter transition." into lmp-mr1-dev automerge: 7bce500 
* commit '0d6624d35af7c7623cf97084753255079b01fbdf':
  Ensure views are attached prior to starting enter transition.
 2014-10-31 21:43:21 +00:00
George Mount
0d6624d35a am fa21e757: Merge "Ensure views are attached prior to starting enter transition." into lmp-mr1-dev 
automerge: 7bce500

* commit '7bce5007d2b2b218d11514a3df8e7109e37d9e7c':
  Ensure views are attached prior to starting enter transition.
 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
3bfcae769f am dec2509d: am b9eabc5c: Merge "Allow swipe down to dismiss for ResolverDrawerLayout" into lmp-mr1-dev automerge: 63bb338 
* commit 'dec2509d706f64fc81676fdde1c353e717a73ed0':
  Allow swipe down to dismiss for ResolverDrawerLayout
 2014-10-31 20:40:14 +00:00
Adam Powell
dec2509d70 am b9eabc5c: Merge "Allow swipe down to dismiss for ResolverDrawerLayout" into lmp-mr1-dev 
automerge: 63bb338

* commit '63bb33832380feb546d1a20d8f1c057f2088aed5':
  Allow swipe down to dismiss for ResolverDrawerLayout
 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
b9a7f37e71 am 84df64d4: am 8079a812: Merge "Backup and restore battery saver trigger level" into lmp-mr1-dev automerge: 80e5f45 
* commit '84df64d4009aa42ccca1bb4c4b03396fe441f990':
  Backup and restore battery saver trigger level
 2014-10-31 20:04:24 +00:00
Svetoslav
e7d267e3d8 am eaaa38ae: am b1ecf0d7: Merge "Adding APIs to enable apps to influence accessibility traversal." into lmp-mr1-dev automerge: 97fcd2b 
* commit 'eaaa38aea09e82fc557ebf0dd7fd02acfbfa1d59':
  Adding APIs to enable apps to influence accessibility traversal.
 2014-10-31 20:04:14 +00:00
Amith Yamasani
84df64d400 am 8079a812: Merge "Backup and restore battery saver trigger level" into lmp-mr1-dev 
automerge: 80e5f45

* commit '80e5f45979416c0bee487725eaf4078b6ba42769':
  Backup and restore battery saver trigger level
 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

* commit '97fcd2b5d15ed01b1ee27a30132e95b4733793cf':
  Adding APIs to enable apps to influence accessibility traversal.
 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
Kenny Root
8a97063720 Track change to Conscrypt 
Change way in which an outside caller can get the preferred SSLContext.

Bug: 17136008
Change-Id: Ide578664bcb605304322bfddd2e640a63042fa09
 2014-10-31 12:06:09 -07: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
48a69462cb am 6a7a24cc: am 88cfb428: Merge "Tidy up unused hidden methods in LauncherApps" into lmp-mr1-dev automerge: d305bf3 
* commit '6a7a24cc5ad073c6888d538b72a518a7cce79bde':
  Tidy up unused hidden methods in LauncherApps
 2014-10-31 13:02:57 +00:00
Kenny Guy
6a7a24cc5a am 88cfb428: Merge "Tidy up unused hidden methods in LauncherApps" into lmp-mr1-dev 
automerge: d305bf3

* commit 'd305bf3dff7dcb1084aab5777818b4d96975268d':
  Tidy up unused hidden methods in LauncherApps
 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
Nicolas Prevot
c4fc00a58d Do not fix uris inside the system. 
When we fix uris by adding the user id they belong to, the extras
of the intent are unpacked and repacked. This must not happen
inside the system process. It happened when ResolverActivity was
handling an activity intent coming from a different user.

BUG:18198630

Change-Id: I869897013bb2e5522584b404e87a8f20e7943b60
 2014-10-31 12:40:11 +00:00
Ignacio Solla
c418f07993 [WebView] Remove WEBVIEW_DATA_REDUCTION_PROXY setting. 
BUG:18152150

Change-Id: Id5c788bc766d7c45c3f9c96837d5b2824a601f9e
 2014-10-31 12:06:14 +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
fc3ddf1107 am a1ceb929: am 94efda63: am a0edff4e: Merge "Change javadoc of setAccountManagementDisabled." into lmp-mr1-dev 
* commit 'a1ceb92964612fca32bcd83e07b26e72994afca2':
  Change javadoc of setAccountManagementDisabled.
 2014-10-31 10:26:03 +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
Erik Kline
8e3f4fbdf6 Remove CONNECTIVITY_CHANGE_DELAY and friends. 
Once optimistic addresses become useable upon kernel notification
there will be no need for a connectivity delay.

This change requires kernel changes like:
    https://android-review.googlesource.com/#/c/109934

Bug: 17769720
Change-Id: I8510c540aa655aad6a82ee322d591331357ee272
 2014-10-31 14:07:33 +09: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
e7bcb1790a am e0e16794: am 19745dc0: am 0c189ca5: Merge "Only draw AbsListView selector when focused or pressed" into lmp-mr1-dev 
* commit 'e0e16794afa38e00cdd5e0a9c2bd25700b77e15b':
  Only draw AbsListView selector when focused or pressed
 2014-10-31 00:43:42 +00:00
George Mount
6ced4faf69 am 104257ba: am cfff5427: am 57928195: Merge "Fix NPE when snapshot ImageView uses ScaleType.MATRIX." into lmp-mr1-dev 
* commit '104257bac6dfd677a2f0a36467d5a42eef27e597':
  Fix NPE when snapshot ImageView uses ScaleType.MATRIX.
 2014-10-31 00:43:37 +00:00
Alan Viverette
7bec21e627 am 1dfcd0cc: am e1f9f231: am 685a8770: Merge "Fix inset check in ThreadedRenderer" into lmp-mr1-dev 
* commit '1dfcd0cc96d0cf50d81fe71101389a30e2bdbf2c':
  Fix inset check in ThreadedRenderer
 2014-10-31 00:43:33 +00: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
585b0c3dc1 am 6a80527f: am 3bfd2b7b: am 159da3db: Merge "Add enter-animation-done callback for system windows" into lmp-mr1-dev 
* commit '6a80527f617e603b3c4931ce88c7804d570de501':
  Add enter-animation-done callback for system windows
 2014-10-31 00:37:01 +00:00
Alan Viverette
5b0c065798 am b65a27da: am d93421b1: am afffc5c2: Merge "Remove scroll view from correct parent in AlertController" into lmp-mr1-dev 
* commit 'b65a27da39b53019f626bc9a380f0cad7e363bb8':
  Remove scroll view from correct parent in AlertController
 2014-10-31 00:36:54 +00:00
John Spurlock
57177c75ea am 68fdbd01: am a0adb0bd: am fc2b9039: Merge "Unhide Settings.ACTION_BATTERY_SAVER_SETTINGS." into lmp-mr1-dev 
* commit '68fdbd01798dad380581d02c5b9d229aecb10ef0':
  Unhide Settings.ACTION_BATTERY_SAVER_SETTINGS.
 2014-10-31 00:36:32 +00:00
Alan Viverette
613d43473e am 71c27899: am e9e7d012: am 272e2f73: Merge "Ensure we don\'t pass null values in to Theme.resolveAttributes" into lmp-mr1-dev 
* commit '71c2789930de7fb1b98ad10ea6a5e6f23500ead2':
  Ensure we don't pass null values in to Theme.resolveAttributes
 2014-10-31 00:36:28 +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
3d62297e85 am fa186dbd: am f2c90942: am bbb2c5b2: Merge "Add support for running 464xlat on wifi as well." into lmp-mr1-dev 
* commit 'fa186dbd3dce56dfc209b7c10a3bc66e7036055d':
  Add support for running 464xlat on wifi as well.
 2014-10-31 00:26:10 +00:00
Chris Banes
8094de110e am 3726cd12: am 95e3322c: am e436cb39: Merge "Fix ActionMenuView vertical alignment of items" into lmp-mr1-dev 
* commit '3726cd1285032baa9810c81fa99cdb6dc082ceac':
  Fix ActionMenuView vertical alignment of items
 2014-10-31 00:26:00 +00:00