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

79959 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eric Fischer
736d1c6b7b am 2c7f1325: (-s ours) am 5ddf003c: Merge "Revert "Import translations. DO NOT MERGE"" into jb-dev 
* commit '2c7f1325e1c3cd58d16e3b42bc8a752d089fb6c9':
  Revert "Import translations. DO NOT MERGE"
 2012-06-06 13:58:49 -07:00
Jake Hamby
004ff5ad2a DO NOT MERGE: Remove SMS shortcode warning feature. 
Fix jb-dev build. The SMS shortcode warning feature has some usability
limitations which need to be resolved before shipping. Remove the code
for JellyBean. It will be added back to a future release when the
feature is complete.

Bug: 6605549
Change-Id: Ic8a68dc0b1ad038618962185f5ee680d5281ca21
 2012-06-06 13:56:50 -07:00
Eric Fischer
2c7f1325e1 am 5ddf003c: Merge "Revert "Import translations. DO NOT MERGE"" into jb-dev 
* commit '5ddf003cb2957672038bf1db397422402dce930a':
  Revert "Import translations. DO NOT MERGE"
 2012-06-06 13:54:56 -07:00
Eric Fischer
5ddf003cb2 Merge "Revert "Import translations. DO NOT MERGE"" into jb-dev 2012-06-06 13:53:00 -07:00
Eric Fischer
25dcc321f7 Revert "Import translations. DO NOT MERGE" 
This reverts commit 6a6f746ece453c43aa92808cd140012866c8eb5c
 2012-06-06 13:51:50 -07:00
Michael Jurka
202c3b8457 am f330b539: am a2c628fb: Merge "Fix bug 6499508" into jb-dev 
* commit 'f330b53955461e0fca01a5ca6f6d90429815a30a':
  Fix bug 6499508
 2012-06-06 13:38:01 -07:00
Dianne Hackborn
20e14948f2 am 82811d45: am 533fce25: Merge "Docs (mostly): enumerate JELLY_BEAN target SDK changes." into jb-dev 
* commit '82811d45ed21ccdff77d11495fa2045c7942bd6d':
  Docs (mostly): enumerate JELLY_BEAN target SDK changes.
 2012-06-06 13:37:57 -07:00
Jean-Michel Trivi
bab1ae4ce6 am b8da1c90: am 88a89b29: Merge "Always queue A2DP connection state message with wakelock held" into jb-dev 
* commit 'b8da1c90c42ffb15b967915986ec2f59d40d3185':
  Always queue A2DP connection state message with wakelock held
 2012-06-06 13:37:54 -07:00
Michael Jurka
f330b53955 am a2c628fb: Merge "Fix bug 6499508" into jb-dev 
* commit 'a2c628fb402610ce65371fb06d5adaf7eaf9df9b':
  Fix bug 6499508
 2012-06-06 13:33:45 -07:00
Dianne Hackborn
82811d45ed am 533fce25: Merge "Docs (mostly): enumerate JELLY_BEAN target SDK changes." into jb-dev 
* commit '533fce25a22718c491a86c31866b7751f1f582b7':
  Docs (mostly): enumerate JELLY_BEAN target SDK changes.
 2012-06-06 13:33:43 -07:00
Jean-Michel Trivi
b8da1c90c4 am 88a89b29: Merge "Always queue A2DP connection state message with wakelock held" into jb-dev 
* commit '88a89b29112a41885c31ddd7195f5d26981d4d11':
  Always queue A2DP connection state message with wakelock held
 2012-06-06 13:33:41 -07:00
Michael Jurka
a2c628fb40 Merge "Fix bug 6499508" into jb-dev 2012-06-06 13:31:59 -07:00
Dianne Hackborn
533fce25a2 Merge "Docs (mostly): enumerate JELLY_BEAN target SDK changes." into jb-dev 2012-06-06 13:31:59 -07:00
Jean-Michel Trivi
88a89b2911 Merge "Always queue A2DP connection state message with wakelock held" into jb-dev 2012-06-06 13:31:53 -07:00
Daniel Sandler
9d9fb5e325 am 5926668f: am 622976ba: Merge "New background for notification panel header." into jb-dev 
* commit '5926668f2e7dc7f245db13b194e0595cd1c1d82d':
  New background for notification panel header.
 2012-06-06 13:03:55 -07:00
Daniel Sandler
5926668f2e am 622976ba: Merge "New background for notification panel header." into jb-dev 
* commit '622976ba775ed2b2cebe83ec1e60e1db6db89e2a':
  New background for notification panel header.
 2012-06-06 13:00:01 -07:00
