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

115317 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
John Spurlock
c65dfef3f5 am afc76f28: Merge "Use scaled display size in wallpaper constraint." into klp-dev 
* commit 'afc76f28b93f931069bb58c4f9b524d5a99b1604':
  Use scaled display size in wallpaper constraint.
 2013-11-18 12:52:58 -08:00
John Spurlock
afc76f28b9 Merge "Use scaled display size in wallpaper constraint." into klp-dev 2013-11-18 20:49:16 +00:00
John Spurlock
d6e836c4a0 Use scaled display size in wallpaper constraint. 
Bug:11596190
Change-Id: Icc81beeea2e71144c2e5330b047e4781a23d7449
 2013-11-18 14:14:49 -05:00
Baligh Uddin
4dee4e1cb3 am 35fb6cdf: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '35fb6cdf14549dac07585ae791b27e2c069bf176':
  Import translations. DO NOT MERGE
 2013-11-18 10:53:25 -08:00
Baligh Uddin
2cf27e7111 am d7b40520: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit 'd7b4052049cba6c793367f6b5a8c3837f06faf1e':
  Import translations. DO NOT MERGE
 2013-11-18 10:53:21 -08:00
Baligh Uddin
35fb6cdf14 Merge "Import translations. DO NOT MERGE" into klp-dev 2013-11-18 18:51:24 +00:00
Baligh Uddin
d7b4052049 Merge "Import translations. DO NOT MERGE" into klp-dev 2013-11-18 18:51:01 +00:00
Robert Greenwalt
a8a448da25 am e568672c: Merge "Fix NPE in ConnectivityService" into klp-dev 
* commit 'e568672c9e57e1d7066e95ba547a1ae568409226':
  Fix NPE in ConnectivityService
 2013-11-18 10:29:51 -08:00
Robert Greenwalt
e568672c9e Merge "Fix NPE in ConnectivityService" into klp-dev 2013-11-18 18:27:23 +00:00
Deepanshu Gupta
ea04da7a18 am 9570ed56: Merge "Add libphonenumber to layoutlib.jar. DO NOT MERGE" into klp-dev 
* commit '9570ed561296dd5a0753198706cde152b00f1b24':
  Add libphonenumber to layoutlib.jar. DO NOT MERGE
 2013-11-18 10:11:50 -08:00
Deepanshu Gupta
42453ede33 am 599105a9: Merge "Fix NPE in layoutlib. DO NOT MERGE" into klp-dev 
* commit '599105a92ceb24f0f09beb11be18126ae4e8efdf':
  Fix NPE in layoutlib. DO NOT MERGE
 2013-11-18 10:11:47 -08:00
Deepanshu Gupta
9570ed5612 Merge "Add libphonenumber to layoutlib.jar. DO NOT MERGE" into klp-dev 2013-11-18 18:08:09 +00:00
Deepanshu Gupta
599105a92c Merge "Fix NPE in layoutlib. DO NOT MERGE" into klp-dev 2013-11-18 18:07:55 +00:00
Robert Greenwalt
a8dae99d76 Fix NPE in ConnectivityService 
bug:11727708
Change-Id: Ia8ca9d1e23f021feaf4b772ec38d1d0e89b0cd2a
 2013-11-18 09:43:59 -08:00
Baligh Uddin
4f0d1fc028 Import translations. DO NOT MERGE 
Change-Id: Iacdab3a03a17cefc52aa7d72195d0cbcc2354039
Auto-generated-cl: translation import
 2013-11-18 09:22:29 -08:00
Baligh Uddin
2337eb1b65 Import translations. DO NOT MERGE 
Change-Id: Ia6d256fedf7e3d888942d66397f5842d46658c0f
Auto-generated-cl: translation import
 2013-11-18 08:49:48 -08:00
Baligh Uddin
253a352f8c am 564fb1b8: (-s ours) Import translations. DO NOT MERGE 
* commit '564fb1b8ce4aa603bd0d5b3a077ba27d66e77c32':
  Import translations. DO NOT MERGE
 2013-11-17 16:35:05 -08:00
Baligh Uddin
564fb1b8ce Import translations. DO NOT MERGE 
Change-Id: I6eea0f5a4b57c4686d1f6ff4fc137358400651b8
Auto-generated-cl: translation import
 2013-11-17 16:30:52 -08:00
