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

121347 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Baligh Uddin
3c5fe29ed2 Import translations. DO NOT MERGE 
Change-Id: I8ece286ac0320cfbc03a0149fdb44675d425c062
Auto-generated-cl: translation import
 2013-12-18 16:01:23 -08:00
Scott Main
ffb96bf3b1 am 3bcdbd6b: am 6fda5415: am 709dca44: am fb214e6b: am 3032999b: Merge "Update to the Taking Photos Simply lesson (offshoot of the intent doc rewrite) clarifications about different external directories, information about required permissions, intent resolution techni 
* commit '3bcdbd6b2d96427d7cee835e9ed79aeed51de267':
  Update to the Taking Photos Simply lesson (offshoot of the intent doc rewrite) clarifications about different external directories, information about required permissions, intent resolution technique to match other docs, clarify section headings, plus other code clarification
 2013-12-18 18:29:37 +00:00
Scott Main
3bcdbd6b2d am 6fda5415: am 709dca44: am fb214e6b: am 3032999b: Merge "Update to the Taking Photos Simply lesson (offshoot of the intent doc rewrite) clarifications about different external directories, information about required permissions, intent resolution technique to match 
* commit '6fda5415e07564b2e8ff000db5635e31d1e6f357':
  Update to the Taking Photos Simply lesson (offshoot of the intent doc rewrite) clarifications about different external directories, information about required permissions, intent resolution technique to match other docs, clarify section headings, plus other code clarification
 2013-12-18 18:25:34 +00:00
Narayan Kamath
94ee2f502e am 52ba48a8: am f08b83be: am 4dd5c377: am be8fbb8f: Merge "Remove unused field from MediaMuxer" 
* commit '52ba48a85049a2a782c3e4c23d64577253f888eb':
  Remove unused field from MediaMuxer
 2013-12-18 18:25:33 +00:00
Scott Main
6fda5415e0 am 709dca44: am fb214e6b: am 3032999b: Merge "Update to the Taking Photos Simply lesson (offshoot of the intent doc rewrite) clarifications about different external directories, information about required permissions, intent resolution technique to match other docs, c 
* commit '709dca4474549772dccabc2f8cd214798f965a39':
  Update to the Taking Photos Simply lesson (offshoot of the intent doc rewrite) clarifications about different external directories, information about required permissions, intent resolution technique to match other docs, clarify section headings, plus other code clarification
 2013-12-18 18:22:05 +00:00
Narayan Kamath
52ba48a850 am f08b83be: am 4dd5c377: am be8fbb8f: Merge "Remove unused field from MediaMuxer" 
* commit 'f08b83beeef66b603dd3df1140e35f8e3f94d344':
  Remove unused field from MediaMuxer
 2013-12-18 18:20:42 +00:00
Narayan Kamath
f08b83beee am 4dd5c377: am be8fbb8f: Merge "Remove unused field from MediaMuxer" 
* commit '4dd5c37711f370af4c507eedd4c7d27ec35a2d64':
  Remove unused field from MediaMuxer
 2013-12-18 18:18:04 +00:00
Scott Main
709dca4474 am fb214e6b: am 3032999b: Merge "Update to the Taking Photos Simply lesson (offshoot of the intent doc rewrite) clarifications about different external directories, information about required permissions, intent resolution technique to match other docs, clarify sectio 
* commit 'fb214e6b108e84f7f55bee378c5c539a723b0569':
  Update to the Taking Photos Simply lesson (offshoot of the intent doc rewrite) clarifications about different external directories, information about required permissions, intent resolution technique to match other docs, clarify section headings, plus other code clarification
 2013-12-18 10:17:33 -08:00
Narayan Kamath
4dd5c37711 am be8fbb8f: Merge "Remove unused field from MediaMuxer" 
* commit 'be8fbb8fb63fddac2310dfbafa2594ed165b16b1':
  Remove unused field from MediaMuxer
 2013-12-18 10:14:45 -08:00
