Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
135,839 Commits 3 Branches 0 Tags
e4ca30503cb428f030fe52f429dac0119acfa170
Commit Graph

36765 Commits

Author SHA1 Message Date
Michael Wright
e4ca30503c resolved conflicts for merge of b3ce4b1b to master 
Change-Id: I7f9abc0eb75f7c7042037e73c8fdb67025a2ee2a
 2014-05-20 09:35:36 -07:00
Christoph Studer
05ad48206a Add ZEN and speedbump to NotificationListenerService 
Change-Id: I39fae5d77863e0d10cf236a096cc589167d146d3
 2014-05-20 17:03:22 +02:00
George Mount
646b1db458 Merge "Add to activity transition API as requested by consumers." 2014-05-20 14:52:50 +00:00
George Mount
41fc656b38 Merge "API Review: split out BidirectionalTypeConverter." 2014-05-20 14:51:39 +00:00
John Reck
1fcc3b1896 Merge "Baby steps" 2014-05-20 14:10:53 +00:00
George Mount
800d72b0e0 Add to activity transition API as requested by consumers. 
Change-Id: Iae01d7560770bab0ff9a1728d6552b98b17108ce
 2014-05-20 07:07:30 -07:00
Jason Monk
87be9ba1ea Merge "Fix reference to ProxyInfo extra" 2014-05-20 12:59:52 +00:00
Wei Wang
05ee041453 Remove a hide tag link. 
Change-Id: I6781dcfcaf89c6b00e0641549f946b90e4543218
 2014-05-20 02:43:02 -07:00
Michael Wright
b3ce4b1b78 am 889814ce: resolved conflicts for merge of 32912e0a to stage-aosp-master 
* commit '889814cee0ebcf70069d04d3ae77c97c09efb5a1':
  wallpaper: limit wallpaper width to sys.max_texture_size
 2014-05-20 09:28:40 +00:00
Wei Wang
adf6aff5b0 Revert "Revert "APIs for BLE scan, scan filter, batch scan, onFound/onLost and multiple advertising."" 
This reverts commit b1d9fbc0f8dea0c77ed810190b325bfdaaf21789.

Change-Id: Ic8dec9385a7c763170ebeb1bcddd221c72f46e88
 2014-05-19 23:52:45 -07:00
Youngsang Cho
48bb35b965 Merge "Make mSessionCallback null in TvView.unbindTvInput" 2014-05-20 05:55:21 +00:00
Michael Wright
889814cee0 resolved conflicts for merge of 32912e0a to stage-aosp-master 
Change-Id: I140e2024bd0e6e81ab550718103d45220d8bde26
 2014-05-19 22:42:58 -07:00
Youngsang Cho
285ff430fa Make mSessionCallback null in TvView.unbindTvInput 
Bug: 15096705
Change-Id: I5a13f9ad648bafc76667cbda39bcb138cfbc5de2
 2014-05-20 14:37:01 +09:00
Wei Wang
319b40c9cf Revert "APIs for BLE scan, scan filter, batch scan, onFound/onLost and multiple advertising." 
This reverts commit 2c4e68a86b7a9b9f760a8907b93ff40ccad56c80.

Change-Id: I98c91343d886ebe22d0bf75a710fa0b0abf738b6
 2014-05-20 04:52:35 +00:00
Donghan Ryu
289c273ec4 wallpaper: limit wallpaper width to sys.max_texture_size 
Image wallpapers are created ~1.5x screen size.  On some devices this
may exceed the maximum supported texture size, which will either fail
allocation or fail to composite.

Bug 991597

Change-Id: I9948b09f6e00a724212e73d36901f2bbea42e2f4
 2014-05-20 12:00:31 +09:00
Wei Wang
62d5bc745a APIs for BLE scan, scan filter, batch scan, onFound/onLost and multiple 
advertising.

Change-Id: I1655eb9cffa890b6fe38108bf51078662e90bc03
 2014-05-19 19:40:49 -07:00
