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

198258 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dianne Hackborn
5cdc7f045f am 3aefa438: am 78ead58d: Merge "Fix issue #22531747: Assist info should declare if user has disabled..." into mnc-dev 
* commit '3aefa438300b116d2c080de434e0a890bf1dded5':
  Fix issue #22531747: Assist info should declare if user has disabled...
 2015-07-20 20:12:48 +00:00
Geoff Mendal
44c44a2b6a am ca49ae5a: (-s ours) Import translations. DO NOT MERGE 
* commit 'ca49ae5a5e851a1f5c761261bdd544174e095c0e':
  Import translations. DO NOT MERGE
 2015-07-20 20:12:43 +00:00
Wale Ogunwale
7e640edeb3 am 81696d13: am bde85f74: Merge "Fixed issue with background user window consuming touch events" into mnc-dev 
* commit '81696d13360a00dd3a450e7ff97329e8560c4684':
  Fixed issue with background user window consuming touch events
 2015-07-20 20:12:38 +00:00
Dianne Hackborn
3aefa43830 am 78ead58d: Merge "Fix issue #22531747: Assist info should declare if user has disabled..." into mnc-dev 
* commit '78ead58df03e476d656c7e875fff9ade13b727c1':
  Fix issue #22531747: Assist info should declare if user has disabled...
 2015-07-20 20:02:32 +00:00
Geoff Mendal
ca49ae5a5e Import translations. DO NOT MERGE 
Change-Id: I08703b57a1fe0b578bcb7e5f2a2e7d9c2904526f
Auto-generated-cl: translation import
 2015-07-20 12:53:55 -07:00
Dianne Hackborn
78ead58df0 Merge "Fix issue #22531747: Assist info should declare if user has disabled..." into mnc-dev 2015-07-20 19:50:50 +00:00
Dianne Hackborn
17f693520d Fix issue #22531747: Assist info should declare if user has disabled... 
...context and/or screenshot

Added new API to find out what contextual data has been globally disabled.

Also updated various documentation to make it clear what kind of contextual
data you will get (and when it will be null).

Also added a new Activity.showAssist() API because...  well, I was already
in there, it was easy to do, it is safe, and maybe people will build cool
things with it.

Change-Id: Ia553d6bcdd098dc0fce4b9237fbfaca9652fc74b
 2015-07-20 12:49:10 -07:00
Ricardo Garcia
f2fd500262 am 238f03c9: am 2dcfc7a9: Merge "Fix for MidiManager bug" into mnc-dev 
* commit '238f03c9b38182c2e4347ece097b4cb18ba926ab':
  Fix for MidiManager bug
 2015-07-20 19:11:07 +00:00
Wale Ogunwale
81696d1336 am bde85f74: Merge "Fixed issue with background user window consuming touch events" into mnc-dev 
* commit 'bde85f741c2ccbb7d719cdf0a48a607b104c3943':
  Fixed issue with background user window consuming touch events
 2015-07-20 19:11:06 +00:00
Ricardo Garcia
238f03c9b3 am 2dcfc7a9: Merge "Fix for MidiManager bug" into mnc-dev 
* commit '2dcfc7a9972de3abfebdf2d84bcba0095e4fbae5':
  Fix for MidiManager bug
 2015-07-20 18:47:21 +00:00
Wale Ogunwale
bde85f741c Merge "Fixed issue with background user window consuming touch events" into mnc-dev 2015-07-20 18:46:00 +00:00
Billy Lau
e4bcf4803b am dd0602e8: am 072e04a7: Merge "Bug: 22598083 Document how apps can detect WRITE_SETTINGS or SYSTEM_ALERT_WINDOW through AppOps" into mnc-dev 
* commit 'dd0602e89daf6c458674efbcf01a5e0521f3c381':
  Bug: 22598083 Document how apps can detect WRITE_SETTINGS or SYSTEM_ALERT_WINDOW through AppOps
 2015-07-20 18:43:56 +00:00
Jeff Sharkey
f14e4435e0 am 0fa2a56c: am 71780e79: Merge "Better logging of MediaPlayer failure reason." into mnc-dev 
* commit '0fa2a56c3bc88cd4f3cddee99528c7e8a57af4d6':
  Better logging of MediaPlayer failure reason.
 2015-07-20 18:43:51 +00:00
Jean-Michel Trivi
34e75a9bba am c1aaeead: am 698250fa: Merge "Media button intent should be send to current user only." into mnc-dev 
* commit 'c1aaeead6ed7bb685c7bd0b5e09de935913229ed':
  Media button intent should be send to current user only.
 2015-07-20 18:43:47 +00:00
Billy Lau
dd0602e89d am 072e04a7: Merge "Bug: 22598083 Document how apps can detect WRITE_SETTINGS or SYSTEM_ALERT_WINDOW through AppOps" into mnc-dev 
* commit '072e04a7f1a167dc653b5bcca4876fecfdb4f6be':
  Bug: 22598083 Document how apps can detect WRITE_SETTINGS or SYSTEM_ALERT_WINDOW through AppOps
 2015-07-20 18:04:08 +00:00
