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

188193 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alex Klyubin
aeae0f384f Merge "Add asymmetric crypto constants for AndroidKeyStore API." 2015-04-09 20:02:39 +00:00
Alex Klyubin
8c58ba87bb Merge "Add missing mapping between JCA and keystore HMAC names." 2015-04-09 19:57:13 +00:00
Chris Wren
f6b9fe55a8 update metrics constants 
Change-Id: I73ea3fe98a3b41b1072688a846ef1c396a9e9a30
 2015-04-09 15:39:19 -04:00
wsmlby
88022af3b4 Merge "Add permission for AppCompatibilityTest." 2015-04-09 19:36:54 +00:00
wsmlby
57e7443d9d Add permission for AppCompatibilityTest. 
Bug: 20134812
Change-Id: Iaf9a9963a16af1e2bb157159648db70666a33c48
 2015-04-09 12:35:49 -07:00
Dan Albert
f04046dfb0 am e24d36b7: am 1f799a6b: am d9f32b16: Merge "Ensure alignment of Res_png_9patch." 
* commit 'e24d36b7b744540ccd3401609248ed9d48be4cc9':
  Ensure alignment of Res_png_9patch.
 2015-04-09 19:06:11 +00:00
Rich Slogar
f75355e4df am acae606f: am a6b6952b: am 0b1610ff: am 2489a7fd: am 9d6e9587: am 36e3f512: Merge "docs: remove studio proguard settings from play services" into lmp-docs 
* commit 'acae606f5dde5fff990ffc840da89fcc61f03c5b':
  docs: remove studio proguard settings from play services
 2015-04-09 19:06:00 +00:00
Mike Lockwood
f0a41d1c59 Add support for Bluetooth MIDI devices 
The Bluetooth MIDI devices are handled in the BluetoothMidiService APK.
Apps wishing to connect to Bluetooth MIDI devices call MidiManager.openBluetoothDevice()
which binds to BluetoothMidiService in a similar way as virtual devices are implemented.

Change-Id: Ie3fbca757928fd7873a009f9bf9e0ce0be487da6
 2015-04-09 11:49:51 -07:00
Mike Lockwood
b6f50d357b Add support for flushing MIDI all scheduled MIDI events on a port 
Change-Id: I39d7862540d4d4b9e2df1265f9dd253541adb4c2
 2015-04-09 11:49:45 -07:00
Chet Haase
1ae7c28440 Fix breakage from ActionBar animations 
Real fix will come later, but this disables the animations to work
around the current crash.

Issue #20125407 Settings Crashes when changing orientation of device

Change-Id: I748e8889f72483c82cff084c5815322057f16f03
 2015-04-09 11:42:30 -07:00
Alex Klyubin
ccfea5024b Add asymmetric crypto constants for AndroidKeyStore API. 
Bug: 18088752
Change-Id: Iee72a4c230f3a2cd30d9eb4d29c4301f3e113f31
 2015-04-09 11:38:44 -07:00
Dan Albert
e24d36b7b7 am 1f799a6b: am d9f32b16: Merge "Ensure alignment of Res_png_9patch." 
* commit '1f799a6b96eaa74a776bc2d1b3d52b937dd1a9ea':
  Ensure alignment of Res_png_9patch.
 2015-04-09 18:31:38 +00:00
Rich Slogar
acae606f5d am a6b6952b: am 0b1610ff: am 2489a7fd: am 9d6e9587: am 36e3f512: Merge "docs: remove studio proguard settings from play services" into lmp-docs 
* commit 'a6b6952bb6aedf747e58055c120e98383e4491a3':
  docs: remove studio proguard settings from play services
 2015-04-09 18:31:31 +00:00
Dan Albert
1f799a6b96 am d9f32b16: Merge "Ensure alignment of Res_png_9patch." 
* commit 'd9f32b164be11b6c42ee36ca6945623073e82c99':
  Ensure alignment of Res_png_9patch.
 2015-04-09 18:26:34 +00:00
Rich Slogar
a6b6952bb6 am 0b1610ff: am 2489a7fd: am 9d6e9587: am 36e3f512: Merge "docs: remove studio proguard settings from play services" into lmp-docs 
* commit '0b1610ff49b042df19fc9071f2811efb642f7df9':
  docs: remove studio proguard settings from play services
 2015-04-09 18:21:06 +00:00
George Mount
9978940208 Merge "Revert "Allow delay of showing/hiding shared element when transferring."" 2015-04-09 18:14:02 +00:00
George Mount
44d15f1c2e Revert "Allow delay of showing/hiding shared element when transferring." 
This reverts commit bd93e69c8e0b06fc0b0bbba4bdd9e426b37f98e1.

