drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
124,638 Commits 1 Branch 0 Tags
Commit Graph

124638 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Christopher Tate
ff8b037c10 am 777b8a80: am 422b2656: resolved conflicts for merge of c45ff35f to klp-modular-dev 
* commit '777b8a808ee76401429f7210ebb7194632040d45':
  Adapt to underlying changes in the PBKDF2 implementation

Change-Id: Ia68694a03e52693fceaedc6740dbd8e690e21257
 2014-03-05 16:17:34 -08:00
John Reck
2665f6e9f5 Merge "Remove invalid usage of DisplayList.isValid()" 2014-03-06 00:07:29 +00:00
John Reck
7558aa7081 Remove invalid usage of DisplayList.isValid() 
Bug: 13324734

 Editor was using isValid as a mechanism to track whether or not it
 needed to re-record the DisplayList. This is not correct as isValid()
 is not a general-purpose dirty bit. Add an explicit dirty bit for
 Editor to use instead

Change-Id: I5608b151791870fca3681056b5507bd39ee48f52
 2014-03-05 15:01:04 -08:00
John Spurlock
1f97d0ae87 Balance calls to setStreamMute. 
Otherwise can get into a situation where ringer volume appears
permanently muted (until reboot).

Change-Id: I58c09f68dc02cba4de72e3a024b72484b9b9bc82
 2014-03-05 17:36:24 -05:00
Svetoslav
dd2ce3448b Merge "Allow click listener registration in NumberPicker." 2014-03-05 22:35:13 +00:00
Jake Hamby
322f7d6e4a Merge "Add get/setPreferredNetworkType() for OMA DM client." 2014-03-05 21:53:35 +00:00
John Spurlock
8c7d4180e9 Merge "Block calls in limited interruptions mode." 2014-03-05 21:24:14 +00:00
John Spurlock
c323b8d4d6 Block calls in limited interruptions mode. 
Calls should be blocked by default in this mode, not allowed.

Change-Id: Ia628389857c5df90cec820efd0ca81e1d949631e
 2014-03-05 16:18:04 -05:00
Santos Cordon
8a84205ae2 Merge "Updating wording around PROCESS_INCOMING_CALL." 2014-03-05 21:17:16 +00:00
John Reck
8f649dda50 Merge "DisplayList lifecycle fixes" 2014-03-05 21:05:39 +00:00
John Reck
eef19cc2ee DisplayList lifecycle fixes 
Bug: 13324014
 Bug: 13324861

 Don't use a DisplayList for the background if the View is detached.
 mAttachInfo can be null in onDetachedFromWindow

Change-Id: I6d1413b956dd35cd2f5256860223013d2a570870
 2014-03-05 13:02:00 -08:00
Brian Carlstrom
aa1d023bb9 am 674fd6c4: am a258b4a9: am 485e3b45: am 5c126c3d: Merge "Add dex2oat-flags plumbing to AndroidRuntime" 
* commit '674fd6c442cd3886b3ab12be1d36c5d05ef48cdb':
  Add dex2oat-flags plumbing to AndroidRuntime
 2014-03-05 20:09:52 +00:00
Brian Carlstrom
674fd6c442 am a258b4a9: am 485e3b45: am 5c126c3d: Merge "Add dex2oat-flags plumbing to AndroidRuntime" 
* commit 'a258b4a9e8a519c3b181848c9b8fb2f0e2142d8f':
  Add dex2oat-flags plumbing to AndroidRuntime
 2014-03-05 20:04:21 +00:00
Brian Carlstrom
a258b4a9e8 am 485e3b45: am 5c126c3d: Merge "Add dex2oat-flags plumbing to AndroidRuntime" 
* commit '485e3b459491267ae1390e1df5ff8f7d4695f819':
  Add dex2oat-flags plumbing to AndroidRuntime
 2014-03-05 19:29:40 +00:00
Brian Carlstrom
485e3b4594 am 5c126c3d: Merge "Add dex2oat-flags plumbing to AndroidRuntime" 
* commit '5c126c3d1703d8bef9a55dcc01f1fabf17811f60':
  Add dex2oat-flags plumbing to AndroidRuntime
 2014-03-05 11:26:44 -08:00
Brian Carlstrom
5c126c3d17 Merge "Add dex2oat-flags plumbing to AndroidRuntime" 2014-03-05 19:23:48 +00:00
Mike Lockwood
216ce34d04 Merge "Remove non-existent classes from preloaded-classes" 2014-03-05 18:59:06 +00:00
Tom O'Neill
fc1fa64020 Merge "Remove reference to internal bug number" 2014-03-05 18:41:47 +00:00
Brian Attwell
48d04ec3b7 Merge "Add IN_DEFAULT_DIRECTORY to contract" 2014-03-05 17:39:27 +00:00
John Reck
24ba99c235 Merge "DisplayList overhaul" 2014-03-05 17:00:54 +00:00
Kenny Guy
e17bbad521 Merge "Fix bug with starting users in background." 2014-03-05 16:56:41 +00:00
Kenny Guy
264707caa3 Fix bug with starting users in background. 
It shouldn't tell the window manager to lock or freeze the
screen when starting a user in the background.

