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

97839 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Glenn Kasten
d35d3687c7 Merge "Turn off execute bit for ordinary media files" 2012-12-17 12:12:40 -08:00
Scott Main
1c07ab3588 am 771e5a67: am 01ec5987: am da013c48: am f347e841: Merge "docs: remove developer survery link" into jb-mr1-dev 
* commit '771e5a67093884ff47900bc09db4fe165f0ec524':
  docs: remove developer survery link
 2012-12-17 11:52:08 -08:00
Scott Main
771e5a6709 am 01ec5987: am da013c48: am f347e841: Merge "docs: remove developer survery link" into jb-mr1-dev 
* commit '01ec5987d11be67f009a9d2eb3aabee95125090a':
  docs: remove developer survery link
 2012-12-17 11:49:00 -08:00
Scott Main
01ec5987d1 am da013c48: am f347e841: Merge "docs: remove developer survery link" into jb-mr1-dev 
* commit 'da013c48d74aae3c5723eb569ebb324a94db27f2':
  docs: remove developer survery link
 2012-12-17 11:47:10 -08:00
Scott Main
da013c48d7 am f347e841: Merge "docs: remove developer survery link" into jb-mr1-dev 
* commit 'f347e841178358b248b5b1abed059079d2ca1ebe':
  docs: remove developer survery link
 2012-12-17 11:44:49 -08:00
Scott Main
f347e84117 Merge "docs: remove developer survery link" into jb-mr1-dev 2012-12-17 11:42:04 -08:00
Christopher Tate
17697f234f am eea47240: am 4b0ed017: Merge "BackupHelpers: Fix Typo" 
* commit 'eea47240b085fa0260011423774506b5375b9351':
  BackupHelpers: Fix Typo
 2012-12-17 11:03:45 -08:00
Christopher Tate
eea47240b0 am 4b0ed017: Merge "BackupHelpers: Fix Typo" 
* commit '4b0ed0178de2c9c21bd5514671b8b4282f6a03db':
  BackupHelpers: Fix Typo
 2012-12-17 11:02:04 -08:00
Scott Main
ec558d520e docs: remove developer survery link 
Change-Id: I8f87e53df4f920ace7f8258c6cf0686ad4d8fead
 2012-12-17 10:52:40 -08:00
Sascha Prueter
ab989ac313 am 8149820c: am 25458528: am dd2ed93e: Merge "Handle "CODE_ALREADY_PRESENT" message from Settings app" into jb-mr1.1-dev 
* commit '8149820c2b2df47028498571785ca009d99b5dc9':
  Handle "CODE_ALREADY_PRESENT" message from Settings app
 2012-12-17 10:49:38 -08:00
Sascha Prueter
8149820c2b am 25458528: am dd2ed93e: Merge "Handle "CODE_ALREADY_PRESENT" message from Settings app" into jb-mr1.1-dev 
* commit '25458528f07ef9f4710e669b74b76d687bbc7645':
  Handle "CODE_ALREADY_PRESENT" message from Settings app
 2012-12-17 10:47:56 -08:00
Sascha Prueter
25458528f0 am dd2ed93e: Merge "Handle "CODE_ALREADY_PRESENT" message from Settings app" into jb-mr1.1-dev 
* commit 'dd2ed93e4794dd8472593cdd21fb7e0056f11dbf':
  Handle "CODE_ALREADY_PRESENT" message from Settings app
 2012-12-17 10:46:04 -08:00
Sascha Prueter
dd2ed93e47 Merge "Handle "CODE_ALREADY_PRESENT" message from Settings app" into jb-mr1.1-dev 2012-12-17 10:42:55 -08:00
Christopher Tate
4b0ed0178d Merge "BackupHelpers: Fix Typo" 2012-12-17 10:39:41 -08:00
Robert Ly
c1b8f78538 am 1d349dd4: am 5d2de143: am 4664782f: am f93a2941: Merge "docs: update gms auth docs for bug 7737187" into jb-mr1-dev 
* commit '1d349dd4ee6e65e005498806f28e721d6961b03a':
  docs: update gms auth docs for bug 7737187
 2012-12-17 10:34:19 -08:00
Robert Ly
1d349dd4ee am 5d2de143: am 4664782f: am f93a2941: Merge "docs: update gms auth docs for bug 7737187" into jb-mr1-dev 
* commit '5d2de143883381fb65b026b0975730970e6f33c7':
  docs: update gms auth docs for bug 7737187
 2012-12-17 10:31:45 -08:00