Jeff Sharkey
0fa2a56c3b am 71780e79: Merge "Better logging of MediaPlayer failure reason." into mnc-dev 
* commit '71780e79846d0ccc2aef2214041657410a8a14c2':
  Better logging of MediaPlayer failure reason.
 2015-07-20 18:04:04 +00:00
Jean-Michel Trivi
c1aaeead6e am 698250fa: Merge "Media button intent should be send to current user only." into mnc-dev 
* commit '698250fae7d82d8020d2b9038b9e9d68c9489b04':
  Media button intent should be send to current user only.
 2015-07-20 18:04:01 +00:00
Christopher Tate
9606921b76 am 0fc1e88c: am 6afdad7e: Merge "Don\'t fall back to domain verification state when looking up app linkage state" into mnc-dev 
* commit '0fc1e88c05e805324880a35b3f10126937824a79':
  Don't fall back to domain verification state when looking up app linkage state
 2015-07-20 18:03:55 +00:00
Ricardo Garcia
2dcfc7a997 Merge "Fix for MidiManager bug" into mnc-dev 2015-07-20 18:03:45 +00:00
Billy Lau
072e04a7f1 Merge "Bug: 22598083 Document how apps can detect WRITE_SETTINGS or SYSTEM_ALERT_WINDOW through AppOps" into mnc-dev 2015-07-20 17:57:30 +00:00
Jeff Sharkey
71780e7984 Merge "Better logging of MediaPlayer failure reason." into mnc-dev 2015-07-20 17:37:09 +00:00
Billy Lau
24b9c8314b Bug: 22598083 Document how apps can detect WRITE_SETTINGS or SYSTEM_ALERT_WINDOW 
through AppOps

Expose OP_STR strings that describes the ops for WRITE_SETTINGS and
SYSTEM_ALERT_WINDOW permissions such that apps can query AppOpsManager
whether this capability is turned on or off by the user.

Change-Id: I0e7a6f39e02389290232e450624b40ffb255abfb
 2015-07-20 18:36:39 +01:00
Christopher Tate
0fc1e88c05 am 6afdad7e: Merge "Don\'t fall back to domain verification state when looking up app linkage state" into mnc-dev 
* commit '6afdad7e8863cb1fa3db5909e48269606fa76991':
  Don't fall back to domain verification state when looking up app linkage state
 2015-07-20 17:27:56 +00:00
Jean-Michel Trivi
698250fae7 Merge "Media button intent should be send to current user only." into mnc-dev 2015-07-20 17:25:32 +00:00
Christopher Tate
6afdad7e88 Merge "Don't fall back to domain verification state when looking up app linkage state" into mnc-dev 2015-07-20 17:05:32 +00:00
Jeff Sharkey
4fa85b7cad Better logging of MediaPlayer failure reason. 
Otherwise exception details are dropped on the floor, making it
hard to debug.

Bug: 22525550
Change-Id: I6ab9eb8461a23b9d9b8a0ea6dd1ae8ee2495dd01
 2015-07-20 09:38:02 -07:00
Geoff Mendal
753dc06107 am 34c7ef5d: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 
* commit '34c7ef5d59961e1d7fdc1b14c9e46ea11cf15859':
  Import translations. DO NOT MERGE
 2015-07-20 16:06:38 +00:00
Geoff Mendal
34c7ef5d59 Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 2015-07-20 15:58:53 +00:00
Geoff Mendal
336bb9165f Import translations. DO NOT MERGE 
Change-Id: Ib98726d7c1b13a15d59e90a4e51b79542b0ff418
Auto-generated-cl: translation import
 2015-07-20 10:47:33 -05:00
Geoff Mendal
f3d1f3af76 am 5cc92074: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 
* commit '5cc92074091ad5223380bf65e22ad054e9f2211f':
  Import translations. DO NOT MERGE
 2015-07-20 14:32:47 +00:00
Geoff Mendal
7b2319d016 am c0fa470d: (-s ours) Import translations. DO NOT MERGE 
* commit 'c0fa470da08460dc749e24107c904f47e3ee0d94':
  Import translations. DO NOT MERGE
 2015-07-20 14:32:42 +00:00
Geoff Mendal
5cc9207409 Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 2015-07-20 14:26:41 +00:00
Geoff Mendal
653b913270 Import translations. DO NOT MERGE 
Change-Id: I63f59410a8081aaf9678e9d318ba308c259e1254
Auto-generated-cl: translation import
 2015-07-20 06:54:33 -07:00
Geoff Mendal
c0fa470da0 Import translations. DO NOT MERGE 
Change-Id: Icbd56819c58f38f5e254bf06203fae83a9dddd07
Auto-generated-cl: translation import
 2015-07-20 06:52:40 -07:00