Change-Id: I24c6c19a20c360ecbed7d28e1d7249c025a463b9
 2014-03-05 15:40:10 +00:00
Santos Cordon
b4aeac7305 Updating wording around PROCESS_INCOMING_CALL. 
bug: 12175514

Change-Id: I37dba7eedbf86c0b87ce559a52fe0b15c6911bfa
 2014-03-04 18:51:18 -08:00
Alan Viverette
4b131046aa Revert "Revert "Fix the build."" 
WE MUST GO DEEPER

This reverts commit 9e0c0a6e974c8f006596207cb5ec92c7bfe1fa44.

Change-Id: Ia89f764648e15a60ce488d8a2b4bce97bdb37b20
 2014-03-05 02:09:32 +00:00
Alan Viverette
9e0c0a6e97 Revert "Fix the build." 
This reverts commit 737629a346e953f5506672834e466acbb06caf39.

Change-Id: If3775b57f343094d343991e964faa202748d0236
 2014-03-05 02:08:29 +00:00
Alan Viverette
737629a346 Fix the build. 
Change-Id: If6c301de541750ef76572879facc2c1f8f2c5855
 2014-03-04 17:43:25 -08:00
Brian Attwell
2fa85d383d Add IN_DEFAULT_DIRECTORY to contract 
I want to expose this flag so that gmail can sort
based on it. Plus, it provides generally useful information.

Bug: 13173524
Change-Id: I93a35f8822b55f97b15e1fbb783110e3674c1622
 2014-03-04 17:41:13 -08:00
Alan Viverette
9e97fcba6a Merge "Add lower density assets for Quantum" 2014-03-05 01:23:17 +00:00
Christopher Tate
d4f30319ad am 31aa0772: am 7a4e519e: am 8106dce7: am a6c59158: am f63ae644: am 1e995c76: Merge "Update PackageMonitor to recognize new \'replacing\' semantics" into klp-dev 
* commit '31aa077226b8d9d65d351ddb92a01273d9830070':
  Update PackageMonitor to recognize new 'replacing' semantics
 2014-03-05 01:11:53 +00:00
Christopher Tate
31aa077226 am 7a4e519e: am 8106dce7: am a6c59158: am f63ae644: am 1e995c76: Merge "Update PackageMonitor to recognize new \'replacing\' semantics" into klp-dev 
* commit '7a4e519eda4e0e7bac9ad0159b29b11f61b50e01':
  Update PackageMonitor to recognize new 'replacing' semantics
 2014-03-05 01:08:46 +00:00
Christopher Tate
7a4e519eda am 8106dce7: am a6c59158: am f63ae644: am 1e995c76: Merge "Update PackageMonitor to recognize new \'replacing\' semantics" into klp-dev 
* commit '8106dce705ba69d5bc0ccafa8e21068216f42a5f':
  Update PackageMonitor to recognize new 'replacing' semantics
 2014-03-05 01:05:31 +00:00
Christopher Tate
8106dce705 am a6c59158: am f63ae644: am 1e995c76: Merge "Update PackageMonitor to recognize new \'replacing\' semantics" into klp-dev 
* commit 'a6c59158761423551941f6ed338a117658e581ad':
  Update PackageMonitor to recognize new 'replacing' semantics
 2014-03-05 01:00:50 +00:00
Christopher Tate
a6c5915876 am f63ae644: am 1e995c76: Merge "Update PackageMonitor to recognize new \'replacing\' semantics" into klp-dev 
* commit 'f63ae644a80ef2d0bd7bfb448eebb19691e4b6ec':
  Update PackageMonitor to recognize new 'replacing' semantics
 2014-03-05 00:57:18 +00:00
Christopher Tate
f63ae644a8 am 1e995c76: Merge "Update PackageMonitor to recognize new \'replacing\' semantics" into klp-dev 
* commit '1e995c76485f8a7477177886890b834c31e8d1a6':
  Update PackageMonitor to recognize new 'replacing' semantics
 2014-03-05 00:54:14 +00:00
Christopher Tate
1e995c7648 Merge "Update PackageMonitor to recognize new 'replacing' semantics" into klp-dev 2014-03-05 00:51:04 +00:00
Alan Viverette
465f2940ae Add lower density assets for Quantum 
BUG: 13300223
Change-Id: I1d89d92b5a3a4dbb6b21b740ede3cd4fffdac0b9
 2014-03-04 16:12:34 -08:00
