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

130697 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Igor Viarheichyk
47843df11f Skip resource files for locales en-XA and ar-XB 
during packaging if pseudolocalization was done automatically.
This prevents attemts to add same resource twice.

Change-Id: I51e17f961ac44047bf466ce4aa0d4d17f4ded0d6
 2014-05-05 18:13:41 -07:00
Selim Gurun
c3d8b0f2b0 Merge "Add frameworks/base changes for enabling reduction proxy" 2014-05-06 00:30:50 +00:00
Selim Gurun
a83f1e3d23 Add frameworks/base changes for enabling reduction proxy 
Bug:12492817

Add an experimental webview setting to developer options to enable
data reduction proxy.

Change-Id: Id73d7f5d655a7de18afff766c5c78209c92964ea
 2014-05-05 17:28:04 -07:00
ztenghui
498213a265 First step on API cleaning on the VectorDrawable to disable animation support 
Cleaning on the API level, and related tests.
The animated icon will be only showing the initial state.

TODO: Deep clean on the functionality part and attributes.

Change-Id: I5723bc5b64f796c3a273d74bde02095751160a88
 2014-05-05 17:27:24 -07:00
Justin Koh
0b8745c0af am f99fc540: (-s ours) am 34f930f3: Fix build due to docs bug. DO NOT MERGE 
* commit 'f99fc5405ea909e8fdea3446646afd8b26229c18':
  Fix build due to docs bug. DO NOT MERGE
 2014-05-06 00:11:20 +00:00
Yohei Yukawa
5095ed699d Merge "Take supportsSwitchingToNextInputMethod into considertaion" 2014-05-06 00:10:11 +00:00
Justin Koh
d6fe30600c am 9241a8d6: am 8031fa01: Fix build due to @deprecated tag not having content 
* commit '9241a8d681397d5bacbae19cb081854ebed14d03':
  Fix build due to @deprecated tag not having content
 2014-05-06 00:07:16 +00:00
Justin Koh
f99fc5405e am 34f930f3: Fix build due to docs bug. DO NOT MERGE 
* commit '34f930f3b591f08ee4be8c2f54ee602cabdacc33':
  Fix build due to docs bug. DO NOT MERGE
 2014-05-06 00:06:58 +00:00
Zhijun He
e126be2c5b Merge "Camera2: make videostabilization type consistent" 2014-05-06 00:03:28 +00:00
Justin Koh
9241a8d681 am 8031fa01: Fix build due to @deprecated tag not having content 
* commit '8031fa014cd9f8bb9eb7de47b76a732cdfade687':
  Fix build due to @deprecated tag not having content
 2014-05-06 00:03:04 +00:00
Justin Koh
34f930f3b5 Fix build due to docs bug. DO NOT MERGE 
Fix build due to docs bug: needed to remove reference to stopMethodTracingSampling.

Change-Id: I878357b638b3862aecb4bc9d32ee166840b6c796
 2014-05-06 00:01:18 +00:00
Winson Chung
98596c92a3 Merge "Exposing the API to support widgets in Recents." 2014-05-05 23:59:29 +00:00
John Reck
e4280baaa7 Implement loadSystemProperties 
Bug: 14087580

Change-Id: I7153f38c70b554a78c56a0e794da929fc401ee7a
 2014-05-05 16:39:37 -07:00
Jesse Hall
a767d762d8 VirtualDisplayAdapter: Set the transaction surface even if NULL 
Bug: 14299872
Change-Id: I55e4a2e575cfd3788fbdb90b050dac486976c1b6
 2014-05-05 16:39:21 -07:00
Justin Koh
5e07af31d6 am 8b98c213: (-s ours) am bebfcb93: Merge "Hide startMethodTracingSampling DO NOT MERGE" into klp-modular-dev 
* commit '8b98c2130730b64917da0e0dbfb7e9202272f4f1':
  Hide startMethodTracingSampling DO NOT MERGE
 2014-05-05 23:37:20 +00:00
Justin Koh
e1f93c5281 am 7b529fcd: (-s ours) am 268f858b: Merge "Hide KeyEvent#isCancelKey, isConfirmKey DO NOT MERGE" into klp-modular-dev 
* commit '7b529fcd6dc9064f5cbc2db95f9ac08bd59b0953':
  Hide KeyEvent#isCancelKey, isConfirmKey DO NOT MERGE
 2014-05-05 23:37:16 +00:00
Justin Koh
b5de656c7f am e0cc71fa: (-s ours) am 1440cc6b: Merge "Hide InputDevice#supportsSource DO NOT MERGE" into klp-modular-dev 
* commit 'e0cc71fa19706dee06b1ef17dec720e420753162':
  Hide InputDevice#supportsSource DO NOT MERGE
 2014-05-05 23:37:11 +00:00
Justin Koh
8031fa014c Fix build due to @deprecated tag not having content 
Bug: 14441321
Change-Id: Ia42040db7030e4318ed2c34bbe90808a49f002db
 2014-05-05 16:29:52 -07:00