Scott Main
fb214e6b10 am 3032999b: Merge "Update to the Taking Photos Simply lesson (offshoot of the intent doc rewrite) clarifications about different external directories, information about required permissions, intent resolution technique to match other docs, clarify section headings, p 
* commit '3032999bf35cd6a0f1643faacf08370ab69d979c':
  Update to the Taking Photos Simply lesson (offshoot of the intent doc rewrite) clarifications about different external directories, information about required permissions, intent resolution technique to match other docs, clarify section headings, plus other code clarification
 2013-12-18 18:14:12 +00:00
Scott Main
3032999bf3 Merge "Update to the Taking Photos Simply lesson (offshoot of the intent doc rewrite) clarifications about different external directories, information about required permissions, intent resolution technique to match other docs, clarify section headings, plus other code clarification" into klp-docs 2013-12-18 18:11:50 +00:00
Narayan Kamath
be8fbb8fb6 Merge "Remove unused field from MediaMuxer" 2013-12-18 18:08:58 +00:00
Scott Main
326ed257b1 Update to the Taking Photos Simply lesson (offshoot of the intent doc rewrite) 
clarifications about different external directories,
information about required permissions,
intent resolution technique to match other docs,
clarify section headings, plus other code clarification

Change-Id: I62e3692a53bcd724676c74dc2c98eb72bcf58e1e
 2013-12-18 09:58:15 -08:00
Narayan Kamath
535daa191b Remove unused field from MediaMuxer 
Change-Id: If1ebb2302654b64924084a52425366f1b69c7c30
 2013-12-18 17:58:11 +00:00
Victoria Lease
868399cdf4 Merge "pass SkGlyphCache into updateGlyphCache()" 2013-12-18 15:25:24 +00:00
Narayan Kamath
65048bdce7 Remove data dirs if a new install fails dexopt. 
We'd otherwise leave the data dirs & native libraries
lying around. This will leave the app permanently broken
because the next install of the app will fail with
INSTALL_FAILED_UID_CHANGED.

Also remove an unnecessary instance variable.

Change-Id: I50e08623f646a89bc166bded6a43e17c17930e58
 2013-12-18 14:27:36 +00:00
Narayan Kamath
27dd94aaad resolved conflicts for merge of d1cec98e to master 
Empty merge of a non-skippable change. This file has
moved to a different git repository.

Change-Id: Ia36001f4f37593c5290cd321485d89ea97f5b606
 2013-12-18 13:10:58 +00:00
Narayan Kamath
d1cec98ec5 am 04d02d97: am 39d76302: am 3da645f3: Merge "Don\'t pseudolocalize untranslatable strings." 
* commit '04d02d9731e0a199d22ad1408cbca1d39bdc4c91':
  Don't pseudolocalize untranslatable strings.
 2013-12-18 13:05:44 +00:00
Narayan Kamath
04d02d9731 am 39d76302: am 3da645f3: Merge "Don\'t pseudolocalize untranslatable strings." 
* commit '39d7630234127327d71a773dd563067989da4211':
  Don't pseudolocalize untranslatable strings.
 2013-12-18 13:02:39 +00:00
Narayan Kamath
39d7630234 am 3da645f3: Merge "Don\'t pseudolocalize untranslatable strings." 
* commit '3da645f307695949623d78f280ce12e932eb057c':
  Don't pseudolocalize untranslatable strings.
 2013-12-18 05:00:02 -08:00
Narayan Kamath
3da645f307 Merge "Don't pseudolocalize untranslatable strings." 2013-12-18 12:46:41 +00:00
Alan Viverette
217694199f Merge "Correctly report isOpaque() from ImageView" 2013-12-18 02:53:20 +00:00
Alan Viverette
92f33b0754 Merge "Peek the fast scroll thumb when it transitions to enabled state" 2013-12-18 02:44:32 +00:00
Alan Viverette
63567e3829 Merge "Ensure transient state views are consistently temporarily detached" 2013-12-18 02:31:40 +00:00
Scott Main
418312f44c am 991ba3b7: am 74e9e698: am 7d1f8e65: am efe10233: am 5dcb75e6: Merge "fix typos bug: 11693951 bug: 12118617" into klp-docs 
* commit '991ba3b7f2d7164fab956b54c711d5ea523b2ba5':
  fix typos bug: 11693951 bug: 12118617
 2013-12-18 00:53:57 +00:00