Wei Wang
51800847d9 Add a method to check whether a UUID is 32bit. 
Change-Id: I92e8bab560b2083e9f4855d28b3f54f2120ef628
 2014-05-19 19:37:05 -07:00
Christopher Tate
f15e3bd9e5 Merge "Move the non-market install setting from Global to per-user Secure" 2014-05-20 01:10:05 +00:00
Christopher Tate
aa036a2db0 Move the non-market install setting from Global to per-user Secure 
Bug 13760585

Change-Id: I45b0fa87e72dc5c18d687261fb95cbea5d06163a
 2014-05-19 18:08:30 -07:00
Jinsuk Kim
96658f7167 New keycode definitions for HDMI-CEC 
Following keys are added to be mapped to HDMI-CEC standard keys:

KEYCODE_MEDIA_TOP_MENU
KEYCODE_11
KEYCODE_12
KEYCODE_LAST_CHANNEL
KEYCODE_TV_DATA_SERVICE

Also updated the information on the key code update by removing
some files not present any more.

Change-Id: I305d9b578c1824f34c457144a68132717dc9a97f
 2014-05-20 00:43:38 +00:00
Alan Viverette
d6a91b0bb6 Merge "Fix password obscuring in TextView accessibility node" 2014-05-19 23:56:06 +00:00
Alan Viverette
c80ad99a33 TouchFeedbackDrawable is now RippleDrawable 
Change-Id: I59f5f04b73089215c6320560556ac21beb03db06
 2014-05-19 16:27:31 -07:00
Alan Viverette
3a499e013c Fix password obscuring in TextView accessibility node 
BUG: 14998638
Change-Id: I215ea7b11bef5242e6adb1e595df36555548c165
 2014-05-19 16:04:40 -07:00
George Mount
42516d19db API Review: split out BidirectionalTypeConverter. 
Bug 14997858

Change-Id: I1f2ccf7c4e60320c8df759702a8f2fa24fd3acd2
 2014-05-19 15:57:14 -07:00
John Reck
918988c1ce Baby steps 
Run ViewPropertyAnimators with no listeners on the RenderThread

Change-Id: I7ff5300db96c7f4b59b09e3fff8a0df173f132dd
 2014-05-19 15:28:05 -07:00
John Reck
8461b70b6c Merge "Workaround double-translate bug" 2014-05-19 20:21:00 +00:00
John Reck
86faf9ec3e Workaround double-translate bug 
Bug: 15065005

Change-Id: Ie0f77c6ea13eebf3508df7513b79efaa65d31de0
 2014-05-19 13:19:07 -07:00
RoboErik
b19c192654 Merge "Rename session classes to have media prefix, hide routes" 2014-05-19 19:29:06 +00:00
Robert Greenwalt
d19c41c0bb Add javadoc and unhide new API 
Change-Id: I12e475bbf4000c7acec4ca27b1d3bf8f870cc2cf
 2014-05-19 10:34:36 -07:00
Robert Greenwalt
34c83190bf Merge "Add docs for Linkproperties and unhide it." 2014-05-19 16:45:12 +00:00
Robert Greenwalt
4f05d55296 Add docs for Linkproperties and unhide it. 
Preperation for ConnectivityManager API reveal.

Change-Id: Id2addf424213e796c6077def0b7f30cac9a0f75f
 2014-05-19 09:43:36 -07:00
Winson Chung
9aeb607399 Merge "Enabling alternate recents on all form factors." 2014-05-19 16:18:38 +00:00
Robert Greenwalt
f16f5788fa Merge "Apply Doc fixes to RouteInfo" 2014-05-19 15:53:15 +00:00
Robert Greenwalt
b26e44416a Merge "Add docs to Network" 2014-05-19 15:52:05 +00:00
Robert Greenwalt
34524f06fb Add javadoc for NetworkRequest. 
Also moved the requestId serial number out of this public class into CS.

Had to leave NetworkRequest hidden for now because the docs refer to things still hidden
in ConnectivityManager.

