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

208293 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeff Sharkey
35ba2cdbf8 Merge "Inherit ABI when moving existing install." into mnc-dev 2015-07-20 20:44:56 +00:00
Geoff Mendal
385f2d18c6 am 6b12a5fe: (-s ours) am 5038b92e: (-s ours) am ddb33d7d: (-s ours) am a6bf393d: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev 
* commit '6b12a5fea1e8799496f61bf02f927839038b3f33':
  Import translations. DO NOT MERGE
 2015-07-20 20:42:40 +00:00
Dianne Hackborn
01fda52778 am ed3b4253: am 5cdc7f04: am 3aefa438: am 78ead58d: Merge "Fix issue #22531747: Assist info should declare if user has disabled..." into mnc-dev 
* commit 'ed3b42539a4d883533177d008c7ffb2a58e50af6':
  Fix issue #22531747: Assist info should declare if user has disabled...
 2015-07-20 20:42:32 +00:00
Geoff Mendal
c7a024a179 am d4d0c1b3: (-s ours) am 44c44a2b: (-s ours) am ca49ae5a: (-s ours) Import translations. DO NOT MERGE 
* commit 'd4d0c1b3c40241e1b19f2f36992f09021158a2a6':
  Import translations. DO NOT MERGE
 2015-07-20 20:42:26 +00:00
Wale Ogunwale
03dbf19a11 am 88d51c3c: am 7e640ede: am 81696d13: am bde85f74: Merge "Fixed issue with background user window consuming touch events" into mnc-dev 
* commit '88d51c3c07dc5ea80e1cb5253446c53aa59e3749':
  Fixed issue with background user window consuming touch events
 2015-07-20 20:42:20 +00:00
Ricardo Garcia
3f655b83d3 am c42940c9: am f2fd5002: am 238f03c9: am 2dcfc7a9: Merge "Fix for MidiManager bug" into mnc-dev 
* commit 'c42940c96a4419528310f6dfc23444de385b4cb2':
  Fix for MidiManager bug
 2015-07-20 20:42:12 +00:00
Jeff Sharkey
40cda8ef7c Inherit ABI when moving existing install. 
Previously installed apps are moved between volumes as an complete
package, including any previously unpacked native libraries.  This
means we need to inherit any previously derived ABI when moving.

Bug: 22093837
Change-Id: I7656e338affa44e7f997fe4aa95bb297c0acc165
 2015-07-20 13:40:20 -07:00
Roozbeh Pournader
91bb9d0a84 am 9bdb7bfd: Merge "Bidi-wrap the results of format[Short]FileSize()." into mnc-dev 
* commit '9bdb7bfd35a4b1faa5cbafeb3f1e20ff34e7b0e1':
  Bidi-wrap the results of format[Short]FileSize().
 2015-07-20 20:40:10 +00:00
James Cook
45837711c0 Fix dragging between icons in the app shelf 
Convert the icon margin into internal padding. This ensures
that DRAG_ENTERED events are created when the icon is visually
dragged between the icons.

Also change the drag shadow size computation to force it to be
square, because the icon ImageView is no longer square.

Bug: 22603558
Change-Id: I469df043448e562269b764245135fbf898f004ea
 2015-07-20 20:31:41 +00:00
Roozbeh Pournader
9bdb7bfd35 Merge "Bidi-wrap the results of format[Short]FileSize()." into mnc-dev 2015-07-20 20:30:39 +00:00
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
Alan Viverette
9baf55eed6 Adjust padding and font size in time picker for Large text mode 
Bug: 22514034
Change-Id: I9ad22f2d14565b67558f2a48b2c160e05c23f81c
 2015-07-20 16:28:21 -04: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
Alan Viverette
7ef1e773fd Add missing invalidation check to drawable cache 
Bug: 22478448
Change-Id: Ic9da1898cd921d8c133ef5397fc97a664601a863
 2015-07-20 16:03:04 -04: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
1ab5d39764 am 68a2b655: 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 '68a2b6552af226cbc014273bdef6ce353ebf348a':
  Bug: 22598083 Document how apps can detect WRITE_SETTINGS or SYSTEM_ALERT_WINDOW through AppOps
 2015-07-20 19:26:13 +00:00
Jeff Sharkey
c591b0c454 am 37a8e0e0: am f14e4435: am 0fa2a56c: am 71780e79: Merge "Better logging of MediaPlayer failure reason." into mnc-dev 
* commit '37a8e0e0ae3b920a1b272eaa0fa24fc4c7340288':
  Better logging of MediaPlayer failure reason.
 2015-07-20 19:26:07 +00:00
Jean-Michel Trivi
10042f910d am 498985e0: am 34e75a9b: am c1aaeead: am 698250fa: Merge "Media button intent should be send to current user only." into mnc-dev 
* commit '498985e05f7e85bba1c7a1e889dec590b6bb6b6a':
  Media button intent should be send to current user only.
 2015-07-20 19:26:00 +00: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
Christopher Tate
745f380307 am eddb6c00: 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 'eddb6c008be760f7339076de4fcc74ccc094b760':
  Don't fall back to domain verification state when looking up app linkage state
 2015-07-20 19:09:39 +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
Geoff Mendal
4dc07b4d89 am e2059303: (-s ours) am df808132: (-s ours) am 753dc061: (-s ours) am 34c7ef5d: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 
* commit 'e20593034560656de227b5c34026bd0340239a20':
  Import translations. DO NOT MERGE
 2015-07-20 17:45:15 +00:00