Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
133,788 Commits 3 Branches 0 Tags
3989bf68fd15ef8458cb73545a468c495f3ff2b2
Commit Graph

133788 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jorim Jaggi
3989bf68fd am 6ea37298: Merge "Implement phone affordance on lockscreen." 
* commit '6ea372988f0732183590c021c65d392bf419dafd':
  Implement phone affordance on lockscreen.
 2014-05-06 12:12:35 +00:00
Jorim Jaggi
dba6ca00c3 Merge "Implement phone affordance on lockscreen." 2014-05-06 12:10:53 +00:00
Jorim Jaggi
97b63c4112 Implement phone affordance on lockscreen. 
Refactor the camera affordance into a reusable view. This change
also swaps the asset for the camera affordance.

Bug: 14488709
Change-Id: I0633614f6a1ea81faa37923f748af3c635e64a52
 2014-05-06 13:56:44 +02:00
Jesse Hall
dcf2d73238 am cb508743: Merge "VirtualDisplayAdapter: Set the transaction surface even if NULL" 
* commit 'cb508743939829d71935ba05f630f52efba64eca':
  VirtualDisplayAdapter: Set the transaction surface even if NULL
 2014-05-06 04:03:14 +00:00
Jesse Hall
da25a59a19 Merge "VirtualDisplayAdapter: Set the transaction surface even if NULL" 2014-05-06 04:00:39 +00:00
Elliott Hughes
ee06dee7b5 am fcfa49c2: am 86768034: am b593ad60: am f1f28d1d: Merge "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." 
* commit 'fcfa49c2e900d647bc9d1ba307737db37dd46ef7':
  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.
 2014-05-06 02:38:19 +00:00
Elliott Hughes
f3e7945c79 am 86768034: am b593ad60: am f1f28d1d: Merge "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." 
* commit '867680342e12af59a26756f30cf817a131724943':
  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.
 2014-05-06 02:34:40 +00:00
Elliott Hughes
867680342e am b593ad60: am f1f28d1d: Merge "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." 
* commit 'b593ad60682a6f8c945c4c2ffc3d278df3f6e360':
  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.
 2014-05-06 02:31:03 +00:00
Elliott Hughes
b593ad6068 am f1f28d1d: Merge "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." 
* commit 'f1f28d1d86aea6dd1419e94aadf051e433914680':
  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.
 2014-05-06 02:27:44 +00:00
Elliott Hughes
f1f28d1d86 Merge "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." 2014-05-06 02:25:05 +00:00
Yorke Lee
35a543da8d am ea98695e: Merge "Fix nested prescrolling bug in ScrollView" 
* commit 'ea98695e42705c4dc814dc58240e4d14e6a8c245':
  Fix nested prescrolling bug in ScrollView
 2014-05-06 02:22:58 +00:00
Yorke Lee
ccd3a6a519 Merge "Fix nested prescrolling bug in ScrollView" 2014-05-06 02:19:35 +00:00
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
4e4cacd684 am 234558e8: Merge "Add frameworks/base changes for enabling reduction proxy" 
* commit '234558e89565d7310e3c12fe72a51b884876abf6':
  Add frameworks/base changes for enabling reduction proxy
 2014-05-06 00:33:55 +00: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
Justin Koh
22ec7decf3 am 97da4125: am f99fc540: (-s ours) am 34f930f3: Fix build due to docs bug. DO NOT MERGE 
* commit '97da4125e1759871f6966a1bc0410cbc880e52c2':
  Fix build due to docs bug. DO NOT MERGE
 2014-05-06 00:15:38 +00:00
Yohei Yukawa
658bb0ac2e am da878553: Merge "Take supportsSwitchingToNextInputMethod into considertaion" 
* commit 'da878553e4f139536c7b81ba5e57a8577d365bba':
  Take supportsSwitchingToNextInputMethod into considertaion
 2014-05-06 00:15:34 +00:00
