Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
177,605 Commits 3 Branches 0 Tags
38b5d057f08a1a05df44f94de1053f74739c6677
Commit Graph

48524 Commits

Author SHA1 Message Date
Yuncheol Heo
b10d25fc96 am ddb863f4: am 5b062e07: Merge "CEC: Fix apilint errors." into lmp-mr1-dev 
* commit 'ddb863f42832e5dcc0f5167ce5ba7ecea2d977a4':
  CEC: Fix apilint errors.
 2014-10-24 10:39:50 +00:00
Neil Fuller
a021e92218 resolved conflicts for merge of 12260ad7 to lmp-mr1-dev-plus-aosp 
Change-Id: Ie2222794208475216941289cf062e05ca9c75e0f
 2014-10-24 11:36:46 +01:00
Narayan Kamath
fa36b36c8b Merge "Deprecate more apache-http." into lmp-mr1-dev 2014-10-24 08:58:45 +00:00
Yuncheol Heo
5b062e07c5 Merge "CEC: Fix apilint errors." into lmp-mr1-dev 2014-10-24 08:48:30 +00:00
Neil Fuller
07ff2f72c8 Merge "Deprecating FloatMath and Time" into lmp-mr1-dev 2014-10-24 08:10:39 +00:00
Yuncheol Heo
2b0da5c4c8 CEC: Fix apilint errors. 
- Change 'protected' to 'package private'.
- Change '@hide' to '{@hide}' for methods which should be still hidden
  for linting.
- Rename addVendorCommandListener to setVendorCommandListener and make sure to be called once.
- Fix the implementation of removeHotplugEventListener().

Bug: 18063669
Change-Id: I5c032736f17bab9518f21596f7adeac2f88ba4c1
 2014-10-24 15:30:48 +09:00
Yuncheol Heo
0bc9da311b am 8991001f: Merge "CEC: Fix JavaDoc errors." into lmp-mr1-dev automerge: fa76518 automerge: f235449 
* commit '8991001fec08094100113cc5a94cf0d6cbad0f8e':
  CEC: Fix JavaDoc errors.
 2014-10-24 02:45:59 +00:00
Yuncheol Heo
8991001fec Merge "CEC: Fix JavaDoc errors." into lmp-mr1-dev automerge: fa76518 
automerge: f235449

* commit 'f235449efb77f925262cb63e85ab3b197a94d2e5':
  CEC: Fix JavaDoc errors.
 2014-10-24 02:39:34 +00:00
Svetoslav
8ec648c18f am eed63916: am bd6fabe2: Merge "APIs for an accessibility service to put interaction tracking overlays." into lmp-mr1-dev automerge: 89e7ffe 
* commit 'eed63916a184b05fa8572c9a8151745d05777740':
  APIs for an accessibility service to put interaction tracking overlays.
 2014-10-24 02:14:06 +00:00
Svetoslav
eed63916a1 am bd6fabe2: Merge "APIs for an accessibility service to put interaction tracking overlays." into lmp-mr1-dev 
automerge: 89e7ffe

* commit '89e7ffedadd20a3091e72b42f86c500452df193c':
  APIs for an accessibility service to put interaction tracking overlays.
 2014-10-24 02:04:11 +00:00
Yuncheol Heo
fa7651877f Merge "CEC: Fix JavaDoc errors." into lmp-mr1-dev 2014-10-24 01:50:38 +00:00
Svetoslav
bd6fabe2ae Merge "APIs for an accessibility service to put interaction tracking overlays." into lmp-mr1-dev 2014-10-23 23:17:21 +00:00
Yuncheol Heo
5487ab07c7 CEC: Fix JavaDoc errors. 
- Removed the link tag to the non-public objects.

Bug: 18063758
Change-Id: I17c79510c184df8a62cde9a6a1d18109c299c15d
 2014-10-24 08:16:31 +09:00
George Mount
8bc1ad937b am 890f20e8: am 039cc060: am 82fd8428: Merge "Protect against ImageView changing to a null Drawable during Transition." into lmp-mr1-dev 
* commit '890f20e8e84e91173edf6890f5bb6da5cd0418d2':
  Protect against ImageView changing to a null Drawable during Transition.
 2014-10-23 22:18:22 +00:00
Yigit Boyar
ba4814a49c am ab43570f: am f3ab4410: am fa9ed8ca: Merge "Added a generic configuration and theme based cache" into lmp-mr1-dev 
* commit 'ab43570f5db770e55a73ccff346b3e922443d126':
  Added a generic configuration and theme based cache
 2014-10-23 22:18:17 +00:00
John Reck
b19bb9bb5a am 35447aea: am fed6f4ef: am aca6ccf4: Merge "Improve documentation" into lmp-mr1-dev 
* commit '35447aeabdb93d75074da6a9cb868500215f89d5':
  Improve documentation
 2014-10-23 22:18:13 +00:00