Justin Koh
8b98c21307 am bebfcb93: Merge "Hide startMethodTracingSampling DO NOT MERGE" into klp-modular-dev 
* commit 'bebfcb93ef97095a7caa1f80a0b1b05a04e9fd8c':
  Hide startMethodTracingSampling DO NOT MERGE
 2014-05-05 23:18:26 +00:00
Justin Koh
7b529fcd6d am 268f858b: Merge "Hide KeyEvent#isCancelKey, isConfirmKey DO NOT MERGE" into klp-modular-dev 
* commit '268f858be57089e568bc55aa9089af54a53dcc94':
  Hide KeyEvent#isCancelKey, isConfirmKey DO NOT MERGE
 2014-05-05 23:18:22 +00:00
Justin Koh
bebfcb93ef Merge "Hide startMethodTracingSampling DO NOT MERGE" into klp-modular-dev 2014-05-05 23:15:36 +00:00
Justin Koh
268f858be5 Merge "Hide KeyEvent#isCancelKey, isConfirmKey DO NOT MERGE" into klp-modular-dev 2014-05-05 23:14:06 +00:00
Justin Koh
e0cc71fa19 am 1440cc6b: Merge "Hide InputDevice#supportsSource DO NOT MERGE" into klp-modular-dev 
* commit '1440cc6bf37a268b439dfe86a9078b93bf1baf39':
  Hide InputDevice#supportsSource DO NOT MERGE
 2014-05-05 23:11:03 +00:00
Justin Koh
6f5dcc3546 Hide KeyEvent#isCancelKey, isConfirmKey DO NOT MERGE 
Bug: 14116162
Change-Id: I6b947c9b46bb5ea094b39428bb432e8f6fc6b57a
 2014-05-05 16:08:38 -07:00
Justin Koh
1440cc6bf3 Merge "Hide InputDevice#supportsSource DO NOT MERGE" into klp-modular-dev 2014-05-05 23:08:15 +00:00
Griff Hazen
23fccdd0b5 am 36ef0792: (-s ours) am ed0c87e7: DO NOT MERGE Hide Notification categories from API 20 (KKWT) 
* commit '36ef0792d28d2beb8eecb4547fab81d520c66ed0':
  DO NOT MERGE Hide Notification categories from API 20 (KKWT)
 2014-05-05 22:53:59 +00:00
Griff Hazen
36ef0792d2 am ed0c87e7: DO NOT MERGE Hide Notification categories from API 20 (KKWT) 
* commit 'ed0c87e7cdd2f641b6ed78df62b20a9f08ac16bb':
  DO NOT MERGE Hide Notification categories from API 20 (KKWT)
 2014-05-05 22:49:51 +00:00
Justin Koh
8bed554e4f Hide InputDevice#supportsSource DO NOT MERGE 
Bug: 14116162
Change-Id: I7c0ae516596f965083622aa77281abf6d47dc0b7
 2014-05-05 15:47:39 -07:00
Justin Koh
d56eff3812 am fcd2aff4: (-s ours) am 1e822a8f: Merge "Hide HDMI CEC from KKWT DO NOT MERGE" into klp-modular-dev 
* commit 'fcd2aff48d06ff695a14359621c6dba4ae5366de':
  Hide HDMI CEC from KKWT DO NOT MERGE
 2014-05-05 22:45:36 +00:00
Justin Koh
64bca23370 am 8e4cbcce: (-s ours) am f8a10d77: Merge "Hide getRequiredPermission in android.hardware.Sensor DO NOT MERGE" into klp-modular-dev 
* commit '8e4cbcce6616aee96754393aaddb23df91bfc02c':
  Hide getRequiredPermission in android.hardware.Sensor DO NOT MERGE
 2014-05-05 22:45:32 +00:00
Justin Koh
dcde19deba am 5aa34455: (-s ours) am 9cb3b162: Merge "Hide UsbDevice changes in KKWT DO NOT MERGE" into klp-modular-dev 
* commit '5aa34455d7d921f33b67463cd58b879d5cfcf1ca':
  Hide UsbDevice changes in KKWT DO NOT MERGE
 2014-05-05 22:45:29 +00:00
Justin Koh
a13a17ee0c am fd04632a: am 3caf9258: Merge "Hide getDeviceGlobalActionKeyTimeout" into klp-modular-dev 
* commit 'fd04632ab5fe9272b0f1d2ff94367a574e026a5b':
  Hide getDeviceGlobalActionKeyTimeout
 2014-05-05 22:45:23 +00:00
Griff Hazen
ed0c87e7cd DO NOT MERGE Hide Notification categories from API 20 (KKWT) 
Bug: 14116162

Change-Id: I59e499dde9a06a4bf455eecb3665afaa1b574dae
 2014-05-05 15:45:08 -07:00