Craig Mautner
0324bb1a99 am 23188c2b: Merge "Restore jankless transition keyguard-to-wallpaper" into klp-dev 
* commit '23188c2be4abb23f506b01ccd99884debd09cbb6':
  Restore jankless transition keyguard-to-wallpaper
 2013-11-15 15:20:18 -08:00
Craig Mautner
23188c2be4 Merge "Restore jankless transition keyguard-to-wallpaper" into klp-dev 2013-11-15 23:13:48 +00:00
Katie McCormick
0037930bbe am 63cd3802: Doc update: update old console references. 
* commit '63cd3802008010008aebc3a7a5d9fdf432cf0b5a':
  Doc update: update old console references.
 2013-11-15 22:39:21 +00:00
Katie McCormick
63cd380200 Doc update: update old console references. 
Change-Id: I54d50876022b308a4688293853b3e9227cb5e87c
 2013-11-15 22:33:13 +00:00
Craig Mautner
de43ebe86a Restore jankless transition keyguard-to-wallpaper 
There is still a flash of black when going to a non-wallpaper activity
from keyguard. This is not a regression from jb-mr2 and any fixes to
clean it up are too risky at this late date.

Fixes (partially) bug 11570753.

Change-Id: I17aaae4ab8be570f7e28276a7b8ac4b8685e7551
 2013-11-15 14:15:43 -08:00
Joe Fernandez
3316478655 am 5b93d259: Merge "docs: code fixes for OpenGL ES training" into klp-docs 
* commit '5b93d259b8df98b011ac7f915b2c6602bc63f9fe':
  docs: code fixes for OpenGL ES training
 2013-11-15 21:22:17 +00:00
Joe Fernandez
5b93d259b8 Merge "docs: code fixes for OpenGL ES training" into klp-docs 2013-11-15 21:19:51 +00:00
Joe Fernandez
feaaea5b41 docs: code fixes for OpenGL ES training 
code sample fixes reviewed separately,
see Change-Id: I1d760b75d1f2bfe1ec90c71471867577bd146241

fixing bugs:
b/10798358
b/10796990
b/10603728
b/7962328

Change-Id: I1e0f6668ec8d2b103b88c385f1f067d30ecc7178
 2013-11-15 11:55:33 -08:00
Wink Saville
6797925686 am 31cab2f8: Merge "Add config_restartRadioAfterProvisioning" into klp-dev 
* commit '31cab2f803951edb13ea07e7e34916189fec5167':
  Add config_restartRadioAfterProvisioning
 2013-11-15 11:39:16 -08:00
Wink Saville
31cab2f803 Merge "Add config_restartRadioAfterProvisioning" into klp-dev 2013-11-15 19:35:05 +00:00
Wink Saville
9124d56acc Add config_restartRadioAfterProvisioning 
Bug: 11673637
Change-Id: Ie758a303fd751d204fd6baa60217e88df6376aae
 2013-11-15 08:27:53 -08:00
Jeff Brown
5d0b18cddf am 3de885be: Merge "Disallow applications from initiating cast screen." into klp-dev 
* commit '3de885bef2f0f85ea76fd96c8f18cdd743ce66a4':
  Disallow applications from initiating cast screen.
 2013-11-15 00:38:09 -08:00
Jeff Brown
3de885bef2 Merge "Disallow applications from initiating cast screen." into klp-dev 2013-11-15 08:35:50 +00:00
Jeff Brown
af574183c2 Disallow applications from initiating cast screen. 
Only allow the system ui and settings to connect to a remote display.
To do this, we essentially hide the remote displays from applications
by using the ROUTE_TYPE_REMOTE_DISPLAY then add permission checks
around the operations that connect to them.

As a bonus, this may actually save power on devices since applications
that use MediaRouter will not longer be performing discover on
remote display routes at all.

Bug: 11257292
Change-Id: I9ea8c568df4df5a0f0cf3d0f11b39c87e2110795
 2013-11-15 00:29:43 -08:00
Baligh Uddin
634fbcf8a3 am 2785892d: (-s ours) Import translations. DO NOT MERGE 
* commit '2785892dbf6c53b7e1a08596969bfcdf0148c8e9':
  Import translations. DO NOT MERGE
 2013-11-14 22:39:20 -08:00