Alan Viverette
2d19fa289e am cccea2b9: am 265f8106: am 4ad964d9: Merge "Swap names for clock delegates so they are correct" into lmp-mr1-dev 
* commit 'cccea2b976ac74c78578d2f22adbb0478c220187':
  Swap names for clock delegates so they are correct
 2014-10-23 22:18:05 +00:00
George Mount
8132c699b1 am b5742f99: am 941252d3: am 523a129c: Merge "Use one method to change bounds in ChangeBounds." into lmp-mr1-dev 
* commit 'b5742f997d3179f57c305c940dda35bf2f2aedc4':
  Use one method to change bounds in ChangeBounds.
 2014-10-23 22:18:00 +00:00
Pavel Zhamaitsiak
7c06f9b5e1 am 34e4dc4b: am b01a5979: am c8a09d54: Merge "Separate VoLTE and VT configurations to enable devices/carriers to have VoLTE without VT." into lmp-mr1-dev 
* commit '34e4dc4b09045c882ad7a30b26d78d787d74c264':
  Separate VoLTE and VT configurations to enable devices/carriers to have VoLTE without VT.
 2014-10-23 22:17:52 +00:00
Filip Gruszczynski
6ea834e958 am 2c90a028: am 2e052429: am b977ade1: am 625ec484: Check if context is actually an activity. 
* commit '2c90a0282b02d89fe6b7c7e95d27c2ff9afb7f3f':
  Check if context is actually an activity.
 2014-10-23 22:17:41 +00:00
Sreeram Ramachandran
6e0a3a4846 am 4573944e: am b9248a55: am b1df48e4: Merge "Add an API to select a network for a DatagramSocket." into lmp-mr1-dev 
* commit '4573944e96cbe34de6bc549f8f313f070fcb7ace':
  Add an API to select a network for a DatagramSocket.
 2014-10-23 22:17:28 +00:00
George Mount
890f20e8e8 am 039cc060: am 82fd8428: Merge "Protect against ImageView changing to a null Drawable during Transition." into lmp-mr1-dev 
* commit '039cc060493a88a603cc8f3224a9ac2fa31908be':
  Protect against ImageView changing to a null Drawable during Transition.
 2014-10-23 22:04:28 +00:00
Yigit Boyar
ab43570f5d am f3ab4410: am fa9ed8ca: Merge "Added a generic configuration and theme based cache" into lmp-mr1-dev 
* commit 'f3ab441090a05bd428b9488b2e8e175f33bd6fe9':
  Added a generic configuration and theme based cache
 2014-10-23 22:04:11 +00:00
John Reck
35447aeabd am fed6f4ef: am aca6ccf4: Merge "Improve documentation" into lmp-mr1-dev 
* commit 'fed6f4ef2310ab3ec33d439702ea47f9b623795a':
  Improve documentation
 2014-10-23 22:04:01 +00:00
Alan Viverette
cccea2b976 am 265f8106: am 4ad964d9: Merge "Swap names for clock delegates so they are correct" into lmp-mr1-dev 
* commit '265f8106c374ce72284e86a5bb6df4514d320d51':
  Swap names for clock delegates so they are correct
 2014-10-23 22:03:43 +00:00
George Mount
b5742f997d am 941252d3: am 523a129c: Merge "Use one method to change bounds in ChangeBounds." into lmp-mr1-dev 
* commit '941252d3f002bbace92212e4f6340980984ce3ae':
  Use one method to change bounds in ChangeBounds.
 2014-10-23 22:03:38 +00:00
Pavel Zhamaitsiak
34e4dc4b09 am b01a5979: am c8a09d54: Merge "Separate VoLTE and VT configurations to enable devices/carriers to have VoLTE without VT." into lmp-mr1-dev 
* commit 'b01a597924ab7afed689f7710c264684d1fac944':
  Separate VoLTE and VT configurations to enable devices/carriers to have VoLTE without VT.
 2014-10-23 22:02:59 +00:00
Filip Gruszczynski
2c90a0282b am 2e052429: am b977ade1: am 625ec484: Check if context is actually an activity. 
* commit '2e052429d04c11b69b3b3ac85a6344bd3687a0dc':
  Check if context is actually an activity.
 2014-10-23 22:02:48 +00:00
Sreeram Ramachandran
4573944e96 am b9248a55: am b1df48e4: Merge "Add an API to select a network for a DatagramSocket." into lmp-mr1-dev 
* commit 'b9248a5552dde8bf76db77054ed31a59300fe0cd':
  Add an API to select a network for a DatagramSocket.
 2014-10-23 22:02:25 +00:00
George Mount
82fd842827 Merge "Protect against ImageView changing to a null Drawable during Transition." into lmp-mr1-dev 2014-10-23 21:46:54 +00:00
Yigit Boyar
fa9ed8ca0a Merge "Added a generic configuration and theme based cache" into lmp-mr1-dev 2014-10-23 21:06:24 +00:00
John Reck
aca6ccf403 Merge "Improve documentation" into lmp-mr1-dev 2014-10-23 21:00:45 +00:00
John Reck
43a5328c83 Improve documentation 
Bug: 17440886