Justin Koh
fcd2aff48d am 1e822a8f: Merge "Hide HDMI CEC from KKWT DO NOT MERGE" into klp-modular-dev 
* commit '1e822a8fe1f3063aa0d3eb47a7afdda9702c1734':
  Hide HDMI CEC from KKWT DO NOT MERGE
 2014-05-05 22:42:22 +00:00
Justin Koh
8e4cbcce66 am f8a10d77: Merge "Hide getRequiredPermission in android.hardware.Sensor DO NOT MERGE" into klp-modular-dev 
* commit 'f8a10d775efcc1c7255c1e504bf59f7cd38967ef':
  Hide getRequiredPermission in android.hardware.Sensor DO NOT MERGE
 2014-05-05 22:42:19 +00:00
Justin Koh
5aa34455d7 am 9cb3b162: Merge "Hide UsbDevice changes in KKWT DO NOT MERGE" into klp-modular-dev 
* commit '9cb3b162ebf2c85b2b34d399623ff68427b2cdca':
  Hide UsbDevice changes in KKWT DO NOT MERGE
 2014-05-05 22:42:15 +00:00
Justin Koh
8fee5c857b Hide startMethodTracingSampling DO NOT MERGE 
Bug: 14116162
Change-Id: I68470f02a2b6c2f0d9a1cb52bb4b7eeea10b43cf
 2014-05-05 15:40:00 -07:00
Justin Koh
1e822a8fe1 Merge "Hide HDMI CEC from KKWT DO NOT MERGE" into klp-modular-dev 2014-05-05 22:38:26 +00:00
Justin Koh
f8a10d775e Merge "Hide getRequiredPermission in android.hardware.Sensor DO NOT MERGE" into klp-modular-dev 2014-05-05 22:38:17 +00:00
Justin Koh
fd04632ab5 am 3caf9258: Merge "Hide getDeviceGlobalActionKeyTimeout" into klp-modular-dev 
* commit '3caf92582498bad8fe79f6e3235be218e82b7f68':
  Hide getDeviceGlobalActionKeyTimeout
 2014-05-05 22:38:13 +00:00
Justin Koh
9cb3b162eb Merge "Hide UsbDevice changes in KKWT DO NOT MERGE" into klp-modular-dev 2014-05-05 22:38:06 +00:00
Justin Koh
3caf925824 Merge "Hide getDeviceGlobalActionKeyTimeout" into klp-modular-dev 2014-05-05 22:33:29 +00:00
Justin Koh
19f274f699 am 68ca1464: (-s ours) am ed23c5bc: Hide NsdServiceInfo additions for KKWT DO NOT MERGE 
* commit '68ca14648c88d84080cafae02c9bc5cf3448096a':
  Hide NsdServiceInfo additions for KKWT DO NOT MERGE
 2014-05-05 22:24:46 +00:00
Justin Koh
68ca14648c am ed23c5bc: Hide NsdServiceInfo additions for KKWT DO NOT MERGE 
* commit 'ed23c5bc12b4110435b1e6f5fb9b82716109136e':
  Hide NsdServiceInfo additions for KKWT DO NOT MERGE
 2014-05-05 22:21:03 +00:00
Justin Koh
e5238f53f0 Hide HDMI CEC from KKWT DO NOT MERGE 
Hide HDMI CEC from KKWT.
Bug: 14116162

Change-Id: I086a5e51bd848a5097ccb0c47900fde30db2e7aa
 2014-05-05 22:19:19 +00:00
Justin Koh
e647dd354e Hide UsbDevice changes in KKWT DO NOT MERGE 
Hide UsbDevice changes in KKWT.
Bug: 14116162

Change-Id: I1582b9d536b243fa18beca6fdd8f379f9e32e137
 2014-05-05 22:19:05 +00:00
Justin Koh
ed23c5bc12 Hide NsdServiceInfo additions for KKWT DO NOT MERGE 
Hide NsdServiceInfo additions for KKWT.
Bug: 14116162

Change-Id: I98755a2524168be5e833a634192fd49ff3c32346
 2014-05-05 22:18:42 +00:00
Alan Viverette
f4ce9e115e Merge "Add support for popups overlapping anchors" 2014-05-05 22:05:54 +00:00
Chris Craik
81997fef18 am 3cb74d21: am 5d8343b8: am a85db5ab: Merge "libhwui: Handle the blurImage() implement once RS::init fail" 
* commit '3cb74d21b2ac2427e805f72a113e8d7a2cc460f3':
  libhwui: Handle the blurImage() implement once RS::init fail
 2014-05-05 21:53:56 +00:00
Justin Koh
618f30db3e Hide getRequiredPermission in android.hardware.Sensor DO NOT MERGE 
Hide getRequiredPermission in android.hardware.Sensor.
Bug: 14116162

Change-Id: I1e5c8361f6d0710c5da78d9506f70fa40a814b92
 2014-05-05 14:51:55 -07:00