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

187857 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alan Viverette
d278a3f092 Merge "Fix fast scroller thumb and track margins for Material" 2015-04-09 16:44:23 +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
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
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
David Christie
295a93b99f Add smallest displacement field to FLP HAL 
Change-Id: I4d857256c035c65185be3be8401bec8d45091aaf
 2015-04-08 17:33:38 -07:00
Olawale Ogunwale
343e291b67 am e8a3c320: Merge "Prevent windows from freezing screen while timeout" 
* commit 'e8a3c320e658f6c7f8d1db3d8ad3c3f189c0f54e':
  Prevent windows from freezing screen while timeout
 2015-04-09 00:32:45 +00:00
Alex Klyubin
2cb1e1dca0 am 1da3d7fc: Merge "Add more digests to AndroidKeyStore API." 
* commit '1da3d7fcf33fd61f0143f8a410f0a77783fe1bfe':
  Add more digests to AndroidKeyStore API.
 2015-04-09 00:32:38 +00:00
Wale Ogunwale
1c146c78af Merge "Throw caught DeadObjectException when trying to create a service." 2015-04-08 23:02:49 +00:00
Wale Ogunwale
bfac468ce9 Throw caught DeadObjectException when trying to create a service. 
We don't want to continue trying to start the service if the service
appliction is dead. This will lead to an NPE later on since we have
set ServiceRecord.app to null in the finally block.

Bug: 5227987
Change-Id: I3ee5111f4a20d9455fedbf41ac54d41c43aa8d76
 2015-04-08 16:01:24 -07:00
Qiwen Zhao
4e7bb6312f Merge KDataBinder/ from platform/vendor/google/prototypes/data-binding to tools/data-binding/ 2015-04-08 15:58:36 -07:00
Dongwon Kang
0ceef71ac4 Merge "TIF: add a video unavailable constant for audio program case." 2015-04-08 22:38:50 +00:00
Dongwon Kang
ff1f29e1b1 TIF: add a video unavailable constant for audio program case. 
Bug: 20019339
Change-Id: Ife3452486c065e6c5809f0cd2bb87794c4279312
 2015-04-08 15:21:06 -07:00
Jorim Jaggi
aa4b12745b Merge "Fix some jank when expanding quick settings" 2015-04-08 22:20:10 +00:00
Alex Klyubin
0e496527fe am da66cab3: am f1a1160c: am c0d6b7cb: Merge "Fix typo" 
* commit 'da66cab36e8085a1457565be69b55b38dfee186e':
  Fix typo
 2015-04-08 22:12:55 +00:00
Alex Klyubin
7513d53cae am 9be1016b: am c48e8cf0: am edd0e6c0: Merge "Refuse to reuse IV in encryption mode in AndroidKeyStore." 
* commit '9be1016b44c229468bd9a215fdbbfb95a8acf2ad':
  Refuse to reuse IV in encryption mode in AndroidKeyStore.
 2015-04-08 22:12:47 +00:00
Alex Klyubin
bd877f261b am 8ad875f5: am 0649c832: am 3283d2d2: Merge "Add BlockMode.GCM constant to AndroidKeyStore API." 
* commit '8ad875f52de3ffa99fea22177e26a7f22c3735b1':
  Add BlockMode.GCM constant to AndroidKeyStore API.
 2015-04-08 22:12:38 +00:00
Alex Klyubin
da66cab36e am f1a1160c: am c0d6b7cb: Merge "Fix typo" 
* commit 'f1a1160c68f6c289d3b82573f1a16f9c52aebab4':
  Fix typo
 2015-04-08 22:03:55 +00:00
Fyodor Kupolov
49208d0b91 Merge "Replaced zeros with UserHandle.USER_OWNER" 2015-04-08 22:03:53 +00:00
Alex Klyubin
9be1016b44 am c48e8cf0: am edd0e6c0: Merge "Refuse to reuse IV in encryption mode in AndroidKeyStore." 
* commit 'c48e8cf07a180e185948673579828d064e6efc7a':
  Refuse to reuse IV in encryption mode in AndroidKeyStore.
 2015-04-08 22:03:51 +00:00
