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

187914 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chet Haase
6498506330 Merge "Fix breakage from ActionBar animations" 2015-04-09 20:38:07 +00:00
Alex Klyubin
981913babf am 098833c5: am ec01623b: am aeae0f38: Merge "Add asymmetric crypto constants for AndroidKeyStore API." 
* commit '098833c59d8b3984e3983169b460198c2d5e2670':
  Add asymmetric crypto constants for AndroidKeyStore API.
 2015-04-09 20:34:56 +00:00
Alex Klyubin
27077471a3 am c6112eb7: am 21c4e465: am 8c58ba87: Merge "Add missing mapping between JCA and keystore HMAC names." 
* commit 'c6112eb7057f91df1f885da37564f89a423f64e4':
  Add missing mapping between JCA and keystore HMAC names.
 2015-04-09 20:34:46 +00:00
Alex Klyubin
098833c59d am ec01623b: am aeae0f38: Merge "Add asymmetric crypto constants for AndroidKeyStore API." 
* commit 'ec01623b0b456c9e8f43123f1f96fb2330a6615f':
  Add asymmetric crypto constants for AndroidKeyStore API.
 2015-04-09 20:24:28 +00:00
Alex Klyubin
c6112eb705 am 21c4e465: am 8c58ba87: Merge "Add missing mapping between JCA and keystore HMAC names." 
* commit '21c4e465f6a4783a9356bf1d88bda42192af022f':
  Add missing mapping between JCA and keystore HMAC names.
 2015-04-09 20:24:22 +00:00
Christopher Tate
f4ab2b1074 Merge "Add system API for querying the available restore dataset for a package" 2015-04-09 20:20:31 +00:00
Alan Viverette
b88e1227d5 Merge "Only parse LayerDrawable child items when necessary" 2015-04-09 20:16:33 +00:00
Alex Klyubin
ec01623b0b am aeae0f38: Merge "Add asymmetric crypto constants for AndroidKeyStore API." 
* commit 'aeae0f384f72d4deca698697b125b82b322f7f90':
  Add asymmetric crypto constants for AndroidKeyStore API.
 2015-04-09 20:15:02 +00:00
Alex Klyubin
21c4e465f6 am 8c58ba87: Merge "Add missing mapping between JCA and keystore HMAC names." 
* commit '8c58ba87bb82993b2bd5dbdd948d15fe3297d08e':
  Add missing mapping between JCA and keystore HMAC names.
 2015-04-09 20:14:56 +00:00
Alan Viverette
45f207d6d9 Only parse LayerDrawable child items when necessary 
Bug: 20098214
Change-Id: Ie9da5f6e494ede47f9fdc94481a3f8ca41d3ef00
 2015-04-09 13:14:32 -07:00
Fabrice Di Meglio
7c6a34e64a Merge "Fix bug #20128771 All apps disappeared from app drawer after AAZ08 OTA" 2015-04-09 20:13:57 +00:00
Christopher Tate
511d02fcc3 Add system API for querying the available restore dataset for a package 
Bug 20123585

Change-Id: Ife6e77a224b5d4175178aacdb7c285e9944b9eab
 2015-04-09 13:13:42 -07:00
Chris Wren
531d5ab59d Merge "update metrics constants" 2015-04-09 20:13:27 +00:00
Fabrice Di Meglio
53f35f4a20 Fix bug #20128771 All apps disappeared from app drawer after AAZ08 OTA 
- relax a bit Intent resolution. We should still include Apps that
do not support Web domains :-) so in that context add in the result
list the Apps that are with a status INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_UNDEFINED

Change-Id: Ibad7b7f577552ac75bba256bb387a75b83524958
 2015-04-09 13:10:35 -07:00
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
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
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