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

137362 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
John Reck
c6b6154ac1 am ea5af639: Merge "Re-jigger layers" into lmp-preview-dev 
* commit 'ea5af63965bf323580aa1e2854efb2f8cc3dc396':
  Re-jigger layers
 2014-05-30 21:39:04 +00:00
Wei Wang
75f5b3a8dd am 19bdd64c: Merge "Address API review comments. 1. Moved le stuff to it\'s subpackage. Remove BluetoothLe for all classes except *Scanner, *ScanSetting, *Advertiser and *AdvertiseSettings. 2. Make all callbacks abstract classes instead of interfaces. 3. Moved Advertis 
* commit '19bdd64c3b9dd16778575164c13c8af798832f01':
  Address API review comments. 1. Moved le stuff to it's subpackage. Remove BluetoothLe for all classes except *Scanner, *ScanSetting, *Advertiser and *AdvertiseSettings. 2. Make all callbacks abstract classes instead of interfaces. 3. Moved AdvertisementData and ScanRecord out and removed AdvertiseBaseData 4. Removed newBuild and use new Builder for all builders. 5. Using setxxx in builders. 6. Misc other changes.
 2014-05-30 21:38:59 +00:00
Santos Cordon
b69f1bddfe am 6d052adc: Merge "Update showCallScreen to use Telecomm (1/6)" into lmp-preview-dev 
* commit '6d052adc910bf2d2775881528cef3e41fe2cd14b':
  Update showCallScreen to use Telecomm (1/6)
 2014-05-30 21:38:54 +00:00
Dianne Hackborn
25ceaab596 am 3a967f83: Merge "Mark getRecentTasks() and getRunningTasks() as deprecated." into lmp-preview-dev 
* commit '3a967f8331a29ec1b5b8a44cda028417e0ef1e2c':
  Mark getRecentTasks() and getRunningTasks() as deprecated.
 2014-05-30 21:38:49 +00:00
Adam Powell
2a4b95eb36 am 9aeea623: Guard against missing progress bars in window decor layouts 
* commit '9aeea623fa93d5aaaa214e2bc8557fb36a58cf7a':
  Guard against missing progress bars in window decor layouts
 2014-05-30 21:38:44 +00:00
Mike Reed
ae22109fa6 Merge "switch to non-deprecated SkBlurStyle type" 2014-05-30 21:34:11 +00:00
Santos Cordon
bf82544a96 Merge "Preempt build error from merge with CL (2/2)" 2014-05-30 21:31:57 +00:00
Santos Cordon
dd36901ac0 Preempt build error from merge with CL (2/2) 
Merging CL: Ib674e2e48efaa1cc97d1513dc2c2b27fdb343657

Change-Id: Ic4944b27f9d39dbaccb6baa5ba6761dc4663cd02
 2014-05-30 14:27:03 -07:00
Vinit Deshpande
e73a0ab494 Merge "Accomoditing API Review feedback for WifiScanner" 2014-05-30 21:15:13 +00:00
Mike Reed
686534db8d switch to non-deprecated SkBlurStyle type 
Will allow skia to remove SK_SUPPORT_LEGACY_BLURMASKFILTER_STYLE

Change-Id: I0039dd7e0e807080d2b4f9e648df93123dd09e8d
 2014-05-30 21:05:47 +00:00
Adam Powell
2157b9dcef am a082f3a0: Merge "Fix bad casts in action bars" into lmp-preview-dev 
* commit 'a082f3a05ede6ae5fa4ab64b30a77de18579264c':
  Fix bad casts in action bars
 2014-05-30 20:08:35 +00:00
John Spurlock
910219d859 am 586297d2: Merge "QuickSettings: Maintain tile panel Y in detail mode." into lmp-preview-dev 
* commit '586297d29dfa3a1e80c795698a1001dd7dfb211c':
  QuickSettings: Maintain tile panel Y in detail mode.
 2014-05-30 20:08:29 +00:00
John Reck
ca8eb243d1 Merge "Re-jigger layers" into lmp-preview-dev 2014-05-30 19:46:24 +00:00
Wei Wang
94fec83db4 Merge "Address API review comments. 1. Moved le stuff to it's subpackage. Remove BluetoothLe for all classes except *Scanner, *ScanSetting, *Advertiser and *AdvertiseSettings. 2. Make all callbacks abstract classes instead of interfaces. 3. Moved AdvertisementData and ScanRecord out and removed AdvertiseBaseData 4. Removed newBuild and use new Builder for all builders. 5. Using setxxx in builders. 6. Misc other changes." into lmp-preview-dev 2014-05-30 19:39:11 +00:00
Santos Cordon
515e09b837 Merge "Update showCallScreen to use Telecomm (1/6)" into lmp-preview-dev 2014-05-30 19:36:41 +00:00
Dianne Hackborn
f69af6b6d5 Merge "Mark getRecentTasks() and getRunningTasks() as deprecated." into lmp-preview-dev 2014-05-30 19:31:28 +00:00
Dianne Hackborn
a25a8b289b Mark getRecentTasks() and getRunningTasks() as deprecated. 
Change-Id: Idba79d7a4c0b9f0929f8dd27f25bd6aa548f5622
 2014-05-30 12:30:35 -07:00
