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

167616 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jason Monk
f97e71a6dd Merge "Update screen pinning and recents strings to say Overview" into lmp-dev 2014-10-14 22:42:55 +00:00
Selim Cinek
8da1ef2f5f am 351ec77b: am cedb6dc7: Merge "Fixed a bug when double tapping a notification in the normal shade" into lmp-dev 
* commit '351ec77ba5685e8bad16df87284d9d3aaac159a1':
  Fixed a bug when double tapping a notification in the normal shade
 2014-10-14 22:37:21 +00:00
Ricardo Cervera-Navarro
8df05a5892 am ac293d16: am a4f9c087: am c93723bd: am 7668aa27: am aa7bcf14: Merge "Revert "docs: Watermarked images for codes that weren\'t found."" into klp-docs 
* commit 'ac293d16b750e300da44f543ca6bd5b8d01e2b08':
  Revert "docs: Watermarked images for codes that weren't found."
 2014-10-14 22:37:16 +00:00
Jeff Hao
59ba113241 am 1201d2a0: am dbfbb175: Backport of ordering apps for boot dexopt. 
* commit '1201d2a018c85e9c5092e670b334cc4ed4ebcaef':
  Backport of ordering apps for boot dexopt.
 2014-10-14 22:37:03 +00:00
Selim Cinek
351ec77ba5 am cedb6dc7: Merge "Fixed a bug when double tapping a notification in the normal shade" into lmp-dev 
* commit 'cedb6dc7f2e19120d6889bc681d143bfb2891b80':
  Fixed a bug when double tapping a notification in the normal shade
 2014-10-14 22:31:27 +00:00
Ricardo Cervera-Navarro
ac293d16b7 am a4f9c087: am c93723bd: am 7668aa27: am aa7bcf14: Merge "Revert "docs: Watermarked images for codes that weren\'t found."" into klp-docs 
* commit 'a4f9c0873f1d414d6721989f44d88de9a1f6d01a':
  Revert "docs: Watermarked images for codes that weren't found."
 2014-10-14 22:31:21 +00:00
Jeff Hao
1201d2a018 am dbfbb175: Backport of ordering apps for boot dexopt. 
* commit 'dbfbb17512fe6a5b3c7198d60b6a149969174a71':
  Backport of ordering apps for boot dexopt.
 2014-10-14 22:31:16 +00:00
Selim Cinek
cedb6dc7f2 Merge "Fixed a bug when double tapping a notification in the normal shade" into lmp-dev 2014-10-14 22:28:25 +00:00
Ricardo Cervera-Navarro
a4f9c0873f am c93723bd: am 7668aa27: am aa7bcf14: Merge "Revert "docs: Watermarked images for codes that weren\'t found."" into klp-docs 
* commit 'c93723bdf9b2ce4dc0426817b8bec924d9f97a79':
  Revert "docs: Watermarked images for codes that weren't found."
 2014-10-14 22:27:21 +00:00
Svetoslav
0c8e15c016 am 60cdb909: am 0a1ffdb3: Merge "Handle if the printing app is killed while saving to PDF." into lmp-dev 
* commit '60cdb909304f0d4b93a1a17228bdcc888f16cf41':
  Handle if the printing app is killed while saving to PDF.
 2014-10-14 22:21:45 +00:00
Ricardo Cervera-Navarro
c93723bdf9 am 7668aa27: am aa7bcf14: Merge "Revert "docs: Watermarked images for codes that weren\'t found."" into klp-docs 
* commit '7668aa27999e5650fe8776853565f792311fb57d':
  Revert "docs: Watermarked images for codes that weren't found."
 2014-10-14 22:20:02 +00:00
Svetoslav
60cdb90930 am 0a1ffdb3: Merge "Handle if the printing app is killed while saving to PDF." into lmp-dev 
* commit '0a1ffdb3f89705eeeb89349fcd31c82b2d15b0a5':
  Handle if the printing app is killed while saving to PDF.
 2014-10-14 22:15:26 +00:00
