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

150767 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alan Viverette
ec8d66cf55 am 96aab72d: am 5c9feadd: Merge "Make sure we\'re obtaining themed drawables correctly" into lmp-dev 
* commit '96aab72d045b646c551ebf5d765653447863794c':
  Make sure we're obtaining themed drawables correctly
 2014-08-15 11:35:14 +00:00
Jason Monk
21616def11 am 0e8c7a0d: am eb9daa91: Merge "Switch exiting screen pinning to recents+back" into lmp-dev 
* commit '0e8c7a0d216f74d89113398d7f9f6c8ff8432e37':
  Switch exiting screen pinning to recents+back
 2014-08-15 11:35:09 +00:00
Alan Viverette
8dce7c3ae5 am 170402a8: am e4ac85c2: Merge "Prevent SwitchPreference widget from receiving a11y focus" into lmp-dev 
* commit '170402a8f9729afc087fb17b15d4ed2bfda13cbf':
  Prevent SwitchPreference widget from receiving a11y focus
 2014-08-15 11:35:04 +00:00
Alan Viverette
602683909b am 54e70a6e: am f150fb34: Deprecate InputMethodService.enableHardwareAcceleration() 
* commit '54e70a6e81deab85c3f875eee57bc30b35c34dcf':
  Deprecate InputMethodService.enableHardwareAcceleration()
 2014-08-15 11:34:59 +00:00
Alan Viverette
0619830051 am 5e49cec8: am 056941f1: Merge "Don\'t set textColor in button style" into lmp-dev 
* commit '5e49cec80d772b83b7061a5bd4d3c7c62074f3e0':
  Don't set textColor in button style
 2014-08-15 11:34:54 +00:00
Anish Athalye
dd4308f5e7 am 675f13bf: am 2f2e3797: Merge "Make LeadingMarginSpan2 behavior more consistent" into lmp-dev 
* commit '675f13bfa8abcc439af1218e9de4d834e9253ede':
  Make LeadingMarginSpan2 behavior more consistent
 2014-08-15 11:34:47 +00:00
Jorim Jaggi
b1eada4fcf am aca1a03b: am dd26d8b2: Fix listening states for two-finger and fast-double swipe 
* commit 'aca1a03b6f6c5a923ea91273df61a575de425d9a':
  Fix listening states for two-finger and fast-double swipe
 2014-08-15 11:34:37 +00:00
Jorim Jaggi
e7113377f5 am ef8de29e: am 1550dd96: Don\'t scale notifications on Keyguard for devices < xxhdpi 
* commit 'ef8de29e61f374b19e25c015dc499afc16044c13':
  Don't scale notifications on Keyguard for devices < xxhdpi
 2014-08-15 11:34:19 +00:00
Jorim Jaggi
021675890f am f6042bff: am 7bcbac87: Merge "Disable DragDownHelper in QS" into lmp-dev 
* commit 'f6042bff3732153a3e4dc71c1e6014a8c2153710':
  Disable DragDownHelper in QS
 2014-08-15 11:34:14 +00:00
Dan Sandler
be33c94a85 am 2d117e78: am c514a213: No need for drawing caches on notifications. 
* commit '2d117e781603b2d73600b4f9db0f5622cfa13d41':
  No need for drawing caches on notifications.
 2014-08-15 11:34:09 +00:00
Adrian Roos
4a0f09f50e am f9f28f94: am cdc67b67: Label user switcher button for accessibility 
* commit 'f9f28f947c2046ebc2fda8f0b5caa6a3c7d441a1':
  Label user switcher button for accessibility
 2014-08-15 11:33:49 +00:00
RoboErik
f1dbc6bffb am 866ae744: am bc0d11a6: Merge "Pipe caller\'s identity through volume methods" into lmp-dev 
* commit '866ae74437ca37109a328c70696c7ee92e4d045c':
  Pipe caller's identity through volume methods
 2014-08-15 11:33:33 +00:00
Fabrice Di Meglio
6652b30039 am b73577a9: am 25c2863e: Fix bug #16957601 Stability: ISE in Settings: Observer com.android.settings. SettingsPreferenceFragment@273c8fdb was not registered 
* commit 'b73577a925e4acd930aea25bae17a04352d09bc3':
  Fix bug #16957601 Stability: ISE in Settings: Observer com.android.settings. SettingsPreferenceFragment$1@273c8fdb was not registered
 2014-08-15 11:33:14 +00:00
Winson Chung
f65cefb6dd am 1f141c58: am 91f8e91e: Merge "Anchoring the front most task to make the dismiss animation more stable. (Bug 16939699)" into lmp-dev 
* commit '1f141c581ac5d32e6cf29a7f4803676ad8d27d3b':
  Anchoring the front most task to make the dismiss animation more stable. (Bug 16939699)
 2014-08-15 11:33:09 +00:00