Michael Wright
01101ff09d Merge "Add layout for OnLive controller with USB adapter" 2014-05-30 19:27:38 +00:00
Michael Wright
8111462d01 Add layout for OnLive controller with USB adapter 
Change-Id: Ie21ba6550f62eb4797e0e51104b99c2a4a7c44d7
 2014-05-30 12:27:00 -07:00
John Reck
d72e0a339b Re-jigger layers 
Bug: 15185239
 Bug: 15238382

 Make DeferredLayerUpdater ref counted so that
 HardwareLayer:finalizer() works non-crashily on
 leaked layers
 Give DeferredLayerUpdater the ability to have a layer destroyer
 set so that leaked layers can still be recycled on the
 RenderThread
 Order layer updates based off of pushLayerUpdate() calls to fix
 issue with nested layers

Change-Id: I4449cee607f7e5126e02fed7464cf48038e3dfdf
 2014-05-30 12:19:33 -07:00
Robert Shih
5a7de6f3f8 am a037bceb: am a034dac7: android_media_MediaMuxer_setLocation: amended signature. 
* commit 'a037bcebfa0afdf89e273b207f134e4c5d909a65':
  android_media_MediaMuxer_setLocation: amended signature.
 2014-05-30 19:01:28 +00:00
Kenny Root
25e40de45f resolved conflicts for merge of b68f5f09 to master 
Change-Id: Ib8dd3a353f40a3357c8dc5ac591cd5e3ab4d0a4b
 2014-05-30 11:51:20 -07:00
Santos Cordon
3534ede572 Update showCallScreen to use Telecomm (1/6) 
- Add API methods to InCallService and ITelecommService.
- Remove old methods from ITelephony.
- Route the TelephonyManager methods through ITelecommService instead of
  ITelephony.
- Update Lock screen to use TelephonyManager instead of ITelephony.

Bug: 15008165
Change-Id: Ib674e2e48efaa1cc97d1513dc2c2b27fdb343657
 2014-05-30 11:35:42 -07:00
Sebastien Hertz
26e8f040ba am f02efe45: Merge "Report runtime information to DDMS" into lmp-preview-dev 
* commit 'f02efe4504c9542b5c81c0ce890f092c4019540b':
  Report runtime information to DDMS
 2014-05-30 18:10:00 +00:00
Robert Shih
a037bcebfa am a034dac7: android_media_MediaMuxer_setLocation: amended signature. 
* commit 'a034dac7be0658e59c73a880e958cab3c723323b':
  android_media_MediaMuxer_setLocation: amended signature.
 2014-05-30 18:05:35 +00:00
Chris Craik
b68f5f0932 am 4d31c547: am ce7fa780: Merge "Fix a resource race bug in PathCache" 
* commit '4d31c5474bcc4bcc6a6d8dfe232360dad701a3fc':
  Fix a resource race bug in PathCache
 2014-05-30 18:03:32 +00:00
Adam Powell
eec8f0cbbb Guard against missing progress bars in window decor layouts 
This is temporary; in general requesting the window feature means you
have the progress bars available. This can be removed once Toolbar
supports the additional progress bar features.

Bug 15329703

Change-Id: Ica520a4fb600fd132a88c5204197185d7e0689c9
 2014-05-30 11:00:00 -07:00
Chris Craik
4d31c5474b am ce7fa780: Merge "Fix a resource race bug in PathCache" 
* commit 'ce7fa780cdee2730b570cc34066f15c74d44e6ef':
  Fix a resource race bug in PathCache
 2014-05-30 17:59:51 +00:00
Chris Craik
ce7fa780cd Merge "Fix a resource race bug in PathCache" 2014-05-30 17:56:42 +00:00
Adam Powell
a24114e7b1 Merge "Fix bad casts in action bars" into lmp-preview-dev 2014-05-30 17:49:19 +00:00
John Spurlock
303170e5c2 Merge "QuickSettings: Maintain tile panel Y in detail mode." into lmp-preview-dev 2014-05-30 17:40:23 +00:00
Adam Powell
76d1466dfc Fix bad casts in action bars 
Not all DecorToolbars are themselves views. Use the interface
passthrough instead.

Bug 15335176

Change-Id: I88f1701822406d4204d344aef855a4a707e4c7ab
 2014-05-30 10:34:40 -07:00
Sebastien Hertz
8d07a14ee4 Merge "Report runtime information to DDMS" into lmp-preview-dev 2014-05-30 17:31:52 +00:00
Dianne Hackborn
8b466c19d6 am f6550f0a: Merge "More work on voice interaction visuals." into lmp-preview-dev 
* commit 'f6550f0ab2fb1abae6f9d694c87ccba9bede57f4':
  More work on voice interaction visuals.
 2014-05-30 17:17:55 +00:00