Daniel Sandler
622976ba77 Merge "New background for notification panel header." into jb-dev 2012-06-06 12:58:35 -07:00
Eric Fischer
f59a02242a am 8e62634a: (-s ours) am 38987073: Merge "Import translations. DO NOT MERGE" into jb-dev 
* commit '8e62634acd0a0baa6390038565247f757ed99906':
  Import translations. DO NOT MERGE
 2012-06-06 12:44:07 -07:00
Eric Fischer
8e62634acd am 38987073: Merge "Import translations. DO NOT MERGE" into jb-dev 
* commit '38987073c1b1a993a727210f981601217d30b899':
  Import translations. DO NOT MERGE
 2012-06-06 12:40:11 -07:00
Eric Fischer
404de74c49 Merge "Import translations. DO NOT MERGE" 2012-06-06 12:39:39 -07:00
Eric Fischer
38987073c1 Merge "Import translations. DO NOT MERGE" into jb-dev 2012-06-06 12:37:51 -07:00
Eric Fischer
4328d8bb22 Import translations. DO NOT MERGE 
Change-Id: I531d75aff0713a0664110bf2c138305b30c84722
 2012-06-06 12:08:20 -07:00
Eric Fischer
6a6f746ece Import translations. DO NOT MERGE 
Change-Id: I5a8719c293a25460058ad5b62069ea80c33da110
 2012-06-06 12:02:00 -07:00
Dianne Hackborn
cdadee630e Fix some divide by zero errors that could crash the system. 
Change-Id: I66273df84e45de59b5b161f4d13de67a9e0f46d5
 2012-06-06 11:48:46 -07:00
Dianne Hackborn
636fd528f7 Docs (mostly): enumerate JELLY_BEAN target SDK changes. 
Okay this isn't entirely docs.  I have un-hidden the new permission
for binding to accessibility services; we were going to go out with
it hidden since it didn't go into factory ROM, but now that we are
doing other things we might as well expose it.

Also changed a log from E to W, since it is not an error.

Change-Id: I9226c95e3b63e12218fe41dc3f4290d9824a9e5c
 2012-06-06 11:36:49 -07:00
Jean-Michel Trivi
e12c39bb9c Always queue A2DP connection state message with wakelock held 
Messages for changes to A2DP connection state are intended to be
 queued in AudioService after acquiring a wake lock, which is
 released after the message has been handled.
This was correctly done for connection messages when the system
 is up and running, but wasn't when the BluetoothProfile service
 listener gets an onServiceConnected() event, which is the case
 the the device boots.
This change correctly uses the queueMsgUnderWakeLock() method
 whenever a MSG_SET_A2DP_CONNECTION_STATE is to be sent.

Bug 6616292

Change-Id: Ie337a4641a89c522e2d233bccaac4e08ce324117
 2012-06-06 11:33:48 -07:00
Svetoslav Ganov
5fccbbebdf am cf27a374: am 538252cd: Merge "Removing leftover code to sync accessibility and input focus." into jb-dev 
* commit 'cf27a3743941d9ccb1d20a294085819049fac028':
  Removing leftover code to sync accessibility and input focus.
 2012-06-06 11:02:13 -07:00
Svetoslav Ganov
cf27a37439 am 538252cd: Merge "Removing leftover code to sync accessibility and input focus." into jb-dev 
* commit '538252cd37945612a4761ff03d87022d56e33b96':
  Removing leftover code to sync accessibility and input focus.
 2012-06-06 10:57:50 -07:00
Svetoslav Ganov
538252cd37 Merge "Removing leftover code to sync accessibility and input focus." into jb-dev 2012-06-06 10:55:12 -07:00
Michael Jurka
d1a040c3e1 Fix bug 6499508 
Using a HashSet for the recycled views, instead of an ArrayList, to ensure items are not double-added
 2012-06-06 10:14:34 -07:00
Mangesh Ghiware
c1892e0c29 am f8e99204: am b215726a: Merge "Remove transient and unnecessary update density message." into jb-dev 
* commit 'f8e99204c901d1d05960ed9a11c6af4a4e7dccd8':
  Remove transient and unnecessary update density message.
 2012-06-06 08:41:28 -07:00
Mangesh Ghiware
f8e99204c9 am b215726a: Merge "Remove transient and unnecessary update density message." into jb-dev 
* commit 'b215726a0e46400c8dbc4a585c2f4200c7a619b6':
  Remove transient and unnecessary update density message.
 2012-06-06 08:35:52 -07:00
Mangesh Ghiware
b215726a0e Merge "Remove transient and unnecessary update density message." into jb-dev 2012-06-06 08:32:36 -07:00
Daniel Sandler
4bd3a127d2 New background for notification panel header. 
Bug: 6593364
Change-Id: Ifc0a9c17cbb413316d9a06d9b29cf4ca843c2103
 2012-06-06 10:47:09 -04:00