Change-Id: I38daa39e8560f4901b242acc6394dfa37f3d084a
 2015-04-09 18:13:40 +00:00
Rich Slogar
0b1610ff49 am 2489a7fd: am 9d6e9587: am 36e3f512: Merge "docs: remove studio proguard settings from play services" into lmp-docs 
* commit '2489a7fd5fbafde339ac58f2f1e7a5854e7e4936':
  docs: remove studio proguard settings from play services
 2015-04-09 18:11:24 +00:00
Dan Albert
d9f32b164b Merge "Ensure alignment of Res_png_9patch." 2015-04-09 18:09:11 +00:00
ztenghui
341d932af1 Merge "Update the light Y shift value" 2015-04-09 18:06:26 +00:00
ztenghui
9b76c3a578 Update the light Y shift value 
This is accidentally missed from the previous shadow update

Change-Id: I52d499bede843d6a71db55cca9be38716c9bb620
 2015-04-09 11:01:41 -07:00
Rich Slogar
2489a7fd5f am 9d6e9587: am 36e3f512: Merge "docs: remove studio proguard settings from play services" into lmp-docs 
* commit '9d6e95879aff4608db400c270fa8f89b6b55d0e6':
  docs: remove studio proguard settings from play services
 2015-04-09 17:57:20 +00:00
Narayan Kamath
e0befc489e Merge "Add org.apache.http.legacy dependency for StatementService." 2015-04-09 17:56:59 +00:00
Seigo Nonaka
bb6a62c2be Fix unexpected selection cancellation 
It turned out that text selection is unexpectedly cancelled by
InsertionPointController if it is visible. The InsertPointController
is not necessary if there is a selection, so just hiding before
performing set selection fixes this issue.

Bug: 19946192
Change-Id: I2afce1789d772a8d2ea368643cc7533561ee2bf0
 2015-04-09 17:55:00 +00:00
Narayan Kamath
f51b125e45 Add org.apache.http.legacy dependency for StatementService. 
Breaks non-jack builds.

bug: 20129764
Change-Id: Ib4fce285ef3501e746fe151269c8f2a813e5f9a2
 2015-04-09 18:54:12 +01:00
ztenghui
3f6d5aa5dd Merge "Update the shadow fall off function from cosine to gaussian." 2015-04-09 17:49:00 +00:00
Rich Slogar
9d6e95879a am 36e3f512: Merge "docs: remove studio proguard settings from play services" into lmp-docs 
* commit '36e3f5125895875c63242294da289ca4b09c9f9e':
  docs: remove studio proguard settings from play services
 2015-04-09 17:47:40 +00:00
Dan Albert
a18cee52d9 Ensure alignment of Res_png_9patch. 
This doesn't alter the alignment of the data within the struct, but
enforces that this structure will be appropriately aligned when used.

The image_info struct has this struct preceded by a bool, which causes
odd alignment for the members of this struct.

Change-Id: Ia2ef5c81b2f961c0f61858a10a7821d82f600919
 2015-04-09 10:41:38 -07:00
Rich Slogar
36e3f51258 Merge "docs: remove studio proguard settings from play services" into lmp-docs 2015-04-09 17:39:29 +00:00
Alex Klyubin
52f57de9f6 am bbf3cc57: am fd168151: am e26347bb: Merge "Hide KeyStoreParameter.Builder.setRandomizedEncryptionRequired." 
* commit 'bbf3cc5797293dc915d7ecfe41e85bbe5682548d':
  Hide KeyStoreParameter.Builder.setRandomizedEncryptionRequired.
 2015-04-09 17:31:16 +00:00
Fabrice Di Meglio
c9d83fc2e0 Merge "Add IntentFilter auto verification - part 4" 2015-04-09 17:29:22 +00:00
Alex Klyubin
bbf3cc5797 am fd168151: am e26347bb: Merge "Hide KeyStoreParameter.Builder.setRandomizedEncryptionRequired." 
* commit 'fd1681513357309868c2659f215c931e4d27c40e':
  Hide KeyStoreParameter.Builder.setRandomizedEncryptionRequired.
 2015-04-09 17:21:52 +00:00
Alex Klyubin
fd16815133 am e26347bb: Merge "Hide KeyStoreParameter.Builder.setRandomizedEncryptionRequired." 
* commit 'e26347bb740f5d1bcf51036e63c1b1c91e685f4c':
  Hide KeyStoreParameter.Builder.setRandomizedEncryptionRequired.
 2015-04-09 17:10:57 +00:00