Alex Klyubin
8ad875f52d am 0649c832: am 3283d2d2: Merge "Add BlockMode.GCM constant to AndroidKeyStore API." 
* commit '0649c832b8285d1b07c6e07362dbfe3ca0535609':
  Add BlockMode.GCM constant to AndroidKeyStore API.
 2015-04-08 22:03:47 +00:00
Olawale Ogunwale
e8a3c320e6 Merge "Prevent windows from freezing screen while timeout" 2015-04-08 21:56:16 +00:00
George Mount
478673ede2 Make TransitionManager.endTransitions() public. 
Bug 19231835

Change-Id: I151bae1d10aaab72f8fea73eaf0538f0aa5d810a
 2015-04-08 14:51:36 -07:00
George Mount
bd93e69c8e Allow delay of showing/hiding shared element when transferring. 
Bug 18932344

Change-Id: Ic967551a4dd27967d2312a6c6c8a83b34c220031
 2015-04-08 14:48:02 -07:00
Jorim Jaggi
f3bf1ee431 Fix some jank when expanding quick settings 
Change-Id: Iba0ceb8b6085bec9fdee588eead073527a44540d
 2015-04-08 14:41:43 -07:00
Alex Klyubin
f1a1160c68 am c0d6b7cb: Merge "Fix typo" 
* commit 'c0d6b7cb752b50ed37197e15cc6f305a0038e61b':
  Fix typo
 2015-04-08 21:37:26 +00:00
Alex Klyubin
c48e8cf07a am edd0e6c0: Merge "Refuse to reuse IV in encryption mode in AndroidKeyStore." 
* commit 'edd0e6c09820b08f22937bbbc00149adc6d66f07':
  Refuse to reuse IV in encryption mode in AndroidKeyStore.
 2015-04-08 21:37:11 +00:00
Alex Klyubin
0649c832b8 am 3283d2d2: Merge "Add BlockMode.GCM constant to AndroidKeyStore API." 
* commit '3283d2d208c0686fa964008e1520179948886adb':
  Add BlockMode.GCM constant to AndroidKeyStore API.
 2015-04-08 21:37:04 +00:00
Alex Klyubin
1da3d7fcf3 Merge "Add more digests to AndroidKeyStore API." 2015-04-08 21:32:09 +00:00
Alex Klyubin
70376a7728 Add more digests to AndroidKeyStore API. 
This adds MD5, SHA-1, SHA-224, SHA-384, and SHA-512. SHA-256 was
already there.

MD5 is not exposed for HMAC on purpose, because MD5 has been
deprecated for years.

Bug: 18088752
Change-Id: I4df3d3f6cf10805c7910a1bdb577a91c85055945
 2015-04-08 14:17:21 -07:00
Raph Levien
97f09ae8b0 Merge "Clear hyphenEdit from Layout's paint" 2015-04-08 21:09:09 +00:00
Nancy Chen
a9e9578d73 Merge "Hide and make systemapi visual voicemail-related apis." 2015-04-08 20:57:55 +00:00
Chien-Yu Chen
06fe59bfa2 Merge "camera2: add reprocess format map" 2015-04-08 20:42:44 +00:00
Raph Levien
9a174dda42 Clear hyphenEdit from Layout's paint 
The paint of a layout may be reused with other things (in particular,
it can be passed to a BoringLayout), so make sure the hyphenEdit is
zeroed out after use.

Change-Id: If58c5588af9642c3ba827acefea7895e814daab9
 2015-04-08 13:38:51 -07:00
Svetoslav
cd890311fb Merge "Apps can request permissions only on platforms that have runtime permissions." 2015-04-08 19:28:02 +00:00