Chet Haase
a4888fbac9 Merge "Minor doc fixes from API council recommendations." into lmp-dev 2014-08-15 08:11:59 +00:00
Chet Haase
6beeb75723 Minor doc fixes from API council recommendations. 
Issue #17008236 API review: android.graphics

Change-Id: I171d376b642707858198d8a1379c732fcfcab4dd
 2014-08-15 11:14:48 -07:00
Andres Morales
e6b63e6c6f Merge "Fix issue where unlock handlers are not properly updated" into lmp-dev 2014-08-15 08:11:59 +00:00
Andres Morales
f9a97942e1 Fix issue where unlock handlers are not properly updated 
If an unlock handler already exists, we need to try
to update the tech mask for it. Don't permit unlock
handlers with no tech mask.

Bug: 17054331
Change-Id: I54a885d28bdd8ce41d8646d968621c7d6abc9387
 2014-08-15 17:08:24 +00:00
Adam Lesinski
5b9c045a6a am b4c3c976: Fix crash in ResStringPool 
* commit 'b4c3c9761bcdbf9ed3eb01c0145294dd730666bf':
  Fix crash in ResStringPool
 2014-08-15 07:05:43 +00:00
Adam Lesinski
4b2d0f20db Fix crash in ResStringPool 
When a String isn't found in the StringPool,
we should not try to construct a String8 object
from the NULL string.

Bug:15163956
Change-Id: I51e701918b10a72c18a860b8a36dce2afd9c0b82
 2014-08-15 06:39:01 +00:00
John Spurlock
e64b75ecd3 Merge "Zen: tweak audience interruption logic." into lmp-dev 2014-08-15 05:27:16 +00:00
John Spurlock
528dcd2fbe Zen: tweak audience interruption logic. 
Only check audience for calls & messages.

Bug:17061146
Change-Id: I7f0176a7184c725fef393784fe8ccb0eb7f49ff7
 2014-08-15 14:05:47 -04:00
Brian Carlstrom
261e240c05 Merge "Disable verification based on vold.decrypt. [frameworks/base]" into lmp-dev 2014-08-15 05:27:16 +00:00
Brian Carlstrom
df6c83fa7b Disable verification based on vold.decrypt. [frameworks/base] 
Bug: 15165413
Change-Id: I7aff8e2a2890971fe97769d42121c207dc36aa7c
 2014-08-15 09:58:03 -07:00
Jae Seo
38a9bcf240 am 810e043b: am 85d40b29: am 8b6c899b: Merge "TIF: fix IOException at PersistentDataStore.save()" into lmp-dev 
* commit '810e043b77888e196c24c81978ad48bfe010d562':
  TIF: fix IOException at PersistentDataStore.save()
 2014-08-15 05:07:23 +00:00
Jae Seo
8026650d17 am e83533ee: am cecfd8e4: am 5152ff49: Merge "TIF: Rename R.attr.contentRatingSystemXml and fix documentation" into lmp-dev 
* commit 'e83533ee160ebb079e4a92f2a59ca46a257ae412':
  TIF: Rename R.attr.contentRatingSystemXml and fix documentation
 2014-08-15 05:07:18 +00:00
Amit Mahajan
994f814414 am faa1f4a2: am b744a608: am cb8fce42: Merge "Revert "Revert "add apn setting parameters, and set apn parameters to bp""" into lmp-dev 
* commit 'faa1f4a295fe5d35d83ceee673033c86c1243386':
  Revert "Revert "add apn setting parameters, and set apn parameters to bp""
 2014-08-15 05:07:13 +00:00
RoboErik
f194dac397 am 3e3ad51f: am 8ce00c8b: am cf7e33d3: Merge "Remove REMOTE_STREAM_MUSIC references from AudioService" into lmp-dev 
* commit '3e3ad51fef38f574bc16ff76f231f9360b350ad7':
  Remove REMOTE_STREAM_MUSIC references from AudioService
 2014-08-15 05:07:08 +00:00
Selim Cinek
4738163fbe am a7dff19d: am babda3c2: am b75adcf0: Merge "Fixed a NPE during setup wizard" into lmp-dev 
* commit 'a7dff19d129b87836dfdc01192aa9612aaf0e67d':
  Fixed a NPE during setup wizard
 2014-08-15 05:07:03 +00:00
RoboErik
f31549da00 am ff09ed72: am ff97fe6a: am 9d006c55: Merge "Post MediaSessionManager callbacks to the caller\'s thread" into lmp-dev 
* commit 'ff09ed72cd34b7ebfe0dea7af7cbd7e8499f37f1':
  Post MediaSessionManager callbacks to the caller's thread
 2014-08-15 05:06:58 +00:00
RoboErik
0016b5f6a7 am 2dea60c8: am 1e553dc7: am b11490fb: Merge "Add an onSessionDestroyed callback to MediaController.Callback" into lmp-dev 
* commit '2dea60c8390ab4c2c12bc865819be983d5d6b3e0':
  Add an onSessionDestroyed callback to MediaController.Callback
 2014-08-15 05:06:50 +00:00
