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

201191 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Geoff Mendal
6b12a5fea1 am 5038b92e: (-s ours) am ddb33d7d: (-s ours) am a6bf393d: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev 
* commit '5038b92e6adae454feb6095092bdaff80ecf1db3':
  Import translations. DO NOT MERGE
 2015-07-20 20:29:32 +00:00
Dianne Hackborn
ed3b42539a am 5cdc7f04: am 3aefa438: am 78ead58d: Merge "Fix issue #22531747: Assist info should declare if user has disabled..." into mnc-dev 
* commit '5cdc7f045f8714f5a9fd00402de5b12d84bba99d':
  Fix issue #22531747: Assist info should declare if user has disabled...
 2015-07-20 20:29:26 +00:00
Geoff Mendal
d4d0c1b3c4 am 44c44a2b: (-s ours) am ca49ae5a: (-s ours) Import translations. DO NOT MERGE 
* commit '44c44a2b6ae1d9b7088d0846f6ae49dc61ebb0ea':
  Import translations. DO NOT MERGE
 2015-07-20 20:29:20 +00:00
Wale Ogunwale
88d51c3c07 am 7e640ede: am 81696d13: am bde85f74: Merge "Fixed issue with background user window consuming touch events" into mnc-dev 
* commit '7e640edeb3c501ee851e70aa633aa531a6f0b34d':
  Fixed issue with background user window consuming touch events
 2015-07-20 20:29:13 +00:00
Ricardo Garcia
c42940c96a am f2fd5002: am 238f03c9: am 2dcfc7a9: Merge "Fix for MidiManager bug" into mnc-dev 
* commit 'f2fd5002627cd92d5e10d2fd6496c80e8864edb3':
  Fix for MidiManager bug
 2015-07-20 20:29:07 +00:00
Geoff Mendal
5038b92e6a am ddb33d7d: (-s ours) am a6bf393d: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev 
* commit 'ddb33d7d879159471cee10bf471a6815e76ac376':
  Import translations. DO NOT MERGE
 2015-07-20 20:12:55 +00:00
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
Geoff Mendal
ddb33d7d87 am a6bf393d: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev 
* commit 'a6bf393dc5b022f11c698dda610e209b5090d8c0':
  Import translations. DO NOT MERGE
 2015-07-20 20:02:37 +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
a6bf393dc5 Merge "Import translations. DO NOT MERGE" into mnc-dev 2015-07-20 19:58:42 +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
Geoff Mendal
11e1e19a61 Import translations. DO NOT MERGE 
Change-Id: I41156105dcb753a1d9338cdbacebe03d2b4b4f1d
Auto-generated-cl: translation import
 2015-07-20 12:51:19 -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
Billy Lau
68a2b6552a am e4bcf480: am dd0602e8: am 072e04a7: Merge "Bug: 22598083 Document how apps can detect WRITE_SETTINGS or SYSTEM_ALERT_WINDOW through AppOps" into mnc-dev 
* commit 'e4bcf4803b41cf7e370d5f1d0c7ef1edf48ea267':
  Bug: 22598083 Document how apps can detect WRITE_SETTINGS or SYSTEM_ALERT_WINDOW through AppOps
 2015-07-20 19:11:22 +00:00
Jeff Sharkey
37a8e0e0ae am f14e4435: am 0fa2a56c: am 71780e79: Merge "Better logging of MediaPlayer failure reason." into mnc-dev 
* commit 'f14e4435e02c1cf058d475a389abae3000562190':
  Better logging of MediaPlayer failure reason.
 2015-07-20 19:11:17 +00:00
Jean-Michel Trivi
498985e05f am 34e75a9b: am c1aaeead: am 698250fa: Merge "Media button intent should be send to current user only." into mnc-dev 
* commit '34e75a9bbaa9bb4c79cc31034ba353ace659aaa8':
  Media button intent should be send to current user only.
 2015-07-20 19:11:10 +00: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
Christopher Tate
eddb6c008b am 9606921b: am 0fc1e88c: am 6afdad7e: Merge "Don\'t fall back to domain verification state when looking up app linkage state" into mnc-dev 
* commit '9606921b766435a93e5e992ae061d8983ade8085':
  Don't fall back to domain verification state when looking up app linkage state
 2015-07-20 18:44:44 +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
df808132d0 am 753dc061: (-s ours) am 34c7ef5d: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 
* commit '753dc061075c3cd73af1bad508355c132944c694':
  Import translations. DO NOT MERGE
 2015-07-20 16:20:59 +00: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
7fa4d2a748 am f3d1f3af: (-s ours) am 5cc92074: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 
* commit 'f3d1f3af76521e5d1c036016551c271c3112b8aa':
  Import translations. DO NOT MERGE
 2015-07-20 14:46:00 +00:00
Geoff Mendal
bf9b9b1e44 am 7b2319d0: (-s ours) am c0fa470d: (-s ours) Import translations. DO NOT MERGE 
* commit '7b2319d016ecc32ca42819a0f6caa62a9681d137':
  Import translations. DO NOT MERGE
 2015-07-20 14:45:55 +00: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