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

18551 Commits

Author SHA1 Message Date
Geoff Mendal
aa1fe922e4 Import translations. DO NOT MERGE 
Change-Id: I1d3212e4c99f548da9902c797d5893051bdb4ad8
Auto-generated-cl: translation import
 2015-07-29 05:46:09 -07:00
Martijn Coenen
c9e15f6efe am 54d7c4c8: am 619b37a3: am ef3614eb: am c16fd06a: am 50184147: Merge "Resource for setting default NFC payment component." into mnc-dev 
* commit '54d7c4c85ae41893d9048e9e10d33b6826d0e04f':
  Resource for setting default NFC payment component.
 2015-07-29 11:08:33 +00:00
Martijn Coenen
54d7c4c85a am 619b37a3: am ef3614eb: am c16fd06a: am 50184147: Merge "Resource for setting default NFC payment component." into mnc-dev 
* commit '619b37a3616647e7ea32401b772ce65a8aff5e5a':
  Resource for setting default NFC payment component.
 2015-07-29 10:46:48 +00:00
Martijn Coenen
619b37a361 am ef3614eb: am c16fd06a: am 50184147: Merge "Resource for setting default NFC payment component." into mnc-dev 
* commit 'ef3614ebb9089936ba32772f89c14466d77ba777':
  Resource for setting default NFC payment component.
 2015-07-29 10:27:41 +00:00
Daichi Hirono
09109567e9 Add test for queryRoots. 
BUG=20274999

Change-Id: Iea9ca7514d29bb9dcb9c1ef83ff5554f5dc41901
 2015-07-29 19:27:22 +09:00
Martijn Coenen
ef3614ebb9 am c16fd06a: am 50184147: Merge "Resource for setting default NFC payment component." into mnc-dev 
* commit 'c16fd06ae462f79d3f13eb5e29db3227c0e64985':
  Resource for setting default NFC payment component.
 2015-07-29 10:06:14 +00:00
Martijn Coenen
c16fd06ae4 am 50184147: Merge "Resource for setting default NFC payment component." into mnc-dev 
* commit '50184147fc35d5d441ae24661531819cc6cc025f':
  Resource for setting default NFC payment component.
 2015-07-29 08:10:18 +00:00
Martijn Coenen
50184147fc Merge "Resource for setting default NFC payment component." into mnc-dev 2015-07-29 07:54:29 +00:00
Daichi Hirono
5460441ce4 Merge "Implement queryRoot method of MtpDocumentsProvider." 2015-07-29 06:12:11 +00:00
Daichi Hirono
50d17aa871 Implement queryRoot method of MtpDocumentsProvider. 
BUG=20274999

Change-Id: I27aa8bffe47eab6ea1f4195023dbacb6e2f76548
 2015-07-29 14:38:11 +09:00
Jason Monk
810796ca6a am 3bc1702c: am da808d29: am 3623f314: am ea0ad979: am fbcbad13: Merge "Add sizes to SysUI tests" into mnc-dev 
* commit '3bc1702c1a789fd490e815916ce6b2df43b7002b':
  Add sizes to SysUI tests
 2015-07-29 02:10:43 +00:00
Jason Monk
3bc1702c1a am da808d29: am 3623f314: am ea0ad979: am fbcbad13: Merge "Add sizes to SysUI tests" into mnc-dev 
* commit 'da808d298e84288b63413d05c755c81f3c4826e1':
  Add sizes to SysUI tests
 2015-07-29 01:47:00 +00:00
Jason Monk
da808d298e am 3623f314: am ea0ad979: am fbcbad13: Merge "Add sizes to SysUI tests" into mnc-dev 
* commit '3623f314af10b75da34131cd5fc3ddffc481d926':
  Add sizes to SysUI tests
 2015-07-29 01:28:30 +00:00
Jason Monk
3623f314af am ea0ad979: am fbcbad13: Merge "Add sizes to SysUI tests" into mnc-dev 
* commit 'ea0ad97949706d63e9fc0088e1e851d2dc91a2c1':
  Add sizes to SysUI tests
 2015-07-29 01:02:04 +00:00
Jorim Jaggi
e1d440be81 am 7580672f: am ce58fa95: am fed9b281: am 353fe1c6: am 0d210f63: Animation for touch, wake and unlock 
* commit '7580672fa8455dccc78806dcd878a5e191a62a45':
  Animation for touch, wake and unlock
 2015-07-29 00:49:19 +00:00
Jason Monk
ea0ad97949 am fbcbad13: Merge "Add sizes to SysUI tests" into mnc-dev 
* commit 'fbcbad138d1b4c55e86ff671821b4feb7fc48f50':
  Add sizes to SysUI tests
 2015-07-29 00:40:58 +00:00
Zach Johnson
26c60581d7 am ab3c99fd: am 0117bc33: am f8c99378: am bd388372: am 5faa0336: Merge "Add filter for personal apps that are not disabled until first use" into mnc-dev 
* commit 'ab3c99fdc374da0ecfd7d7000ce3183fbe1f021b':
  Add filter for personal apps that are not disabled until first use
 2015-07-29 00:31:53 +00:00