Ricardo Cervera-Navarro
7668aa2799 am aa7bcf14: Merge "Revert "docs: Watermarked images for codes that weren\'t found."" into klp-docs 
* commit 'aa7bcf140d95049f1482c896b770de7ba339f7c9':
  Revert "docs: Watermarked images for codes that weren't found."
 2014-10-14 22:14:16 +00:00
Filip Gruszczynski
3d5ecf13e0 am 129f1946: Merge "Prevent index out of bounds when using String.substring." into lmp-sprout-dev 
* commit '129f1946a1bc32ac519334283538c9e24588e998':
  Prevent index out of bounds when using String.substring.
 2014-10-14 22:04:05 +00:00
Amith Yamasani
2079133871 am 4bf0356e: am 15a5f82f: Merge "Hide DISALLOW_OUTGOING_BEAM API" into lmp-dev 
* commit '4bf0356ee2058c7f033a41e02fa3eb86909c450c':
  Hide DISALLOW_OUTGOING_BEAM API
 2014-10-14 22:04:01 +00:00
Jeff Hao
dbfbb17512 Backport of ordering apps for boot dexopt. 
This is a squashed commit of the following changes:

1. Order apps by priority when performing boot dexopt.
   (cherry picked from commit 65cde7d42d741c7d9aa2714a397b7333f688ab55)

2. Improve priority ordering of apps when performing boot dexopt.
   Added core apps and updated system apps.
   (cherry picked from commit 272bf3a274daff62995caf05da338c1f2a73dae3)

3. Stop boot dexopt when low on memory.
   (cherry picked from commit 1d892dcb6b0ff3a50cc63e387667dc29baf1014f)

Bug: 17641843
Change-Id: Ie32f1c21047d3462aaf728f7633fecf647ba2b47
 2014-10-14 15:02:37 -07:00
Ricardo Cervera-Navarro
aa7bcf140d Merge "Revert "docs: Watermarked images for codes that weren't found."" into klp-docs 2014-10-14 21:59:48 +00:00
Svetoslav
0a1ffdb3f8 Merge "Handle if the printing app is killed while saving to PDF." into lmp-dev 2014-10-14 21:56:31 +00:00
Tom Taylor
790ac852b3 Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager 
Bug 17969135 

Use query (instead of rawQuery) and pass in arguments instead of building
the query with a giant string. Add a unit test that fails with the old
code but passes with the new code.

Change-Id: Id04a1db6fb95fcd923e1f36f5ab3b94402590918
 2014-10-14 21:45:22 +00:00
Svetoslav
05e041b013 Handle if the printing app is killed while saving to PDF. 
When saving to PDF we bring up the file picker UI which covers
the print UI. In this case the printing app may get killed as
it is not in the forground (the system is bound to the print
spooler so it cannot get killed). If that happens we are ending
up with an empty file. However, if the file chooser UI is up
we already have everything from the app we need and it dying
does not matter. This change takes care if ignoring printing
app death while saving to PDF.

bug:17922948

Change-Id: I10d808e3c3e93e850dbc2a948f2482381a887928
 2014-10-14 14:16:12 -07:00
Alan Viverette
17cd4dfe3a Update preload list, clean up drawable theming 
Removes all implementations of three-arg ConstantState constructor, since
we handle mutation and applyTheme() in Resources now. Moves progress bar
tinting to android:tint attribute. Correctly implements applyTheme() and
canApplyTheme() in all drawable wrapper and container classes.

Change-Id: Ic9cb43d0d6228aa4914f3124bed234b837beaa41
 2014-10-14 14:07:21 -07:00
Filip Gruszczynski
129f1946a1 Merge "Prevent index out of bounds when using String.substring." into lmp-sprout-dev 2014-10-14 20:59:58 +00:00
Dianne Hackborn
f23b29ad5a am a861a9d7: am 35de0e28: Merge "Fix issue #10034864: Define YouTube application as the preferred..." into lmp-dev 
* commit 'a861a9d713c99b576c0e7284a65d50838c4f953a':
  Fix issue #10034864: Define YouTube application as the preferred...
 2014-10-14 19:58:39 +00:00