Tim Kilbourn
505b28c105 resolved conflicts for merge of dfd39a7f to master 
Change-Id: I51040a2e7de006a9864127bdff839dbadbf00879
 2014-05-30 10:14:40 -07:00
John Spurlock
3e04cc8c9b QuickSettings: Maintain tile panel Y in detail mode. 
Hide the brightness slider to reduce visual clutter.
Stabilize the tile panel further by preventing it from
shrinking to less than the tiles height.

Bug:15341870
Change-Id: I785ff9c13f8489e86e3bdc8dde45ebd39f9a1413
 2014-05-30 13:14:16 -04:00
Dianne Hackborn
2d2e30eeac Merge "More work on voice interaction visuals." into lmp-preview-dev 2014-05-30 17:11:19 +00:00
Yuhao Zheng
e7070b30b5 am 5743a516: (-s ours) Merge "DO NOT MERGE - Wifi Passpoint API change" into lmp-preview-dev 
* commit '5743a516bbf70be6e5f2db5b1becfb15fa6393b2':
  DO NOT MERGE - Wifi Passpoint API change
 2014-05-30 17:11:11 +00:00
Tim Kilbourn
1d285b091b Merge "Add global key mappings to dump output." into lmp-preview-dev 2014-05-30 17:09:12 +00:00
Eric Laurent
7b587884ba Merge "indicate in and out audio device connection separately" 2014-05-30 17:08:43 +00:00
Yuhao Zheng
8407968db6 Merge "DO NOT MERGE - Wifi Passpoint API change" into lmp-preview-dev 2014-05-30 17:08:07 +00:00
Dianne Hackborn
20d9474904 More work on voice interaction visuals. 
There is now a special theme for voice interaction activities
to use, so they can be a panel that is better intergrated with
the rest of the voice interaction experience.  This is still
not completely working, I have some hacks in the demo app to
get it right; I'll fix that in a future change.

Also improve VoiceInteractor to be retained across activity
instances, for things like rotation.

And bump up the number of concurrent broadcasts that are allowed
on non-svelte devices, since they can handle more and this makes
the boot experience better when dispatching BOOT_COMPLETED.

Change-Id: Ie86b5fd09b928da20d645ec2200577dee3e6889d
 2014-05-30 10:06:16 -07:00
Tim Kilbourn
d7c0c2ee45 Add global key mappings to dump output. 
Example:

    mKeyMapping={
      KEYCODE_FOO=com.example/com.example.KeyReceiver
    }

Change-Id: I03ed8327cebf245ff1e3e5f2aaef3cdec1b94d98
 2014-05-30 09:58:13 -07:00
Vinit Deshpande
c0d1fc801d am e56124b3: (-s ours) Merge "DO NOT MERGE: Revert "Make Wifi WPS API available on application layer"" into lmp-preview-dev 
* commit 'e56124b39fcb952a9866d68a84f050bf63cc2140':
  DO NOT MERGE: Revert "Make Wifi WPS API available on application layer"
 2014-05-30 16:01:01 +00:00
Vinit Deshpande
c05cb5ffb3 Merge "DO NOT MERGE: Revert "Make Wifi WPS API available on application layer"" into lmp-preview-dev 2014-05-30 15:55:54 +00:00
Amith Yamasani
de8f11654f am 651fcf79: Merge "Tweak LauncherApps API based on feedback" into lmp-preview-dev 
* commit '651fcf798faf62f95bafaf3f1aaa1f05358254a2':
  Tweak LauncherApps API based on feedback
 2014-05-30 15:53:21 +00:00
Amith Yamasani
fc2ae28f78 Merge "Tweak LauncherApps API based on feedback" into lmp-preview-dev 2014-05-30 15:49:21 +00:00
Vinit Deshpande
55027bb7b8 Accomoditing API Review feedback for WifiScanner 
cherry-picked from klp-wireless-dev
SHA1 8217e22356a8828a725ba7654cf25b05a49108fb

Main changes include

- hiding the API for LMP preview
- moved information elements to ScanResult object
- removed objects from events
- changed API names to be more consistent

Bug: 15191968
Change-Id: Ibe3907366aee85f7d56021a536ae0f9f9fb28b38
 2014-05-30 08:47:07 -07:00
Selim Cinek
ae9e1a5d58 am 0eb33b30: Reduced overexpansion when expanding the panel 
* commit '0eb33b30202ce7dec036312f2d1a87f5dba0e9a4':
  Reduced overexpansion when expanding the panel
 2014-05-30 15:35:35 +00:00
Selim Cinek
4b44b7adb8 am bdb5b5d1: Merge "Implemented the appear animation for the pattern security." into lmp-preview-dev 
* commit 'bdb5b5d1cc1b248003b0e86a2fe2793230fe5bf3':
  Implemented the appear animation for the pattern security.
 2014-05-30 15:35:30 +00:00