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

141130 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert Ly
f618dcaea6 am b76f6afe: am 137d9da3: Merge "docs: fix images for notifications" into klp-modular-dev 
* commit 'b76f6afeca731dbbc33e0c2aef234f42544e7890':
  docs: fix images for notifications
 2014-06-27 18:09:15 +00:00
Andre Eisenbach
7bb5e3fd4c Merge "LE: Add notification sent and congestion callbacks (3/4)" 2014-06-26 18:07:29 +00:00
Andre Eisenbach
dadefdad8e LE: Add notification sent and congestion callbacks (3/4) 
This change introduces two new callbacks for applications to better
handle LE notification flow control and transport congestion. The
notification callback is invoked when the remote platform confirms an
indication or when a local notification has been passed to the
controller. No new notifications should be sent until a callback is
received.

Congestion callbacks are triggered when a GATT operation cannot be sent
to the local Bluetooth controller. Repeatedly calling
writeCharacteristic() for example will eventually trigger a congestion
callback. Applications cannot send additional data until a further
callback is received, indicating that the congestion has cleared up.

Also made server callbacks "oneway" in the AIDL definition file.

Change-Id: I7fa3324712205c79efce58e5e3df8b80a265a442
 2014-06-27 10:31:41 -07:00
Jason Monk
3ada97b002 Merge "Fix crash in starting lock task" 2014-06-26 18:34:16 +00:00
Jason Monk
a4e946bb6f Fix crash in starting lock task 
Sometimes when coming from a dialog the current activity has changed,
which causes AM to crash and take down the framework.  Instead don't
check the current activity as the user has confirmed the operation
so it is not coming from the background.

Change-Id: I0daeabcfcf814c52bcc7907a624fe6e9453c427f
 2014-06-27 10:11:56 -04:00
ztenghui
c94685037f Merge changes I557e855f,I16d2ed29 
* changes:
  Add string support for valueFrom/valueTo
  Update the tests to show more animations from UX team
 2014-06-26 23:40:51 +00:00
Robert Ly
80f7f1081d am a1180f7b: am 5627b521: Merge "fix build" into klp-modular-dev 
* commit 'a1180f7b72e90d403ffe9358bc2d815f8518f551':
  fix build
 2014-06-27 17:26:57 +00:00
Robert Ly
8f5c674836 am 672b1d13: am ba102925: Merge "more doc fixes for notifcations and wear" into klp-modular-dev 
* commit '672b1d13c92ee14f13a70004acfb1971df323afe':
  more doc fixes for notifcations and wear
 2014-06-27 17:19:17 +00:00
Baligh Uddin
5fe3f9a6dd Import translations. DO NOT MERGE 
Change-Id: I39e8d1f33e311ccc7004a45aacbc45b5f5316058
Auto-generated-cl: translation import
 2014-06-26 11:07:23 -07:00
Baligh Uddin
8517bf0225 Import translations. DO NOT MERGE 
Change-Id: I3c34ec05468c932b02ac3ef79cb88bff26957252
Auto-generated-cl: translation import
 2014-06-26 11:05:01 -07:00
Dan Stoza
0c9b72b09f Merge "SurfaceTexture: Allow creation in detached mode" 2014-06-26 18:02:09 +00:00
Dan Stoza
493f2e1190 SurfaceTexture: Allow creation in detached mode 
Adds a constructor that doesn't require a GLES texture name and sets
up the SurfaceTexture in detached mode.

Bug: 15616428
Change-Id: I375495f481bfbe43b3830ab7d124cef8f1be0ac6
 2014-06-26 13:36:19 -07:00
Robert Ly
c0f09fba23 am 4accf048: am cfcb47c9: Merge "fix reference link" into klp-modular-dev 
* commit '4accf0489aff66bfeb6beb06b27d7a7897a7aaa1':
  fix reference link
 2014-06-26 18:48:19 +00:00
RoboErik
e9466805e5 b/15892295 If playback is active don't play a beep 
The old code removed the flag for playing a beep when changing volume
with active playback. This will do the same thing.

Change-Id: I708db66a1575d314b941166d4a6ca05d0a796dae
 2014-06-26 18:47:16 +00:00
Robert Ly
b992f46fab am 61fe220e: am ff0b6006: Merge "fix link" into klp-modular-dev 
* commit '61fe220eefa24dbfff785f6234fa60e9a6b174fe':
  fix link
 2014-06-26 18:42:10 +00:00