Filip Gruszczynski
31278350b9 am 72f6e8ce: Merge "Log wallpaper crashes." into lmp-sprout-dev 
* commit '72f6e8ce81e847eb0d2eeac02ef7c4ce48ed5002':
  Log wallpaper crashes.
 2014-10-14 19:58:15 +00:00
Rich Slogar
b42cd3831b am 389e4ccd: am a89ac60e: am 858cfad9: am a3287768: Merge "docs:SDK tools 23.0.5 Release Note" into klp-modular-docs 
* commit '389e4ccd3674215ede6cf329eac9ca6b70915be5':
  docs:SDK tools 23.0.5 Release Note
 2014-10-14 19:57:54 +00:00
Nick Kralevich
01edf5791c am fce896fe: am 0ae82b05: resolved conflicts for merge of a4eb81b6 to lmp-dev 
* commit 'fce896feaf9c26bdc3806a48ec01e6e077c5c975':
  Docs: adding closing bracket to un-break javadoc tokens.
 2014-10-14 19:57:50 +00:00
Amith Yamasani
4bf0356ee2 am 15a5f82f: Merge "Hide DISALLOW_OUTGOING_BEAM API" into lmp-dev 
* commit '15a5f82f9b6b389614b1df78749bd627d97d5417':
  Hide DISALLOW_OUTGOING_BEAM API
 2014-10-14 19:57:46 +00:00
Yorke Lee
183cf5b825 am 3299c571: am 50a0e305: am 8c63f98b: Merge "Allow home to be pressed while in incoming call screen" into lmp-mr1-dev 
* commit '3299c571118180fb6c20de53bf2b366453ccf493':
  Allow home to be pressed while in incoming call screen
 2014-10-14 19:51:53 +00:00
Amith Yamasani
15a5f82f9b Merge "Hide DISALLOW_OUTGOING_BEAM API" into lmp-dev 2014-10-14 19:51:15 +00:00
Yorke Lee
3299c57111 am 50a0e305: am 8c63f98b: Merge "Allow home to be pressed while in incoming call screen" into lmp-mr1-dev 
* commit '50a0e30525b1d67b5e9a9cb686ffb4d2dd729672':
  Allow home to be pressed while in incoming call screen
 2014-10-14 19:44:05 +00:00
Yorke Lee
50a0e30525 am 8c63f98b: Merge "Allow home to be pressed while in incoming call screen" into lmp-mr1-dev 
* commit '8c63f98be5c35e0136eebbf4b5890de535fbfdf5':
  Allow home to be pressed while in incoming call screen
 2014-10-14 19:39:31 +00:00
Filip Gruszczynski
5a589430b3 Prevent index out of bounds when using String.substring. 
Change-Id: Ib30f9646e9895b6a2f065a0b2e51cf53e821b087
 2014-10-14 12:36:52 -07:00
Yorke Lee
8c63f98be5 Merge "Allow home to be pressed while in incoming call screen" into lmp-mr1-dev 2014-10-14 19:35:23 +00:00
Dianne Hackborn
a861a9d713 am 35de0e28: Merge "Fix issue #10034864: Define YouTube application as the preferred..." into lmp-dev 
* commit '35de0e2872b64f78b596a850d6da2c483ba65bb5':
  Fix issue #10034864: Define YouTube application as the preferred...
 2014-10-14 19:21:18 +00:00
Dianne Hackborn
35de0e2872 Merge "Fix issue #10034864: Define YouTube application as the preferred..." into lmp-dev 2014-10-14 19:16:22 +00:00
Jason Monk
cdc459feb2 Update screen pinning and recents strings to say Overview 
Bug: 17969466
Bug: 17970142
Change-Id: I76cd934ea6d67f36609fdc53ca1d195fcb7dcfbe
 2014-10-14 15:10:10 -04:00
Dmitriy Ivanov
1577f08b48 am 26d75a9e: am d1e735ef: am ed583f5e: Merge "Link sigchain to main executable" 
* commit '26d75a9e0086dee2f2e59ede4e502ad93ca3068c':
  Link sigchain to main executable
 2014-10-14 19:05:31 +00:00