Dave Platt
63761a2d79 am bf588bda: am f08cd8c6: am 7d8262cb: am 22f66b76: Merge "Harden NsdManager against null-dereference crashes" 
* commit 'bf588bda2c4dc98919439946e905e98ad4d352dd':
  Harden NsdManager against null-dereference crashes
 2014-03-04 23:51:51 +00:00
Will Haldean Brown
568628dc2c Manually merge commit '2faf28cf' into master 
Original commit message:

  Add swipe-to-dismiss support to PhoneWindow.

  This adds a new window feature -- FEATURE_SWIPE_TO_DISMISS -- and a
  theme attribute to activate that feature. When the feature is
  activated, a SwipeDismissLayout is inflated as the DecorView layout.
  SwipeDismissLayout intercepts touch events and steals ones that are
  large swipes to the right if its children don't. PhoneWindow
  registers handlers that listen for these swipe events, translate the
  window when necessary, and finish the activity at the end of the
  gesture.

Conflicts:
	core/java/android/view/Window.java
	core/res/res/values/attrs.xml

Change-Id: I943290b436864ca4a1bd401b88d696e08c921cdd
 2014-03-04 15:25:43 -08:00
John Reck
44fd8d24f7 DisplayList overhaul 
Change-Id: I53418d580c98f706e971545cff81b9921c12cc5f
 2014-03-04 15:18:16 -08:00
John Spurlock
0a5500a8fc resolved conflicts for merge of 0dd1a828 to master 
Change-Id: I6992c309b22a0b2e2ecfcafdd45a828be5aceb2c
 2014-03-04 17:32:16 -05:00
Chris Craik
240bd32345 Merge "Pass correct paint to HW layer" 2014-03-04 22:18:32 +00:00
Brian Carlstrom
3beff1e023 Add dex2oat-flags plumbing to AndroidRuntime 
Change-Id: Idaa7e5351e146d76e1972cbe4d93af69f0b999a6
 2014-03-04 14:08:46 -08:00
John Spurlock
e5f4234e01 am 42c0c519: am a12c0bf8: am ed7d7cba: am c3371eb5: am 49eac16e: am 8ec59a72: Merge "Show hideycling for non-primary users." into klp-dev 
* commit '42c0c51930b77d9eb4357aad53eaf72a7b3c117f':
  Show hideycling for non-primary users.
 2014-03-04 22:08:45 +00:00
John Spurlock
c6048361c6 am 6db2cfe6: am b61fde1f: am b85214bc: am 0a3bc3c4: am 2cc271eb: am d36ede39: Merge "Allow lights-out + bar icon dimming on low-end devices." into klp-dev 
* commit '6db2cfe6e14b8c1ee38e1fd5641e8af874a28011':
  Allow lights-out + bar icon dimming on low-end devices.
 2014-03-04 22:08:42 +00:00
Guang Zhu
ba27041f8c am 395e3f51: am ca3af0d7: am a70d20f6: am 818f83d9: am bf7b64bd: am be659185: use min app launch time in AppLaunch perf test 
* commit '395e3f51805149bf810d55b4e9e8968b76f59fd1':
  use min app launch time in AppLaunch perf test
 2014-03-04 22:08:38 +00:00
Dave Platt
bf588bda2c am f08cd8c6: am 7d8262cb: am 22f66b76: Merge "Harden NsdManager against null-dereference crashes" 
* commit 'f08cd8c656c4ea6a8c7bf8bafa3f8de72578ebca':
  Harden NsdManager against null-dereference crashes
 2014-03-04 22:06:56 +00:00
Dave Platt
f08cd8c656 am 7d8262cb: am 22f66b76: Merge "Harden NsdManager against null-dereference crashes" 
* commit '7d8262cb554c41892794f23b92e01b52458288bb':
  Harden NsdManager against null-dereference crashes
 2014-03-04 22:02:55 +00:00
Dave Platt
7d8262cb55 am 22f66b76: Merge "Harden NsdManager against null-dereference crashes" 
* commit '22f66b76f5e49704f3be76ad3fff7e4b5456864d':
  Harden NsdManager against null-dereference crashes
 2014-03-04 13:59:57 -08:00
Dave Platt
22f66b76f5 Merge "Harden NsdManager against null-dereference crashes" 2014-03-04 21:55:56 +00:00
Will Haldean Brown
2faf28cf85 am 11c51608: am bd79652a: Merge "Add swipe-to-dismiss support to PhoneWindow." into klp-modular-dev 
* commit '11c51608ee1c368dd38b134603e85943629c6f44':
  Add swipe-to-dismiss support to PhoneWindow.
 2014-03-04 21:32:22 +00:00