Scott Main
991ba3b7f2 am 74e9e698: am 7d1f8e65: am efe10233: am 5dcb75e6: Merge "fix typos bug: 11693951 bug: 12118617" into klp-docs 
* commit '74e9e698260c16c41dab38de302db6e3e807ddd5':
  fix typos bug: 11693951 bug: 12118617
 2013-12-18 00:50:59 +00:00
Scott Main
74e9e69826 am 7d1f8e65: am efe10233: am 5dcb75e6: Merge "fix typos bug: 11693951 bug: 12118617" into klp-docs 
* commit '7d1f8e6570b8137dbe1e9007bb8496a0f6c3cb53':
  fix typos bug: 11693951 bug: 12118617
 2013-12-18 00:48:03 +00:00
Scott Main
7d1f8e6570 am efe10233: am 5dcb75e6: Merge "fix typos bug: 11693951 bug: 12118617" into klp-docs 
* commit 'efe102332861bd05f0cba60e729661607546de34':
  fix typos bug: 11693951 bug: 12118617
 2013-12-17 16:44:31 -08:00
Scott Main
efe1023328 am 5dcb75e6: Merge "fix typos bug: 11693951 bug: 12118617" into klp-docs 
* commit '5dcb75e67b7a3401aa501126bc8401f78c181a68':
  fix typos bug: 11693951 bug: 12118617
 2013-12-18 00:41:23 +00:00
Scott Main
5dcb75e67b Merge "fix typos bug: 11693951 bug: 12118617" into klp-docs 2013-12-18 00:38:30 +00:00
Chris Craik
1732f2639b Merge "Check mDisplayListData before deref" 2013-12-17 23:24:15 +00:00
Scott Main
1b3df0e9c8 am 84b8cbda: am 22591164: am 007ae376: am 8c95a149: am 5b50239c: fix sidenav links to use toroot variable 
* commit '84b8cbdafe1ed6b3d16291c6a0b7ec95ffcd076e':
  fix sidenav links to use toroot variable
 2013-12-17 23:15:06 +00:00
Scott Main
84b8cbdafe am 22591164: am 007ae376: am 8c95a149: am 5b50239c: fix sidenav links to use toroot variable 
* commit '2259116450f25ae75d8d142a2bf15f3d5db35bd6':
  fix sidenav links to use toroot variable
 2013-12-17 23:12:13 +00:00
Scott Main
2259116450 am 007ae376: am 8c95a149: am 5b50239c: fix sidenav links to use toroot variable 
* commit '007ae376d7672a456213e7f5475de4a910594cb2':
  fix sidenav links to use toroot variable
 2013-12-17 23:08:37 +00:00
Chris Craik
8b62cda493 Check mDisplayListData before deref 
bug:12191897
Change-Id: I72ed3801e72c657b9d7736b0efb33c5e7cfd5b57
 2013-12-17 15:07:47 -08:00
Scott Main
007ae376d7 am 8c95a149: am 5b50239c: fix sidenav links to use toroot variable 
* commit '8c95a149b516595e22fa7b6479d7bc02750531c2':
  fix sidenav links to use toroot variable
 2013-12-17 15:06:31 -08:00
Scott Main
8c95a149b5 am 5b50239c: fix sidenav links to use toroot variable 
* commit '5b50239c33176e0b321d2ee32a589e0583767e02':
  fix sidenav links to use toroot variable
 2013-12-17 23:03:49 +00:00
Scott Main
5b50239c33 fix sidenav links to use toroot variable 
Change-Id: I5f63979adbe13ea0d02bb8fedc1a7d29d79f307f
 2013-12-17 14:59:05 -08:00
Victoria Lease
2ee2d59b7d pass SkGlyphCache into updateGlyphCache() 
Doing so prevents us from double-locking the glyph cache, thereby
effectively locking ourselves out of reusing work that we'd just done.

Bug: 11968757
Change-Id: I5c552f2d0bbe30af2ce9054ba684e7da756a0d89
 2013-12-17 14:51:43 -08:00