Erik Kline
ec69003d9b am 9d598e11: Pass signal strength thresholds inside a Bundle 
* commit '9d598e115f306e4f0860638c5647a959ac1320c5':
  Pass signal strength thresholds inside a Bundle
 2015-07-18 17:41:11 +00:00
Lorenzo Colitti
da355c80b0 am c3f21f3b: Support NetworkCallbacks based on signal strength. 
* commit 'c3f21f3b8b01508f5dc01b2e5fa4c3d652bb67bb':
  Support NetworkCallbacks based on signal strength.
 2015-07-18 17:41:07 +00:00
Erik Kline
9d598e115f Pass signal strength thresholds inside a Bundle 
Bug: 21407651
Change-Id: I2c80e89441e2eb15a246cb1fa9347f886cefa80f
 2015-07-18 17:28:52 +00:00
Lorenzo Colitti
c3f21f3b8b Support NetworkCallbacks based on signal strength. 
Bug: 21405941
Change-Id: I2ed8a5aeb8dac464a4305671ed22abcacb485bc9
 2015-07-18 17:28:26 +00:00
Lorenzo Colitti
e647d93d6d am 8bf977d5: ConnectivityManager API for for packet keepalives. 
* commit '8bf977d562b8f7261cf964bdf045b22bdbd92b7d':
  ConnectivityManager API for for packet keepalives.
 2015-07-18 17:24:05 +00:00
Lorenzo Colitti
00365fc62e am 260a36d1: Make immutable NetworkCapabilities more explicit. 
* commit '260a36d1b20469d39490b61fca610271bfa53df2':
  Make immutable NetworkCapabilities more explicit.
 2015-07-18 17:24:01 +00:00
Lorenzo Colitti
8bf977d562 ConnectivityManager API for for packet keepalives. 
Bug: 21405946
Change-Id: Ie1f8f8bee684fe2bb1092a9f1bc9f5dc29b1defc
 2015-07-18 17:00:13 +00:00
Lorenzo Colitti
260a36d1b2 Make immutable NetworkCapabilities more explicit. 
Bug: 21405941
Change-Id: Iafd738c31747b0f5f9356bed1c97f5f282830af1
 2015-07-18 16:59:47 +00:00
Wale Ogunwale
4eef94f2b8 Fixed issue with background user window consuming touch events 
When adding a window for a background user, it is possible for
the window to consume touch events because it is in the
COMMIT_DRAW_PENDING state. We allow the background user window
to transition READY_TO_SHOW state, but hide the window.

Change is based on https://android-review.googlesource.com/#/c/158772
and also reverts commits 6ee618509a392adb183c2e70390cd9e2031ff0d8
and 588932a53e63c0a7ee281dea22559c129b40eb99

Bug: 22531717
Bug: 22207948
Bug: 18510914
https://code.google.com/p/android-developer-preview/issues/detail?id=2667

Change-Id: I68d2e532c2b1def0d7b22c9b60e48110cf3cd686
 2015-07-17 22:29:54 -07:00
Jorim Jaggi
17a838e5c7 am 9029ae2b: am 29cf9aea: Adjust fingerprint icon placement to spec 
* commit '9029ae2b89c5abf0fb7013e8b98216b3ae4a01c2':
  Adjust fingerprint icon placement to spec
 2015-07-18 01:19:53 +00:00
Jorim Jaggi
9029ae2b89 am 29cf9aea: Adjust fingerprint icon placement to spec 
* commit '29cf9aea5490c42b85aaaa98b6784daff82629f8':
  Adjust fingerprint icon placement to spec
 2015-07-18 01:04:55 +00:00
Jorim Jaggi
29cf9aea54 Adjust fingerprint icon placement to spec 
Bug: 22502068
Change-Id: I12952cb1ea43f365d5a63ec2636a5d60a981b93f
 2015-07-18 00:53:12 +00:00
Chris Craik
fbd2d94958 am b6e41a08: am 0bb5c26b: Merge "Fix AssetAtlas usage in BitmapShaders" into mnc-dev 
* commit 'b6e41a08826d01dba3ad30c14e72e3531d22d0ad':
  Fix AssetAtlas usage in BitmapShaders
 2015-07-18 00:24:55 +00:00
Chris Craik
b6e41a0882 am 0bb5c26b: Merge "Fix AssetAtlas usage in BitmapShaders" into mnc-dev 
* commit '0bb5c26bcea4b171583e57134b9717c77fbdcb14':
  Fix AssetAtlas usage in BitmapShaders
 2015-07-18 00:07:13 +00:00
Chris Craik
0bb5c26bce Merge "Fix AssetAtlas usage in BitmapShaders" into mnc-dev 2015-07-17 23:59:17 +00:00
Adrian Roos
9f71f05be0 am 1f72739a: am 57ee4b87: Merge "Fix image wallpaper size" into mnc-dev 
* commit '1f72739a0b546d8a26ec0f704fcfeaf9d051fd37':
  Fix image wallpaper size
 2015-07-17 23:54:10 +00:00