Robert Ly
24b0740e1c am dad1e31a: am 174943b3: Merge "fix more brokenness" into klp-modular-dev 
* commit 'dad1e31a975f4c2416252e5318fa0b417bebeae8':
  fix more brokenness
 2014-06-26 18:33:45 +00:00
Yin-Chia Yeh
0cd62d65dc Camera2: Add 3A maxRegions tag to legacy device 
Change-Id: I8ab4164a7f4c6f210b000cb623cbc686e0e79a35
 2014-06-26 18:26:17 +00:00
Paul Jensen
7ecb42fb65 Enforce ConnectivityManager.releaseNetworkRequest callers own the NetworkRequest 
Enforce that callers of ConnectivityManager.releaseNetworkRequest() are the
creators of the NetworkRequest being released by matching UIDs.

Change-Id: I439468c054bacc035e2db2c4967b24d183e78e9c
 2014-06-26 18:07:12 +00:00
Paul McLean
7ca6c1a05a Merge "Enabling USB Device and Android Device Vol inc/dec functionality for USB Audio Output" 2014-06-26 18:02:09 +00:00
Paul McLean
fb917e019f Enabling USB Device and Android Device Vol inc/dec functionality for USB Audio Output 
Bug: 13747844

Change-Id: Ia969dad4150adeafb375e3f9985f9d8ba7222638
 2014-06-27 08:44:55 -07:00
Robert Ly
a4e2023b5a am 034bd9cd: am af19c795: Merge "fix gmscore preview isntructions" into klp-modular-dev 
* commit '034bd9cd58d14c76de8518ace5617d4a1b3282cf':
  fix gmscore preview isntructions
 2014-06-27 14:40:22 +00:00
Julia Reynolds
75175025f8 If DISALLOW_ADD_USER is enabled, do not allow users to be created. 
Bug: 15910634
Change-Id: I7e14bf7d71001f218402a5d90e2aadc54fcfd875
 2014-06-27 09:13:23 -04:00
Hector Dearman
5622e8b669 Merge "Add Third Party Cookie API" 2014-06-26 21:23:48 +00:00
Christoph Studer
65fa0a923c Avoid upranking battery level/saver notifications 
Bug: 15884933
Change-Id: Ia1a61c8b3d3f70feaa0a68702c1a8902b0c15bb7
 2014-06-27 12:56:35 +02:00
Alexandra Gherghina
7b79c17c1b Merge "Rename managed profile string" 2014-06-26 22:01:31 +00:00
Alexandra Gherghina
aaec57d0ae Rename managed profile string 
Bug: 15827349
Change-Id: I61b80171e7b6010f062d2e0bfa950b6b47858edf
 2014-06-27 10:30:07 +01:00
Youngsang Cho
e7fbc08efb Merge "Turn on/off an overlay view by visibility change in TvView" 2014-06-26 23:14:30 +00:00
Yohei Yukawa
9a9c112737 Fix test failures due to unexpected overload resolution 
Starting with Ie04e8a27050849fee1c93ef14b9944acc70fafe4,
CursorAnchorInfo#getComposingText() returns CharSequence rather
than String.  This causes unexpected overload resolution,
which results in test failures.

BUG: 15088391
Change-Id: I51e2b23573e92be7e5b1dcca6402e85364408215
 2014-06-27 17:13:32 +09:00
Youngsang Cho
07b7c5fa4c Turn on/off an overlay view by visibility change in TvView 
Bug: 15873405
Change-Id: I0e6db7fb61af6d79cbfc00cefddd8ba2a0a7ee7e
 2014-06-27 16:21:07 +09:00
Yohei Yukawa
499f7e87ee Merge "Use CharSequence instead of String in CursorAnchorInfo" 2014-06-26 23:14:58 +00:00
Yohei Yukawa
a1fda005f9 Use CharSequence instead of String in CursorAnchorInfo 
This might be useful if we need to pass some spans from the
application to the input method through CursorAnchorInfo.

This change makes CursorAnchorInfo more consistent with other
input method APIs where CharSequence is preferred over String.

BUG: 15088391
Change-Id: Ie04e8a27050849fee1c93ef14b9944acc70fafe4
 2014-06-27 16:23:09 +09:00
smain@google.com
b70761a41d am f106d527: am 3822bf89: change the G+ community link 
* commit 'f106d5279fd098ca93cd8d7e3323b1d8f1b8f242':
  change the G+ community link
 2014-06-27 01:24:09 +00:00
