Winson Chung
1a97602f14
am 744d25e0: am 669eef66: Merge "Adding mouse wheel support. (Bug 17323718)" into lmp-mr1-dev
...
* commit '744d25e0e3b75c8beba6f9a8e94d949b8f21d922':
Adding mouse wheel support. (Bug 17323718)
2014-10-15 02:07:28 +00:00
Selim Cinek
9f6c886717
am 4c8ce9f2: am 8da1ef2f: am 351ec77b: am cedb6dc7: Merge "Fixed a bug when double tapping a notification in the normal shade" into lmp-dev
...
* commit '4c8ce9f22db9900594844e4e1206865c601f77d1':
Fixed a bug when double tapping a notification in the normal shade
2014-10-15 02:07:21 +00:00
Ricardo Cervera-Navarro
8b58a391a1
am 96400c7f: am 8df05a58: 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 '96400c7f93827a78468d2b2f7f22833ae3353152':
Revert "docs: Watermarked images for codes that weren't found."
2014-10-15 02:07:14 +00:00
Jeff Hao
c2b90f06d4
am 8225e091: am 59ba1132: am 1201d2a0: am dbfbb175: Backport of ordering apps for boot dexopt.
...
* commit '8225e0915534c2c347bf2deeec0f903714ed2c04':
Backport of ordering apps for boot dexopt.
2014-10-15 02:07:09 +00:00
Svetoslav
4e3b2426ac
am a23ad0b7: am 0c8e15c0: am 60cdb909: am 0a1ffdb3: Merge "Handle if the printing app is killed while saving to PDF." into lmp-dev
...
* commit 'a23ad0b7dd159e7fb0e8c2ff6b86683c7da6225e':
Handle if the printing app is killed while saving to PDF.
2014-10-15 02:07:02 +00:00
Filip Gruszczynski
6a0cebca80
am e5a8dd22: am 3d5ecf13: am 129f1946: Merge "Prevent index out of bounds when using String.substring." into lmp-sprout-dev
...
* commit 'e5a8dd222ab31d63c4f38fd87f909264f024530d':
Prevent index out of bounds when using String.substring.
2014-10-15 02:04:13 +00:00
Amith Yamasani
d060a29e52
am 6c0659e0: am 20791338: am 4bf0356e: am 15a5f82f: Merge "Hide DISALLOW_OUTGOING_BEAM API" into lmp-dev
...
* commit '6c0659e0eba77972f1ba8a2ad2a51ea7b2c76b9a':
Hide DISALLOW_OUTGOING_BEAM API
2014-10-15 02:04:06 +00:00
Dianne Hackborn
133c747e10
am 3c5a70e0: am f23b29ad: am a861a9d7: am 35de0e28: Merge "Fix issue #10034864 : Define YouTube application as the preferred..." into lmp-dev
...
* commit '3c5a70e0314cd21d42eda406ed2239303b07e6e1':
Fix issue #10034864 : Define YouTube application as the preferred...
2014-10-15 02:03:59 +00:00
Filip Gruszczynski
38afe56204
am f16d2264: am 31278350: am 72f6e8ce: Merge "Log wallpaper crashes." into lmp-sprout-dev
...
* commit 'f16d226460cbe0800d8c3b614121cd8c09bdc9cb':
Log wallpaper crashes.
2014-10-15 02:03:51 +00:00
Rich Slogar
d1baa50d4f
am cdfa492e: am b42cd383: am 389e4ccd: am a89ac60e: am 858cfad9: am a3287768: Merge "docs:SDK tools 23.0.5 Release Note" into klp-modular-docs
...
* commit 'cdfa492e2420d97177f32a77e177bb7ba0c5ebb3':
docs:SDK tools 23.0.5 Release Note
2014-10-15 02:03:44 +00:00
Nick Kralevich
a26487cb28
am 55bb6a7b: am 01edf579: am fce896fe: am 0ae82b05: resolved conflicts for merge of a4eb81b6 to lmp-dev
...
* commit '55bb6a7b68595ee83b543eda40d191636de1831e':
Docs: adding closing bracket to un-break javadoc tokens.
2014-10-15 02:03:37 +00:00
Winson Chung
744d25e0e3
am 669eef66: Merge "Adding mouse wheel support. (Bug 17323718)" into lmp-mr1-dev
...
* commit '669eef661de138fa674e69f9b840570300f9bd5d':
Adding mouse wheel support. (Bug 17323718)
2014-10-14 23:11:41 +00:00
Selim Cinek
4c8ce9f22d
am 8da1ef2f: am 351ec77b: am cedb6dc7: Merge "Fixed a bug when double tapping a notification in the normal shade" into lmp-dev
...
* commit '8da1ef2f5f2b557eb15b245f8e8bb5bc3c821f39':
Fixed a bug when double tapping a notification in the normal shade
2014-10-14 23:11:34 +00:00
Ricardo Cervera-Navarro
96400c7f93
am 8df05a58: 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 '8df05a5892ec7a8fe3777a167b9465b86994d53c':
Revert "docs: Watermarked images for codes that weren't found."
2014-10-14 23:11:30 +00:00
Jeff Hao
8225e09155
am 59ba1132: am 1201d2a0: am dbfbb175: Backport of ordering apps for boot dexopt.
...
* commit '59ba1132412d833b1807f53ba419a4d633ae18fb':
Backport of ordering apps for boot dexopt.
2014-10-14 23:11:25 +00:00
Svetoslav
a23ad0b7dd
am 0c8e15c0: am 60cdb909: am 0a1ffdb3: Merge "Handle if the printing app is killed while saving to PDF." into lmp-dev
...
* commit '0c8e15c016efa64cc8db6a1f1fbcade34543cf3f':
Handle if the printing app is killed while saving to PDF.
2014-10-14 23:11:11 +00:00
Filip Gruszczynski
e5a8dd222a
am 3d5ecf13: am 129f1946: Merge "Prevent index out of bounds when using String.substring." into lmp-sprout-dev
...
* commit '3d5ecf13e01da262b95ff78486297af3a0601d0c':
Prevent index out of bounds when using String.substring.
2014-10-14 23:03:07 +00:00
Amith Yamasani
6c0659e0eb
am 20791338: am 4bf0356e: am 15a5f82f: Merge "Hide DISALLOW_OUTGOING_BEAM API" into lmp-dev
...
* commit '207913387111b148f84a956ff968200512c5fb78':
Hide DISALLOW_OUTGOING_BEAM API
2014-10-14 23:03:02 +00:00
Dianne Hackborn
3c5a70e031
am f23b29ad: am a861a9d7: am 35de0e28: Merge "Fix issue #10034864 : Define YouTube application as the preferred..." into lmp-dev
...
* commit 'f23b29ad5a730c7b26d9f96c764dc4e0d96fdd16':
Fix issue #10034864 : Define YouTube application as the preferred...
2014-10-14 23:02:41 +00:00
Filip Gruszczynski
f16d226460
am 31278350: am 72f6e8ce: Merge "Log wallpaper crashes." into lmp-sprout-dev
...
* commit '31278350b9fe72f00030f43108868b563948ca73':
Log wallpaper crashes.
2014-10-14 23:02:36 +00:00
Rich Slogar
cdfa492e24
am b42cd383: am 389e4ccd: am a89ac60e: am 858cfad9: am a3287768: Merge "docs:SDK tools 23.0.5 Release Note" into klp-modular-docs
...
* commit 'b42cd3831bee6023689cd4a5eff05e7a935786f8':
docs:SDK tools 23.0.5 Release Note
2014-10-14 23:02:11 +00:00
Nick Kralevich
55bb6a7b68
am 01edf579: am fce896fe: am 0ae82b05: resolved conflicts for merge of a4eb81b6 to lmp-dev
...
* commit '01edf5791cfd63513049c49a673176b0f0809dc1':
Docs: adding closing bracket to un-break javadoc tokens.
2014-10-14 23:02:06 +00:00
Winson Chung
669eef661d
Merge "Adding mouse wheel support. (Bug 17323718)" into lmp-mr1-dev
2014-10-14 22:47:13 +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
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
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
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