Robert Ly
5d2de14388 am 4664782f: am f93a2941: Merge "docs: update gms auth docs for bug 7737187" into jb-mr1-dev 
* commit '4664782f88ef1dad1b16a18d51947132d650afeb':
  docs: update gms auth docs for bug 7737187
 2012-12-17 10:30:00 -08:00
Robert Ly
4664782f88 am f93a2941: Merge "docs: update gms auth docs for bug 7737187" into jb-mr1-dev 
* commit 'f93a2941ad8ec72f288669da2426605ad85a98ca':
  docs: update gms auth docs for bug 7737187
 2012-12-17 10:28:01 -08:00
Robert Ly
f93a2941ad Merge "docs: update gms auth docs for bug 7737187" into jb-mr1-dev 2012-12-17 10:25:29 -08:00
Craig Mautner
1c967a1671 am 1e944479: am 367921dd: (-s ours) Merge "Toast: fix force close if called from system service" 
* commit '1e9444797d17add3fc4960239a5ed0bc61ce972d':
  Toast: fix force close if called from system service
 2012-12-17 09:50:28 -08:00
Craig Mautner
1e9444797d am 367921dd: (-s ours) Merge "Toast: fix force close if called from system service" 
* commit '367921dd879cbc041852b121ce35b3c12803d853':
  Toast: fix force close if called from system service
 2012-12-17 09:40:02 -08:00
Craig Mautner
367921dd87 Merge "Toast: fix force close if called from system service" 2012-12-17 09:05:07 -08:00
Mikhail Naganov
ba34779c3b Merge "Add new LayoutAlgorithm -- TEXT_AUTOSIZING" 2012-12-17 05:21:59 -08:00
Mikhail Naganov
94e0bd3b10 Add new LayoutAlgorithm -- TEXT_AUTOSIZING 
The algorithm will only be implemented in the new version of WebView.

BUG=6294649

Change-Id: I302b0b572236e57c0ce07946361e9e743321b6a8
 2012-12-17 11:37:30 +00:00
Pawit Pornkitprasan
35e4a7029e Toast: fix force close if called from system service 
If a toast is created from a system service, an application context
will not be available, use the service context instead.

Fixes
http://code.google.com/p/android/issues/detail?id=40058
http://code.google.com/p/android/issues/detail?id=40075

Change-Id: Ic643f4557fa04476819cd2c3ee640b735eeae429
 2012-12-17 18:04:17 +07:00
satok
6bad2f2fef Handle "CODE_ALREADY_PRESENT" message from Settings app 
Bug: 7725834
Change-Id: I85c35e73978d606edf9687e2de76c6ffc3c3ee2b
 2012-12-17 15:02:04 +09:00
You Kim
8b2e2c8abc BackupHelpers: Fix Typo 
delete --> free

Change-Id: Idbf7e677f8cc4a9a9d04e58b5cf7d0f1589c5211
 2012-12-17 03:36:10 +09:00
Elliott Hughes
a43e9b7c0e am 6647f1bd: am c749261f: Merge "Fix DateUtils.formatElapsedTime." 
* commit '6647f1bd2b3a615cf02111aab21eecdd76ce7c09':
  Fix DateUtils.formatElapsedTime.
 2012-12-15 15:10:42 -08:00
Marco Nelissen
f4c50a87cf am 50c78219: am 01f42639: Merge "fix typo in docs" 
* commit '50c782190d282b76b7d961cf7f9a9e3f0db735ad':
  fix typo in docs
 2012-12-15 15:10:38 -08:00
Elliott Hughes
53e621f2f3 am 898d8048: am 2eca1b53: Merge "Add return after NULL check in JetPlayer" 
* commit '898d8048b69124e919935903da97757ad2ebea4c':
  Add return after NULL check in JetPlayer
 2012-12-15 15:10:34 -08:00
Amith Yamasani
5d8961e756 am 507ea24b: am ffdc7aed: Merge "avoid crashing system serer process" 
* commit '507ea24b8f881f8af42393a0512c88cf7397edb9':
  avoid crashing system serer process
 2012-12-15 15:10:30 -08:00
Elliott Hughes
6647f1bd2b am c749261f: Merge "Fix DateUtils.formatElapsedTime." 
* commit 'c749261fea1010dfa2d1337bd210c81d13052540':
  Fix DateUtils.formatElapsedTime.
 2012-12-15 14:58:01 -08:00
Marco Nelissen
50c782190d am 01f42639: Merge "fix typo in docs" 
* commit '01f42639f21ec98feb5e5d458632a1a1005b17e8':
  fix typo in docs
 2012-12-15 14:57:51 -08:00
Elliott Hughes
898d8048b6 am 2eca1b53: Merge "Add return after NULL check in JetPlayer" 
* commit '2eca1b53ae905f5ddaebaff7156340efdf97cb84':
  Add return after NULL check in JetPlayer
 2012-12-15 14:57:46 -08:00