The Android Automerger
3c423121d9 merge in jb-release history after reset to jb-dev 2012-06-06 07:02:35 -07:00
Svetoslav Ganov
462a7284b5 Removing leftover code to sync accessibility and input focus. 
1. We have decided to let the accessibility services take care
   for syncing accessibility and input focus. Some apps may
   move input focus when a given view takes input focus which
   dragging accessibility focus can lead to a loop in the
   focus traversal. This change removes some leftover sync
   code.

bug:6616861

Change-Id: I57cb44e315a386d13596794d3767b559e9ee3d99
 2012-06-05 21:10:04 -07:00
Adam Powell
b85afc25d5 resolved conflicts for merge of 1178569b to master 
Change-Id: If2bb6ccaee99bcf199cd93f24eba217fe6ff485e
 2012-06-05 20:08:41 -07:00
Adam Powell
1178569b26 am f6452d0c: Merge "More fun with MediaRouter" into jb-dev 
* commit 'f6452d0cac64b72005af330411b5a895f0038312':
  More fun with MediaRouter
 2012-06-05 19:29:57 -07:00
Adam Powell
f6452d0cac Merge "More fun with MediaRouter" into jb-dev 2012-06-05 19:27:49 -07:00
Jeff Brown
1b60e72877 am eef4bc08: am 615fd3df: Merge "Implement new rotation policy." into jb-dev 
* commit 'eef4bc08137f2324e2974c282992ff546df99e54':
  Implement new rotation policy.
 2012-06-05 19:20:08 -07:00
Adam Powell
690ffb4e1f More fun with MediaRouter 
Add action provider, button, and styles. Extend ActionProvider to
allow for getting references to MenuItem instances.

Implement toggle mode for the MediaRouteButton/ActionProvider. Dialog
selection yet to come.

Change-Id: Ibe3188570f503bbf8dd00cf154663435656a7171
 2012-06-05 19:15:57 -07:00
Jeff Brown
eef4bc0813 am 615fd3df: Merge "Implement new rotation policy." into jb-dev 
* commit '615fd3dff2e369d8b786abcfe41b6da988e41001':
  Implement new rotation policy.
 2012-06-05 19:14:17 -07:00
Jeff Brown
615fd3dff2 Merge "Implement new rotation policy." into jb-dev 2012-06-05 19:11:13 -07:00
Fabrice Di Meglio
8dbf3b006d Remove dead code in Switch 
Change-Id: I91b47866be6f370feef67b1aa4df3aa0d09cc6fb
 2012-06-05 19:01:01 -07:00
Jean-Baptiste Queru
74a9652484 am f22eb963: am c9fe6568: am 9e22d9c5: Merge "Fix "Too many open files" error for aapt built with Mac OS X SDK 10.6." 
* commit 'f22eb96301aa1c4e0f7ac317daa64a617c21855c':
  Fix "Too many open files" error for aapt built with Mac OS X SDK 10.6.
 2012-06-05 18:52:44 -07:00
Jean-Baptiste Queru
f22eb96301 am c9fe6568: am 9e22d9c5: Merge "Fix "Too many open files" error for aapt built with Mac OS X SDK 10.6." 
* commit 'c9fe6568f3e7e4d9dc6da072afc929b9a81001ed':
  Fix "Too many open files" error for aapt built with Mac OS X SDK 10.6.
 2012-06-05 18:48:00 -07:00
Mangesh Ghiware
c7ad10201b Remove transient and unnecessary update density message. 
On a page load, the (viewport) metadata settings for the main frame are
reset. Reloading a page with viewport meta tag specifying target density
dpi will result in 2 back to back update zoom density messages to be
sent from WebViewCore to UI thread.

In setupViewport(), remove update density messages in flight. If the new
density is indeed different from WebView's default scale, queue another
message.

Bug: 6509512
Change-Id: I195e40277bf1bcccb0e61d84ed84db1e34556243
 2012-06-05 18:46:10 -07:00
Jean-Baptiste Queru
c9fe6568f3 am 9e22d9c5: Merge "Fix "Too many open files" error for aapt built with Mac OS X SDK 10.6." 
* commit '9e22d9c514457c4b163d03b9241e4e28b1698368':
  Fix "Too many open files" error for aapt built with Mac OS X SDK 10.6.
 2012-06-05 18:43:49 -07:00
Jean-Baptiste Queru
9e22d9c514 Merge "Fix "Too many open files" error for aapt built with Mac OS X SDK 10.6." 2012-06-05 18:31:02 -07:00
Dianne Hackborn
fb6c039bfb am 4835c17b: am 1e122850: Merge "Fix issue #6609383: java.lang.SecurityException: Requires..." into jb-dev 
* commit '4835c17b13c08693cf9a370df86d660818f8d391':
  Fix issue #6609383: java.lang.SecurityException: Requires...
 2012-06-05 18:09:36 -07:00