Alex Klyubin
5324702a02 Add missing mapping between JCA and keystore HMAC names. 
This is a follow-up to 70376a77280551791dae62586a6bb0c77ed9429a where
I forgot to update this mapping.

Bug: 18088752
Change-Id: I322a9abd642ddee3bd2b4f49379b121012e32836
 2015-04-09 10:10:34 -07:00
Tim Kilbourn
f96095c417 Merge "Simplify input-audio device mapping" 2015-04-09 17:06:53 +00:00
ztenghui
ecf091e171 Update the shadow fall off function from cosine to gaussian. 
Also tune the parameters to match a better look designed by UX team.
For ambient part, the acos transformed alpha is not needed any more.

b/19370798

Change-Id: I20d2615d1be502eb900942ed756aecd1660dee48
 2015-04-09 09:57:27 -07:00
Alex Klyubin
b30cc6c3e8 resolved conflicts for merge of b9a9d46c to master 
Change-Id: Ibec45f0f8f9618dd7bd1b34561dccbdd9599cdeb
 2015-04-09 09:54:05 -07:00
Alex Klyubin
e26347bb74 Merge "Hide KeyStoreParameter.Builder.setRandomizedEncryptionRequired." 2015-04-09 16:51:02 +00:00
Alex Klyubin
223977b914 Hide KeyStoreParameter.Builder.setRandomizedEncryptionRequired. 
This wasn't meant to be public API yet.

Bug: 18088752
Change-Id: I40e57fd9121348086ae88ad9fa54f930547b77ba
 2015-04-09 09:50:34 -07:00
Alan Viverette
d278a3f092 Merge "Fix fast scroller thumb and track margins for Material" 2015-04-09 16:44:23 +00:00
Alex Klyubin
b9a9d46c77 am f7e7f744: am a482b046: Merge "Require IND-CPA by default for new AndroidKeyStore keys." 
* commit 'f7e7f744e193e027afde5c071889bde1c5882cfd':
  Require IND-CPA by default for new AndroidKeyStore keys.
 2015-04-09 16:43:32 +00:00
Alex Klyubin
f7e7f744e1 am a482b046: Merge "Require IND-CPA by default for new AndroidKeyStore keys." 
* commit 'a482b0469cb98a5743603e1602aa6f37c65d1659':
  Require IND-CPA by default for new AndroidKeyStore keys.
 2015-04-09 16:30:50 +00:00
Clara Bayarri
b8ed5b75da Editor: Turn on Floating Toolbar Action Mode for Text Selection 
Change-Id: I267809e8cd5f10a3f9efd8f555ad24c7a935fdb8
 2015-04-09 17:16:53 +01:00
Alex Klyubin
a482b0469c Merge "Require IND-CPA by default for new AndroidKeyStore keys." 2015-04-09 16:12:09 +00:00
George Mount
f7115c84e4 Merge "Allow delay of showing/hiding shared element when transferring." 2015-04-09 15:26:04 +00:00
George Mount
cef8bed515 Merge "Make TransitionManager.endTransitions() public." 2015-04-09 15:25:53 +00:00
Abodunrinwa Toki
22e67b55b2 Merge "FloatingToolbar with overflow. -Implemented the toolbar overflow -Refactored a bit to make the concepts clear and component easier to understand and maintain -Floating toolbar now uses a clipped popup window that allows touch events to go through the transparent parts" 2015-04-09 15:04:41 +00:00
Richard Uhler
a1b19b7b66 am 00ff42a0: am 7f757130: am f324d245: Merge "Reuse dexopt method for both dex2oat and patchoat." 
* commit '00ff42a0ca9d17c4b7ee89d900cf86c9a25c00eb':
  Reuse dexopt method for both dex2oat and patchoat.
 2015-04-09 14:51:13 +00:00
Richard Uhler
00ff42a0ca am 7f757130: am f324d245: Merge "Reuse dexopt method for both dex2oat and patchoat." 
* commit '7f7571308d5dc973e9b1e352d56643a74e99e588':
  Reuse dexopt method for both dex2oat and patchoat.
 2015-04-09 14:40:47 +00:00
Richard Uhler
7f7571308d am f324d245: Merge "Reuse dexopt method for both dex2oat and patchoat." 
* commit 'f324d245fdd07ac14ab312d1a5fa04a4e8dfcceb':
  Reuse dexopt method for both dex2oat and patchoat.
 2015-04-09 14:31:10 +00:00