RoboErik
8338155a4a am 3ddb9890: am 55088a99: am 098e4e09: Merge "Fix dates on copywrite in new test code" into lmp-dev 
* commit '3ddb98904cea632180fae22441cd0d2046923093':
  Fix dates on copywrite in new test code
 2014-08-15 05:06:45 +00:00
Jose Lima
c41e939e94 am 18b3ce23: am 9d52ec9f: am bd2f1793: Make TranslucentConversionListener a SystemApi 
* commit '18b3ce239f7e51dc999bc695a4b4ce0b8c53e48f':
  Make TranslucentConversionListener a SystemApi
 2014-08-15 05:06:37 +00:00
RoboErik
09f6e61489 Merge "Fix crash in legacy apps that register without a looper" into lmp-dev 2014-08-15 04:58:06 +00:00
Zoltan Szatmary-Ban
2b13c5641a Merge "Revert "Revert "Revert "Revert "Update Trusted Credentials screen in settings""""" into lmp-dev 2014-08-15 04:54:19 +00:00
Zoltan Szatmary-Ban
f8d72cc14f Revert "Revert "Revert "Revert "Update Trusted Credentials screen in settings"""" 
This reverts commit 87efe74e092236c372d3b6909009641123aa416a.

This should be fine now with all the dependency CLs +2-ed


Change-Id: I96ad14ad5ff81e6b5391035cb6c5a62339c6cc40
 2014-08-15 12:58:37 +00:00
Narayan Kamath
f75aadc028 Revert "Revert "Revert "Update Trusted Credentials screen in settings""" 
This reverts commit 19c8ce291e89a9ef1442a20e1feab421b11536d7.

Change-Id: Ie5a5571127311e0a29f314c0566e779cfe940b53
 2014-08-15 12:25:52 +00:00
Narayan Kamath
bdc78678de Merge "Revert "Revert "Revert "Update Trusted Credentials screen in settings"""" into lmp-dev 2014-08-15 04:54:19 +00:00
Calin Juravle
508e768d95 Merge "Integrate NativeActivity with NativeBridge interfaces" 2014-08-15 04:45:59 +00:00
Yong WU
03c866020b Integrate NativeActivity with NativeBridge interfaces 
Bug: 16884833

Change-Id: I73aab8e212860ba5aee9444d801806d3da326a41
 2014-08-15 10:18:40 +01:00
Zoltan Szatmary-Ban
9c7ed91d78 Merge "Revert "Revert "Revert "Revert "Revert "Update Trusted Credentials screen in settings"""""" into lmp-dev 2014-08-15 04:38:54 +00:00
Zoltan Szatmary-Ban
3291de8f6c Revert "Revert "Revert "Revert "Revert "Update Trusted Credentials screen in settings""""" 
This reverts commit c9249c69813c6fb889d71d84583c67ae2942e6de.

Change-Id: I5504fddaf7b18efb73cd6c76678b3b39ce9b0229
 2014-08-15 14:01:14 +00:00
Calin Juravle
ec92397894 Merge "Integrate NativeActivity with NativeBridge interfaces" into lmp-dev 2014-08-15 04:38:54 +00:00
Yong WU
abd76d0a09 Integrate NativeActivity with NativeBridge interfaces 
Bug: 16884833

(cherry picked from commit I73aab8e212860ba5aee9444d801806d3da326a41)

Change-Id: I67f037ea81d2a4ede4294afd8b84b7640e534a13
 2014-08-15 13:22:30 +01:00
Adam Lesinski
89147ed84b Merge "Revert "Fix aapt dump for APKs with no resources"" into lmp-dev 2014-08-15 04:37:53 +00:00
Adam Lesinski
18560886cb Revert "Fix aapt dump for APKs with no resources" 
This reverts commit 0e475302cd196f45a01a525c49089018b238d4ba.

I'll re-upload this CL with the correct fix in LoadedApk.

Change-Id: I17c6381f8e5907dab9f996f89c5d435b9c08a13a
 2014-08-15 17:18:21 +00:00
Jeff Sharkey
07a36b1889 am b76b06d8: Merge "Some networks may have null ifaces, I guess?" into lmp-dev 
* commit 'b76b06d8efcc13ada2aaa250540a65fb8d60560a':
  Some networks may have null ifaces, I guess?
 2014-08-15 04:36:05 +00:00
Narayan Kamath
2b3b706e14 Merge "Fix getPackageInfo for the "android" package in the system server." into lmp-dev 2014-08-15 04:32:23 +00:00
Narayan Kamath
3480ab45c8 Fix getPackageInfo for the "android" package in the system server. 
bug: 16555230
Change-Id: I90ebf9b35fda8246b0079f67b1469f96c3b4ede2
 2014-08-15 18:14:44 +01:00
Selim Cinek
afd7f117b3 Merge "Fixed several bugs with the notification shade" into lmp-dev 2014-08-15 04:32:23 +00:00