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

188177 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Richard Uhler
f324d245fd Merge "Reuse dexopt method for both dex2oat and patchoat." 2015-04-09 14:13:29 +00:00
Abodunrinwa Toki
517adad1c4 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

Change-Id: I84794e45a8a10f004654550fe976585f9e62bdb5
 2015-04-09 14:42:23 +01:00
Seigo Nonaka
eaddec8c70 Use TextView's text locale for capitalization. 
BUG: 19284889
Change-Id: Icd3c1dd3b31c23025bc974bcbb5a3618196434e7
 2015-04-09 21:57:20 +09:00
Clara Bayarri
13152d1c72 Editor: Allow invalidation of the Text Selection Action Mode 
This allow us to add/remove the "replace" item, which depends on
having a replacement span.

Change-Id: I47b6487fc91f80b9dab13e90b8d630194b3f9beb
 2015-04-09 13:40:20 +01:00
Dongwon Kang
7a11a0e8c1 Merge "TIF: Update the input list even when a single component in a package is updated." 2015-04-09 03:35:04 +00:00
Dongwon Kang
31a8f8400b TIF: Update the input list even when a single component in a package is updated. 
Bug: 20127116
Change-Id: I1aefaaba9076877cefc5cfdf36d3c6169c437b6d
 2015-04-08 20:33:19 -07:00
Fabrice Di Meglio
7d014cec63 Add IntentFilter auto verification - part 4 
- add domain verification priming at boot when the PackageManagerService
singleton is created. This will mainly set the domain verification status
to INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_ALWAYS for all Apps that
have an IntentFilter with action VIEW and data scheme HTTP or HTTPS.

- also optimize Intent resolution by taking into account Browser Apps

Change-Id: Id8e66c9759a99e79b07051595ca89a168dc5ae0e
 2015-04-08 19:24:15 -07:00
Colin Cross
88fa96c758 am 106f83ee: am 4cead39a: am 1be312df: Merge "Re-enable -Wall and -Werror that were lost in a merge" 
* commit '106f83ee9cc145a6421d21067c44b513cc148e80':
  Re-enable -Wall and -Werror that were lost in a merge
 2015-04-09 01:44:38 +00:00
Colin Cross
106f83ee9c am 4cead39a: am 1be312df: Merge "Re-enable -Wall and -Werror that were lost in a merge" 
* commit '4cead39a178dd8c4d7c1397e6ad5b861b08125b7':
  Re-enable -Wall and -Werror that were lost in a merge
 2015-04-09 01:23:28 +00:00
Olawale Ogunwale
792ae33775 am 33a68a52: am 343e291b: am e8a3c320: Merge "Prevent windows from freezing screen while timeout" 
* commit '33a68a521f77a2070832ece271d1047ecf56de7e':
  Prevent windows from freezing screen while timeout
 2015-04-09 01:18:01 +00:00
Alex Klyubin
ada3e01313 am 2d81cb68: am 2cb1e1dc: am 1da3d7fc: Merge "Add more digests to AndroidKeyStore API." 
* commit '2d81cb6824e186a6c76d0466e2d58eaa34312673':
  Add more digests to AndroidKeyStore API.
 2015-04-09 01:16:38 +00:00
Colin Cross
4cead39a17 am 1be312df: Merge "Re-enable -Wall and -Werror that were lost in a merge" 
* commit '1be312dfb02e86731da6ac54a39956db791f4978':
  Re-enable -Wall and -Werror that were lost in a merge
 2015-04-09 01:13:50 +00:00
Olawale Ogunwale
33a68a521f am 343e291b: am e8a3c320: Merge "Prevent windows from freezing screen while timeout" 
* commit '343e291b67432427709a20e97f42fbc329c45c44':
  Prevent windows from freezing screen while timeout
 2015-04-09 00:56:27 +00:00
Alex Klyubin
2d81cb6824 am 2cb1e1dc: am 1da3d7fc: Merge "Add more digests to AndroidKeyStore API." 
* commit '2cb1e1dca0ae9d1b34774b16f07974ea56c42cb4':
  Add more digests to AndroidKeyStore API.
 2015-04-09 00:56:23 +00:00
Colin Cross
1be312dfb0 Merge "Re-enable -Wall and -Werror that were lost in a merge" 2015-04-09 00:49:56 +00:00
Colin Cross
01f185633c Re-enable -Wall and -Werror that were lost in a merge 
-Wall and -Werror were lost during a merge when they were added to
aaptCFLAGS instead of aaptCFlags.  Fix the typo, and the warnings
that crept in while it was disabled.

Change-Id: Ib944b8d6149278e4f3861c1acac277bcd95cc7c2
 2015-04-08 17:48:23 -07:00