Tim Murray
638fcf0df6 Merge "Move RenderScript from graphics/ to new fw/base subdirectory rs." 2013-12-17 22:14:29 +00:00
Scott Main
21d08fcb50 am 6652ef46: am dd55de3d: am 9767f9e2: am 7df86ef4: am 9e36f588: Merge "update storage doc for secondary external storage in KK and add some new sample code and remove documentation for APIs below level 8 and add information about permission changes in KK bug: 1190750 
* commit '6652ef463dd7976f522dac7fca5be06e11188cd4':
  update storage doc for secondary external storage in KK and add some new sample code and remove documentation for APIs below level 8 and add information about permission changes in KK bug: 11907502
 2013-12-17 22:10:05 +00:00
Scott Main
6652ef463d am dd55de3d: am 9767f9e2: am 7df86ef4: am 9e36f588: Merge "update storage doc for secondary external storage in KK and add some new sample code and remove documentation for APIs below level 8 and add information about permission changes in KK bug: 11907502" into klp-d 
* commit 'dd55de3ddc7d9e7d2782a409560cb3eda30ba05b':
  update storage doc for secondary external storage in KK and add some new sample code and remove documentation for APIs below level 8 and add information about permission changes in KK bug: 11907502
 2013-12-17 22:06:38 +00:00
Scott Main
dd55de3ddc am 9767f9e2: am 7df86ef4: am 9e36f588: Merge "update storage doc for secondary external storage in KK and add some new sample code and remove documentation for APIs below level 8 and add information about permission changes in KK bug: 11907502" into klp-docs 
* commit '9767f9e2120609ada992e558ba16608aafa96811':
  update storage doc for secondary external storage in KK and add some new sample code and remove documentation for APIs below level 8 and add information about permission changes in KK bug: 11907502
 2013-12-17 22:03:16 +00:00
Scott Main
9767f9e212 am 7df86ef4: am 9e36f588: Merge "update storage doc for secondary external storage in KK and add some new sample code and remove documentation for APIs below level 8 and add information about permission changes in KK bug: 11907502" into klp-docs 
* commit '7df86ef441835aedf24477f61e12cf78c5a86244':
  update storage doc for secondary external storage in KK and add some new sample code and remove documentation for APIs below level 8 and add information about permission changes in KK bug: 11907502
 2013-12-17 14:00:45 -08:00
Scott Main
7df86ef441 am 9e36f588: Merge "update storage doc for secondary external storage in KK and add some new sample code and remove documentation for APIs below level 8 and add information about permission changes in KK bug: 11907502" into klp-docs 
* commit '9e36f588993e02210f02d9b7c0600a842d67bbdb':
  update storage doc for secondary external storage in KK and add some new sample code and remove documentation for APIs below level 8 and add information about permission changes in KK bug: 11907502
 2013-12-17 21:57:46 +00:00
Dirk Dougherty
7f8f315c1d am fe4a997b: am bfc22ba2: am 4ffa6a4a: am d994602f: am 731ba045: Merge "Doc change: update list of tablets supported in Google Play for Education." into klp-docs 
* commit 'fe4a997be76e70952566f301577393e7339c7199':
  Doc change: update list of tablets supported in Google Play for Education.
 2013-12-17 21:55:36 +00:00
Scott Main
688342f98c fix typos 
bug: 11693951
bug: 12118617

Change-Id: I7a3ab4c6d7bc124ff9ed8779700e77c87409569d
 2013-12-17 13:55:02 -08:00
Scott Main
9e36f58899 Merge "update storage doc for secondary external storage in KK and add some new sample code and remove documentation for APIs below level 8 and add information about permission changes in KK bug: 11907502" into klp-docs 2013-12-17 21:54:48 +00:00
Dirk Dougherty
fe4a997be7 am bfc22ba2: am 4ffa6a4a: am d994602f: am 731ba045: Merge "Doc change: update list of tablets supported in Google Play for Education." into klp-docs 
* commit 'bfc22ba251ae5eba7ce68d5a8281042519c187a0':
  Doc change: update list of tablets supported in Google Play for Education.
 2013-12-17 21:53:09 +00:00
Dirk Dougherty
bfc22ba251 am 4ffa6a4a: am d994602f: am 731ba045: Merge "Doc change: update list of tablets supported in Google Play for Education." into klp-docs 
* commit '4ffa6a4ae930f724d2e16e85110892db9bb6280e':
  Doc change: update list of tablets supported in Google Play for Education.
 2013-12-17 21:50:46 +00:00