Amith Yamasani
507ea24b8f am ffdc7aed: Merge "avoid crashing system serer process" 
* commit 'ffdc7aed5ec8f38706ddfad02d3df05493351083':
  avoid crashing system serer process
 2012-12-15 14:57:40 -08:00
Svetoslav Ganov
7a3d56e121 Merge "Fixing the build" 2012-12-14 17:46:35 -08:00
Svetoslav Ganov
2ec5093e5a Fixing the build 
Change-Id: I01349d65ac5915da090cfb018f99e0a508f9d5ad
 2012-12-14 17:45:44 -08:00
Elliott Hughes
c749261fea Merge "Fix DateUtils.formatElapsedTime." 2012-12-14 17:39:19 -08:00
Svetoslav Ganov
2fd569a086 Merge "Simplification of the Pools implementation." 2012-12-14 17:25:33 -08:00
Svetoslav Ganov
0bf39c8073 Merge "Refactoring of the screen magnification feature." 2012-12-14 17:12:12 -08:00
Nick Kralevich
0bba28cce7 Merge "App home directories are now 0700 for targetSdkVersion > 17" 2012-12-14 17:11:00 -08:00
The Android Open Source Project
ed6b57fcff am 17a89072: (-s ours) Reconcile with jb-mr1.1-release - do not merge 
* commit '17a890729e430503c7a906073dbde570da34c377':
 2012-12-14 16:48:50 -08:00
Baligh Uddin
3a1dea0b95 am 3ffa3798: (-s ours) am 8a3eb664: am 435c0374: Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev 
* commit '3ffa3798786fc77a3b3fa905cd978688b827fead':
  Import translations. DO NOT MERGE
 2012-12-14 16:48:33 -08:00
Scott Main
4725b58e54 am 15434e7c: am a828b8ff: am 3b16e13c: am 3a494adf: Merge "docs: add cursorloader class to side nav" into jb-mr1-dev 
* commit '15434e7cccee95b2d63e61a2cd12a5e32dc757d7':
  docs: add cursorloader class to side nav
 2012-12-14 16:48:29 -08:00
Baligh Uddin
65fe00812e am 4e7ec514: (-s ours) am 0ec825ed: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 
* commit '4e7ec51472c531d582322bfde59073ab38336b41':
  Import translations. DO NOT MERGE
 2012-12-14 16:48:25 -08:00
Quddus Chong
6d430fd9ef am 13bc2d26: am cac633c7: am dc167dc6: am 9b7cb6f0: docs: Fixing broken IABv3 internal links 
* commit '13bc2d264c7f111d0515e4abf158f4fd6b31a646':
  docs: Fixing broken IABv3 internal links
 2012-12-14 16:48:21 -08:00
Svetoslav Ganov
545252f4fd Refactoring of the screen magnification feature. 
1. This patch takes care of the case where a magnified window is covering an unmagnigied
   one. One example is a dialog that covers the IME window.

bug:7634430

2. Ensuring that the UI automator tool can connect and correctly dump the screen.

bug:7694696

3. Removed the partial implementation for multi display magnification. It adds
   unnecessary complexity since it cannot be implemented without support for
   input from multiple screens. We will revisit when necessary.

4. Moved the magnified border window as a surface in the window manager.

5. Moved the mediator APIs on the window manager and the policy methods on the
   WindowManagerPolicy.

6. Implemented batch event processing for the accessibility input filter.

Change-Id: I4ebf68b94fb07201e124794f69611ece388ec116
 2012-12-14 16:27:27 -08:00
Irfan Sheriff
224333c03f Merge "P2p cleanup" 2012-12-14 16:07:46 -08:00
Irfan Sheriff
f118043ca7 P2p cleanup 
- Clean up handling of mSavedPeerConfig
- Add argument protection
- Split out WPS handling on GO into a separate API. This was almost hacky
right now for applications and was working in an undocumented way
- Refactor connect function call and fix updating group capability

Change-Id: I26211c72ad60c6b6c939ad7473fcf2fc633f3010
 2012-12-14 14:48:10 -08:00
Elliott Hughes
2eda18485c Fix DateUtils.formatElapsedTime. 
More reuse of StringBuilders, less broken home-grown formatting code.

Long-term, we should hand this over to icu4c, but they're not ready yet.

Bug: http://code.google.com/p/android/issues/detail?id=41401
Bug: 7736688
Change-Id: Ib3c1e1aad05827df646aa18645cce19dffb7551f
 2012-12-14 14:29:47 -08:00