Change-Id: I14d1fe52d992adf5e4dc197b8f5433e40b0adfe6
 2014-05-19 08:17:05 -07:00
Robert Greenwalt
85956263c1 Add docs to Network 
Still must be hidden until we unhide the new API in ConnectivityManager.

Change-Id: I4749e56777199093cdba9223eb3d721c3174047d
 2014-05-19 07:59:16 -07:00
Robert Greenwalt
386aba8bd1 Apply Doc fixes to RouteInfo 
Change-Id: Ib76df135d5514f7b8baafbbe91fa3d1cdd632f00
 2014-05-19 07:27:46 -07:00
Robert Greenwalt
2631da82ae Merge "Update the docs for NetworkCapabilities" 2014-05-19 14:06:07 +00:00
Przemyslaw Szczepaniak
f8771ebc88 Merge "TTS Connection callbacks are called on main thread." 2014-05-19 12:02:51 +00:00
Ben Murdoch
73f328953a am 4088970d: am 3011fc1a: Merge "Fallback to NullWebView when Chromium WebView not present." into klp-modular-dev 
* commit '4088970dce354f53911f78084a32cb78af45baaf':
  Fallback to NullWebView when Chromium WebView not present.
 2014-05-19 11:35:04 +00:00
Ben Murdoch
4088970dce am 3011fc1a: Merge "Fallback to NullWebView when Chromium WebView not present." into klp-modular-dev 
* commit '3011fc1aa7dbffd3faab7d41203f63d2c0b50c2c':
  Fallback to NullWebView when Chromium WebView not present.
 2014-05-19 11:30:41 +00:00
Ben Murdoch
3011fc1aa7 Merge "Fallback to NullWebView when Chromium WebView not present." into klp-modular-dev 2014-05-19 11:26:33 +00:00
Robert Greenwalt
01d004ef42 Update the docs for NetworkCapabilities 
Preparing for ConnectivityService API update

Change-Id: I397e375b9254d4271183cf34c4a689deea1e198e
 2014-05-18 16:40:16 -07:00
Robert Greenwalt
3a9f0175ba Merge "Update RouteInfo docs and make public." 2014-05-18 23:24:59 +00:00
Jinsuk Kim
fc9c89f9aa Merge "HdmiControlManager with HdmiPlaybackClient API definition" 2014-05-18 22:50:16 +00:00
Jinsuk Kim
91120c541a HdmiControlManager with HdmiPlaybackClient API definition 
This is a rewrite of HdmiCecManager that exposes API for CEC Playback
device control. HdmiCecManager will be removed together with
HdmiCecService once the migration is completed.

Replaced direct access to CEC commands with the following 2 API:
- oneTouchPlay
- queryDisplayStatus

Each method requires communication with other device on CEC bus,
hence might take some time to finish. The result at the end of
protocol exchange is reported through a callback provided as a
parameter to the method.

The callback is based on interface not abstract class since
it has only one method 'onComplete'.

Change-Id: I41e9d4571f890303282a79a803c86530d0b46974
 2014-05-19 07:46:26 +09:00
John Spurlock
a25a160340 Merge "VolumeZen: frameworks changes to support Settings." 2014-05-18 21:32:41 +00:00
Robert Greenwalt
4095bd5a88 Update RouteInfo docs and make public. 
Change-Id: I1a8fe04022ea8291076af166f09112d19114ee16
 2014-05-18 12:43:14 -07:00
Robert Greenwalt
5575def80c Merge "Update comments for LinkAddress" 2014-05-18 18:26:10 +00:00
Yuhao Zheng
a486447231 Hotspot 2.0 framework APIs -- initial implementation 
Cherry-picked from klp-wireless-dev-mirror
SHA1: e73969fac45aaca72528226dc8c0c5e54fb2cdd4

Bug: 5485670
Change-Id: If3250a2fae181a3774d3158e341220006ad6ebe5
 2014-05-18 09:41:35 -07:00