Baligh Uddin
2785892dbf Import translations. DO NOT MERGE 
Change-Id: I6d1283da139ad2ef60213d83d7ac00939a4bfc04
Auto-generated-cl: translation import
 2013-11-14 22:32:08 -08:00
Svetoslav
d2b27cbde9 am 6874bfe1: Merge "Created print jobs should not be persisted until they are queued." into klp-dev 
* commit '6874bfe19b6bc1522e07e53eb96a07e21d148b41':
  Created print jobs should not be persisted until they are queued.
 2013-11-14 22:27:35 -08:00
Svetoslav
6874bfe19b Merge "Created print jobs should not be persisted until they are queued." into klp-dev 2013-11-15 06:23:32 +00:00
Mindy Pereira
cce2e1944c am 5823352c: Cancel double tap mode on action_up 
* commit '5823352c6c5bfa3824afacd023b01af537b5dfa0':
  Cancel double tap mode on action_up
 2013-11-14 19:44:52 -08:00
Mindy Pereira
5823352c6c Cancel double tap mode on action_up 
fixes b/11592408 Dragging immediately after double touch turns gesture into double touch drag

Change-Id: I3e7926a4f6f9ab4951f380bd004499c78b3bda69
 2013-11-15 02:48:06 +00:00
Christopher Tate
64397749ef am 22010817: Merge "Handle backup transport registration dynamically" into klp-dev 
* commit '22010817b90f97756a76777fcd1dbe7e3b63e808':
  Handle backup transport registration dynamically
 2013-11-14 18:37:54 -08:00
Christopher Tate
22010817b9 Merge "Handle backup transport registration dynamically" into klp-dev 2013-11-15 02:34:38 +00:00
Jim Miller
8d1e86d054 am 1907c0d2: Merge "Don\'t show external presentation until keyguard actually shows" into klp-dev 
* commit '1907c0d280d97776708810c9d24931aa6f818790':
  Don't show external presentation until keyguard actually shows
 2013-11-14 18:20:53 -08:00
Jim Miller
1907c0d280 Merge "Don't show external presentation until keyguard actually shows" into klp-dev 2013-11-15 02:18:08 +00:00
Christopher Tate
cefba58d14 Handle backup transport registration dynamically 
Bug 11369873

Change-Id: I9bbdcc21ce25159c6645690123b5d03c553b0ddc
 2013-11-14 18:13:25 -08:00
Svetoslav
885810de69 Created print jobs should not be persisted until they are queued. 
Print jobs in a created state should not be persisted. However,
if a print service sets the tag to a print job that is queued,
we were persisting even print jobs in a created state. This
change adds a simple check while persisting to avoid storing
created print jobs.

bug:11696785

Change-Id: Idf28f3634b91fd5bf345f376114af4ed478ed3c6
 2013-11-14 18:02:31 -08:00
Jeff Brown
2bced6dcb5 am a7a46a66: Merge "Update cast screen strings." into klp-dev 
* commit 'a7a46a66fa9f9ce547bac6c2e800a0ae287d9e5c':
  Update cast screen strings.
 2013-11-14 17:31:32 -08:00
Jeff Brown
a7a46a66fa Merge "Update cast screen strings." into klp-dev 2013-11-15 01:28:59 +00:00
John Spurlock
caf21486df am 68837c4e: Merge "Avoid skipping animated status bar icon frames." into klp-dev 
* commit '68837c4eca7705cd32e3de2e7cdcd24c72ecaea7':
  Avoid skipping animated status bar icon frames.
 2013-11-14 17:16:38 -08:00
John Spurlock
68837c4eca Merge "Avoid skipping animated status bar icon frames." into klp-dev 2013-11-15 01:11:52 +00:00
Jim Miller
d31fd404e3 Don't show external presentation until keyguard actually shows 
The previous code was looking for just the display to turn off.
It should wait until keyguard is actually shown before enabling
the external presentations.

Fix for bug 11694904

Change-Id: Iebf3aa04fc094cd4e5c8f56bc771aca1e5921d04
 2013-11-14 16:47:26 -08:00
Jeff Brown
cef34fce3c Update cast screen strings. 
Bug: 11257292
Change-Id: Ia66152985bafcdd8ec88a3145623536a2b439b78
 2013-11-14 16:03:36 -08:00