Jason Monk
fbcbad138d Merge "Add sizes to SysUI tests" into mnc-dev 2015-07-29 00:31:16 +00:00
Jorim Jaggi
7580672fa8 am ce58fa95: am fed9b281: am 353fe1c6: am 0d210f63: Animation for touch, wake and unlock 
* commit 'ce58fa9593ae9b0d5e29485019876bde5c54848b':
  Animation for touch, wake and unlock
 2015-07-29 00:28:13 +00:00
Jorim Jaggi
ce58fa9593 am fed9b281: am 353fe1c6: am 0d210f63: Animation for touch, wake and unlock 
* commit 'fed9b2817ffec229baed7c7ea378fae98254b4dd':
  Animation for touch, wake and unlock
 2015-07-29 00:07:24 +00:00
Zach Johnson
ab3c99fdc3 am 0117bc33: am f8c99378: am bd388372: am 5faa0336: Merge "Add filter for personal apps that are not disabled until first use" into mnc-dev 
* commit '0117bc33e2af4045519c4155e4f8c2446db5ec17':
  Add filter for personal apps that are not disabled until first use
 2015-07-29 00:06:47 +00:00
Zach Johnson
0117bc33e2 am f8c99378: am bd388372: am 5faa0336: Merge "Add filter for personal apps that are not disabled until first use" into mnc-dev 
* commit 'f8c99378367ef025b9da981d62806d1d06ef299e':
  Add filter for personal apps that are not disabled until first use
 2015-07-28 23:43:50 +00:00
Jorim Jaggi
fed9b2817f am 353fe1c6: am 0d210f63: Animation for touch, wake and unlock 
* commit '353fe1c665e0065d4c8eecdf41c22f1a1a607f2c':
  Animation for touch, wake and unlock
 2015-07-28 23:43:46 +00:00
Zach Johnson
f8c9937836 am bd388372: am 5faa0336: Merge "Add filter for personal apps that are not disabled until first use" into mnc-dev 
* commit 'bd388372a81472aa3a5f40e57f9f541f85931495':
  Add filter for personal apps that are not disabled until first use
 2015-07-28 23:23:38 +00:00
Jorim Jaggi
353fe1c665 am 0d210f63: Animation for touch, wake and unlock 
* commit '0d210f6395072db4a4c53d4cb8fac4a59a3965b4':
  Animation for touch, wake and unlock
 2015-07-28 23:19:39 +00:00
Jorim Jaggi
0d210f6395 Animation for touch, wake and unlock 
- Add callback to inform SysUI when the screen has been unblocked
and turned on.
- Cleanup inconsistent messaging about device interactive/screen on
and off.
- Add callbacks to inform SysUI about screen states
- Implement a quick fade for the scrim after touch, wake, and unlock.
  First, start with a black scrim on top of everything, and then fade
  it out.
- Make sure we play the normal unlock animation when device is pulsing
- Override navigation bar animations for touch, wake and unlock: Fade
  in the same manner as the scrim.

Bug: 22571198
Bug: 21855614
Change-Id: I8ff08d72cced1e0f03c78d71ff710d8a4f6b848c
 2015-07-28 23:02:54 +00:00
Zach Johnson
bd388372a8 am 5faa0336: Merge "Add filter for personal apps that are not disabled until first use" into mnc-dev 
* commit '5faa033615dcb4297fcb6a81828099285364942d':
  Add filter for personal apps that are not disabled until first use
 2015-07-28 22:58:11 +00:00
Zach Johnson
5faa033615 Merge "Add filter for personal apps that are not disabled until first use" into mnc-dev 2015-07-28 22:36:30 +00:00
Jason Monk
3358d91dd1 am 11c410b7: am 396da07e: am 6c9001fc: am 52fbf583: am 35066219: Merge "Fix network name not showing in QS sometimes" into mnc-dev 
* commit '11c410b7199c1776f336a4400e92258446837f72':
  Fix network name not showing in QS sometimes
 2015-07-28 19:48:31 +00:00
Jason Monk
11c410b719 am 396da07e: am 6c9001fc: am 52fbf583: am 35066219: Merge "Fix network name not showing in QS sometimes" into mnc-dev 
* commit '396da07e7992f8a5877162d40ba02dd0e0987fc4':
  Fix network name not showing in QS sometimes
 2015-07-28 19:27:12 +00:00
Jason Monk
396da07e79 am 6c9001fc: am 52fbf583: am 35066219: Merge "Fix network name not showing in QS sometimes" into mnc-dev 
* commit '6c9001fc28ea0abbfe95ef7aec1cdcd7192cd963':
  Fix network name not showing in QS sometimes
 2015-07-28 19:06:23 +00:00
Jorim Jaggi
78e72fde59 am b33a12e4: am 0e3e286c: am c925e4d6: am 7d07aff8: am 965bab2b: Merge "Allow assist gesture when notification shade is expanded" into mnc-dev 
* commit 'b33a12e46d916c35575c6528f461eb6b7a11ee9a':
  Allow assist gesture when notification shade is expanded
 2015-07-28 18:47:32 +00:00