Jeff Hao
3a3848f15a am 838018b2: am b5c5354f: am 63360780: Merge "Stop boot dexopt when low on memory." into lmp-mr1-dev 
* commit '838018b2536d66455edf65ec263c5b99e7744a46':
  Stop boot dexopt when low on memory.
 2014-10-14 19:04:43 +00:00
John Spurlock
c23059bedf am 9766d5b2: am 23e47ce6: am bec0c53a: Merge "Make SeekBarVolumizer restartable." into lmp-mr1-dev 
* commit '9766d5b236394dbc988619a4e0236621add3c6b6':
  Make SeekBarVolumizer restartable.
 2014-10-14 19:04:38 +00:00
John Reck
cc1b97965d am 1467c54d: am f3259620: am 94c40fe9: CARD LAND! 
* commit '1467c54d857fbfc03fb52b9ba95db72c6acbae32':
  CARD LAND!
 2014-10-14 19:04:29 +00:00
Nicolas Prevot
684bbd8668 am e5a75d13: am 20ec9b79: am d8a21bbe: Merge "Not using resource ids for EXTRA_INITIAL_INTENTS inside a managed profile." into lmp-mr1-dev 
* commit 'e5a75d1333b92c23cf243af80e62de06a0f9c892':
  Not using resource ids for EXTRA_INITIAL_INTENTS inside a managed profile.
 2014-10-14 19:04:25 +00:00
Jinsuk Kim
f152525db9 am 584b564d: am 20bc8c19: am 93eed0c0: CEC: Use hotplug event for MHL device registry 
* commit '584b564df00475966127801a8c8d6560428ac97f':
  CEC: Use hotplug event for MHL device registry
 2014-10-14 19:04:18 +00:00
Geoff Mendal
a4bbf72648 am 97ddc849: (-s ours) am 7238e84c: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 
* commit '97ddc849248e2df7b0b592aa170450158d818b7f':
  Import translations. DO NOT MERGE
 2014-10-14 19:04:14 +00:00
Alan Viverette
a0d48e1cd7 am 882d5cd0: am d9a2b99d: am 42e96769: Merge "Add support for tint and tintMode to GradientDrawable" into lmp-mr1-dev 
* commit '882d5cd051b2081e27f97dcf35a695737e00b434':
  Add support for tint and tintMode to GradientDrawable
 2014-10-14 19:04:10 +00:00
Alan Viverette
42d7f6c17e am b50d1586: am db8ecf80: am 788e30bd: Merge "Revert "Always project ripples"" into lmp-mr1-dev 
* commit 'b50d1586053d16f31faa989a0643e809353a04ee':
  Revert "Always project ripples"
 2014-10-14 19:04:00 +00:00
Fabrice Di Meglio
374b30f214 am 11dd7cab: am a99cad8d: am 5dac2a22: Merge "Fix bug #17900580 Top bar drop shadow no longer transparent" into lmp-mr1-dev 
* commit '11dd7cab3b1d6bb3d869732653fcb350b05e063e':
  Fix bug #17900580 Top bar drop shadow no longer transparent
 2014-10-14 19:03:53 +00:00
Geoff Mendal
d74f1db748 am f233cce9: (-s ours) am cd38106a: (-s ours) am d112c2a3: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit 'f233cce91dd9494df424f8e3caf22e709117b9dc':
  Import translations. DO NOT MERGE
 2014-10-14 19:03:49 +00:00
Wei Wang
4460079faa am ce285c8a: am 1602b0f8: am 3f0aa505: am 34020eb6: Merge "Add support of advertising through standard instance.(1/4)" into lmp-sprout-dev 
* commit 'ce285c8afbc3c26cf15632e442f658a5d2fb76ff':
  Add support of advertising through standard instance.(1/4)
 2014-10-14 19:03:45 +00:00
Winson Chung
606b3da71a Removing unused/dead code related to footer and screenshot transition. 
Change-Id: I205de9047413d1ff2da68cdd062eeba59267b10f
 2014-10-14 11:32:51 -07:00
Winson Chung
d213a1e53c Adding mouse wheel support. (Bug 17323718) 
Change-Id: I51bf159369983789933767813bbf8a785ff1bda3
 2014-10-14 11:31:05 -07:00