Justin Koh
f9604f6747 am 2e834efa: am 9241a8d6: am 8031fa01: Fix build due to @deprecated tag not having content 
* commit '2e834efa5636bdd681faab10b188acc17a92f7db':
  Fix build due to @deprecated tag not having content
 2014-05-06 00:11:37 +00: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
Zhijun He
4fbd5c1c70 am e711e8da: Merge "Camera2: make videostabilization type consistent" 
* commit 'e711e8dae1b2c3cbe790d0e8d627232f6418df43':
  Camera2: make videostabilization type consistent
 2014-05-06 00:07:30 +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
Winson Chung
258ea87d45 am 0a730c24: Merge "Exposing the API to support widgets in Recents." 
* commit '0a730c24b0af03bea4afa5b6da5ae576b0ef2f99':
  Exposing the API to support widgets in Recents.
 2014-05-06 00:03:21 +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
Justin Koh
13a62a45e7 am 17df6a4c: am 8b98c213: (-s ours) am bebfcb93: Merge "Hide startMethodTracingSampling DO NOT MERGE" into klp-modular-dev 
* commit '17df6a4c5f143d69e9a3dc3e979202b2a8e2c213':
  Hide startMethodTracingSampling DO NOT MERGE
 2014-05-05 23:41:21 +00:00
Justin Koh
c91613b95c am d942cbfd: am 7b529fcd: (-s ours) am 268f858b: Merge "Hide KeyEvent#isCancelKey, isConfirmKey DO NOT MERGE" into klp-modular-dev 
* commit 'd942cbfded87520f8c7e1d5f36a063ef08975fa9':
  Hide KeyEvent#isCancelKey, isConfirmKey DO NOT MERGE
 2014-05-05 23:41:17 +00:00
Justin Koh
87699015ed am 4e399632: am e0cc71fa: (-s ours) am 1440cc6b: Merge "Hide InputDevice#supportsSource DO NOT MERGE" into klp-modular-dev 
* commit '4e3996322a9b37aeec8966015b4c57afabed5149':
  Hide InputDevice#supportsSource DO NOT MERGE
 2014-05-05 23:41:14 +00: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
cc7fccd806 am 420f4a98: am 36ef0792: (-s ours) am ed0c87e7: DO NOT MERGE Hide Notification categories from API 20 (KKWT) 
* commit '420f4a98fd3ebd1efa5a4c66c64509a36ba8bc62':
  DO NOT MERGE Hide Notification categories from API 20 (KKWT)
 2014-05-05 22:59:47 +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
Justin Koh
e5c06272a1 am 4cf13ef2: am fcd2aff4: (-s ours) am 1e822a8f: Merge "Hide HDMI CEC from KKWT DO NOT MERGE" into klp-modular-dev 
* commit '4cf13ef2ab081e74a531052ceda16b74f07cb0bd':
  Hide HDMI CEC from KKWT DO NOT MERGE
 2014-05-05 22:50:54 +00:00
Justin Koh
c8eb34a8d6 am c5e1bf37: am 8e4cbcce: (-s ours) am f8a10d77: Merge "Hide getRequiredPermission in android.hardware.Sensor DO NOT MERGE" into klp-modular-dev 
* commit 'c5e1bf37fc984001e4d4779d67e22a807e920c96':
  Hide getRequiredPermission in android.hardware.Sensor DO NOT MERGE
 2014-05-05 22:50:51 +00:00
Justin Koh
c40077edd6 am c363c6ee: am 5aa34455: (-s ours) am 9cb3b162: Merge "Hide UsbDevice changes in KKWT DO NOT MERGE" into klp-modular-dev 
* commit 'c363c6eee9d29c13e415cc3d26897602690db9eb':
  Hide UsbDevice changes in KKWT DO NOT MERGE
 2014-05-05 22:50:48 +00:00
Justin Koh
ae42a6ee4c am c315202e: am fd04632a: am 3caf9258: Merge "Hide getDeviceGlobalActionKeyTimeout" into klp-modular-dev 
* commit 'c315202e247c83a0d646e33675255d9778f6ba87':
  Hide getDeviceGlobalActionKeyTimeout
 2014-05-05 22:50:45 +00:00