Jason Monk
6c9001fc28 am 52fbf583: am 35066219: Merge "Fix network name not showing in QS sometimes" into mnc-dev 
* commit '52fbf5833992195c790114ad1ef9ab5883d1b2b2':
  Fix network name not showing in QS sometimes
 2015-07-28 18:41:51 +00:00
Jason Monk
52fbf58339 am 35066219: Merge "Fix network name not showing in QS sometimes" into mnc-dev 
* commit '350662197542d406df58aa65afddc9e23f9309d3':
  Fix network name not showing in QS sometimes
 2015-07-28 18:22:30 +00:00
Jason Monk
3506621975 Merge "Fix network name not showing in QS sometimes" into mnc-dev 2015-07-28 18:05:49 +00:00
Steve McKay
7f8eec09f5 Merge "Make horizontal and vertical margins equal in DocumentsUI." 2015-07-28 17:18:17 +00:00
Steve McKay
cf7eb0a0ee Merge "Update colors for the standalone activity of DocumentsUI." 2015-07-28 17:11:32 +00:00
Xiaohui Chen
7ce4ed1601 Merge "Make logout notification string shorter" 2015-07-28 16:33:02 +00:00
Vadim Tryshev
70a2cbd0e3 Merge "Storing and using user id for pinned shelf apps." 2015-07-28 14:36:22 +00:00
Vadim Tryshev
c5f860cea0 Storing and using user id for pinned shelf apps. 
We need this to differentiate between starting apps for the primary and
managed users.

This in particular solves the issue when apps were executed as Owner
while we are in Guest account (see the bug).

Valid user ids for a shelf app are either primary or a managed (work)
user for the profile.
Launcher allows mixing apps for for primary and the managed users on
its home screen. Apps for the managed user are marked with a suitcase
badge.

Launcher includes a user id in the drag and drop info that it sends to
SystemUI, as “profile” extra added to the intent.

Shelf now stores this user id and uses it to start apps.

Bug: 22609426
Change-Id: Id4c6c1ac8617a83f4484f78db578955699d1a888
 2015-07-28 07:34:32 -07:00
Jason Monk
e427cb8076 Add sizes to SysUI tests 
Change-Id: I27e4a60e2658d3a5db32cdeb73bd0a031865ce86
 2015-07-28 10:06:01 -04:00
Tomasz Mikolajewski
7f9f4c4493 Make horizontal and vertical margins equal in DocumentsUI. 
BUG=None

Change-Id: I78fd3191259fa1e9a420b105f2a2be8bd5f853bb
 2015-07-28 15:42:01 +09:00
Tomasz Mikolajewski
f5eb9b3047 Update colors for the standalone activity of DocumentsUI. 
BUG=None

Change-Id: Iaf1f9bed243654d1378f0b23c72f128dcbb291f6
 2015-07-28 15:02:18 +09:00
Daichi Hirono
d30c9d1302 Remove local flag for proguard. 
Now default configuration of proguard can handle internal VisibleForTesting
annotation. We don't need to have local configuration.

BUG=20274999

Change-Id: Ib21e07336e48dda71d0d2644ddd86422414f7524
 2015-07-28 14:30:07 +09:00
Daichi Hirono
df3f2e6fdd Add ReceiverActivity to MtpDocumentsProvider. 
To show the application chooser for the UsbManager.ACTION_USB_DEVICE_ATTACHED
intent, the intent should be received by activity. The activity has NoDisplay
theme and immediately terminate after routing intent to MtpDocumentsService.

BUG=20274999

Change-Id: I2080ea433b1657dd68640681664adbf92d1d30e9
 2015-07-28 13:06:17 +09:00
Daichi Hirono
ad37061567 Merge "Add MtpDocumentsService." 2015-07-28 03:51:53 +00:00
Daichi Hirono
2efe4cac49 Add MtpDocumentsService. 
BUG=20274999

Change-Id: I1d60ebcf100767136ac7f78e619021776c6be02f
 2015-07-28 12:49:11 +09:00
Jorim Jaggi
b33a12e46d am 0e3e286c: am c925e4d6: am 7d07aff8: am 965bab2b: Merge "Allow assist gesture when notification shade is expanded" into mnc-dev 
* commit '0e3e286c818715ee4b0436ce2de294e40681d8cf':
  Allow assist gesture when notification shade is expanded
 2015-07-28 01:33:36 +00:00
Jorim Jaggi
0e3e286c81 am c925e4d6: am 7d07aff8: am 965bab2b: Merge "Allow assist gesture when notification shade is expanded" into mnc-dev 
* commit 'c925e4d68af2202830c5e6990c902874b55d931f':
  Allow assist gesture when notification shade is expanded
 2015-07-28 01:19:35 +00:00
Jorim Jaggi
c925e4d68a am 7d07aff8: am 965bab2b: Merge "Allow assist gesture when notification shade is expanded" into mnc-dev 
* commit '7d07aff85e41a95ce4743d3b371935c9f21813ab':
  Allow assist gesture when notification shade is expanded
 2015-07-28 01:06:28 +00:00