Ricardo Cervera
8f6062ba56 am eb63c4cd: am cf54f881: docs: Replaced image in L Preview material docs 
* commit 'eb63c4cd6e286bb38e24040c96486efb2fd6902e':
  docs: Replaced image in L Preview material docs
 2014-06-27 01:09:14 +00:00
Baligh Uddin
ae40bcbe61 Import translations. DO NOT MERGE 
Change-Id: I14733d99735d38e73451e9df11da28e78d1ac973
Auto-generated-cl: translation import
 2014-06-26 11:02:03 -07:00
George Mount
8885ac9518 Merge "Add IN/OUT flag for all Visibility transitions." 2014-06-26 17:57:04 +00:00
smain@google.com
4cf0aa1e42 am 3f423aa1: add missing image and move link for layout 
* commit '3f423aa1321f235cb0653bb42a057426237ddd7f':
  add missing image and move link for layout
 2014-06-26 17:11:41 +00:00
smain@google.com
3f423aa132 add missing image and move link for layout 
Change-Id: I33dff4e2bd48f6eb786a628fb591a9ba7a5cae53
 2014-06-26 10:04:49 -07:00
Robert Ly
fd91f17d36 am 7e4af93b: link fixes 
* commit '7e4af93be6e1da6c6428f62c7ed71486f82218cd':
  link fixes
 2014-06-26 16:54:58 +00:00
Baligh Uddin
e38e6d67fc am 2ceb05a6: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev 
* commit '2ceb05a6a61d9de4b99408fbad4466fbc9dce548':
  Import translations. DO NOT MERGE
 2014-06-26 16:54:54 +00:00
Baligh Uddin
b22ef14f44 am bbf69273: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev 
* commit 'bbf69273a7ac6cc95a9b0682d0fe62f3a0afb35f':
  Import translations. DO NOT MERGE
 2014-06-26 16:54:50 +00:00
Baligh Uddin
1634e49edf am 9cd24101: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev 
* commit '9cd24101315392d6b58331a7969696ba873103f6':
  Import translations. DO NOT MERGE
 2014-06-26 16:54:47 +00:00
Scott Main
ca71e07f06 am 16e5d71b: Merge "Revert "new device family image for design, not photos"" into klp-modular-dev 
* commit '16e5d71b6bf78d00680d7e9efaf4e94273941292':
  Revert "new device family image for design, not photos"
 2014-06-26 16:54:42 +00:00
Robert Ly
7e4af93be6 link fixes 
Change-Id: If91c07663347f485106e926167845ce184f17da2
 2014-06-26 09:44:43 -07:00
smain@google.com
1fff0b321c am 152440c6: Merge "new device family image for design, not photos" into klp-modular-dev 
* commit '152440c67acace16dc1655a821352b0d69a61562':
  new device family image for design, not photos
 2014-06-26 15:55:32 +00:00
smain@google.com
6988c162a3 am 590ee5f9: fix build, remove briefdocs 
* commit '590ee5f935139eeceec6ed75f658cb6007f82897':
  fix build, remove briefdocs
 2014-06-26 15:55:27 +00:00
smain@google.com
590ee5f935 fix build, remove briefdocs 
Change-Id: I94a611f4bdc2b9c7f305727aacf2edbe63b4ece7
 2014-06-26 08:31:11 -07:00
George Mount
18ab79967c Add IN/OUT flag for all Visibility transitions. 
Bug 15758206

Change-Id: If9b1871117a6808c87adc84ab9215b913ebd2704
 2014-06-26 07:30:11 -07:00
Robin Lee
6507f2e03a Badge document activities in Recents 
The activity icon provided by the app should not be used directly as
icons from activities in other profiles need to be badged.

@bug 15689369

Change-Id: Iee34d296eacc8aeba58f671e3f6b681bc9826425
 2014-06-26 14:21:15 +01:00
Wink Saville
0a493e8722 Fix java doc. 
Change-Id: I620c2ea77504fa4ead92e8a4faf0db4eff4f5e2b
 2014-06-26 04:50:00 -07:00
Robert Ly
f4c7c271a8 am c34fdb72: docs: add l-preview notifications 
* commit 'c34fdb72b70eea142dea4cb75f3a6cc16e70270b':
  docs: add l-preview notifications
 2014-06-26 09:50:29 +00:00