Change-Id: I3f5c0dab6e08c0097fe60eb269e7fffe7b48b563
 2014-10-23 13:58:34 -07:00
Alan Viverette
4ad964d98d Merge "Swap names for clock delegates so they are correct" into lmp-mr1-dev 2014-10-23 20:52:23 +00:00
George Mount
523a129ced Merge "Use one method to change bounds in ChangeBounds." into lmp-mr1-dev 2014-10-23 20:52:13 +00:00
Alan Viverette
daf33ed853 Swap names for clock delegates so they are correct 
Change-Id: Ic11affae802f0afe4746f65f0b96979a7c5a9c0a
 2014-10-23 13:34:17 -07:00
Pavel Zhamaitsiak
c8a09d5434 Merge "Separate VoLTE and VT configurations to enable devices/carriers to have VoLTE without VT." into lmp-mr1-dev 2014-10-23 20:24:12 +00:00
George Mount
d359952459 Use one method to change bounds in ChangeBounds. 
Bug 17936593

Instead of calling setLeft(), setTop(), setRight(), setBottom()
separately, make one call that does all at the same time.

Change-Id: I986274f3a98b3136e71204501ffc272986ad31dd
 2014-10-23 13:08:15 -07:00
Filip Gruszczynski
b977ade1e4 am 625ec484: Check if context is actually an activity. 
* commit '625ec4849118f061a99558ad558b16020435a88d':
  Check if context is actually an activity.
 2014-10-23 19:49:21 +00:00
Svet Ganov
c2181a1895 am ae23078b: am 012b4eae: am d8bc6677: Merge "Optimize text rendering in accessibility mode." into lmp-mr1-dev 
* commit 'ae23078b2312d66c4063637cd371dcd7d26bde08':
  Optimize text rendering in accessibility mode.
 2014-10-23 19:47:27 +00:00
Alan Viverette
7c4173e89d am d439b034: am 171c98bd: am e8f676c0: Merge "Use correct smooth scroll default duration" into lmp-mr1-dev 
* commit 'd439b034cbdf3c06c3a2b6bd917c6f80f681a32d':
  Use correct smooth scroll default duration
 2014-10-23 19:47:23 +00:00
Alan Viverette
cb789f0ca0 am beb45a19: am eb09aaa5: am e1201e87: Merge "Lighten action bar on light theme, use secondary color for subtitle" into lmp-mr1-dev 
* commit 'beb45a194de370b32db36dcac2fbec6d12f926d3':
  Lighten action bar on light theme, use secondary color for subtitle
 2014-10-23 19:47:20 +00:00
Etan Cohen
e41a9cf9f7 Separate VoLTE and VT configurations to enable devices/carriers to have VoLTE without VT. 
Change-Id: I233b003af57a550f2f51b12213700ab0451039e5
 2014-10-23 19:15:13 +00:00
Sreeram Ramachandran
b1df48e469 Merge "Add an API to select a network for a DatagramSocket." into lmp-mr1-dev 2014-10-23 19:10:24 +00:00
Yigit Boyar
d422dc358f Added a generic configuration and theme based cache 
For now, only animators use it but we can consider migrating
drawable cache to it as well.

Bug: 17456416
Change-Id: I571b96856805edb171f0fc52e6bff5a365f46b70
 2014-10-23 11:46:01 -07:00
Jeff Sharkey
bb2e2cae58 Allow I/O when installing providers. 
Bug: 17879170
Change-Id: I073d5b56bab6db01290aad5386c53c305669dc5b
 2014-10-23 11:42:31 -07:00
Elliott Hughes
ced7ebdb1d Merge "Migrate off timeFormat12 and timeFormat24." 2014-10-23 18:21:56 +00:00
Elliott Hughes
f7d5e0a53e Migrate off timeFormat12 and timeFormat24. 
libcore now offers a wider variety of 12-/24-hour time formats,
so be more specific about which one we want here.

(cherry-pick of 85f60d3a03b5b5d9a0e8b8a138eb85a6b53a1eca.)

Bug: 10361358
Change-Id: I846ab7a6f84cd49e876ad21e9366aff1600e0530
 2014-10-23 11:18:21 -07:00
Jason Monk
a585268aff Show screen pinning toasts on all users 
Bug: 17657660
Change-Id: I964a210e7fb105e9494a7ab7f383aa9d141ba136
 2014-10-23 14:12:19 -04:00
Elliott Hughes
85f60d3a03 Migrate off timeFormat12 and timeFormat24. 
libcore now offers a wider variety of 12-/24-hour time formats,
so be more specific about which one we want here.

Bug: 10361358
Change-Id: I846ab7a6f84cd49e876ad21e9366aff1600e0530
 2014-10-23 11:06:43 -07:00