Joe Fernandez
a78664e030
am 411c779b: am c919f7cf: am 1092bafa: Merge "docs: studio tips and ticks grammmar typo" into lmp-docs
...
* commit '411c779bb746d81278b7646ffd96fa6e4f8336b9':
docs: studio tips and ticks grammmar typo
2015-01-06 02:00:53 +00:00
Ricardo Cervera
ac4444a26f
am c5fae959: am 48a066db: am 60cfb01a: Merge "docs: Update wearable lists docs" into lmp-docs
...
* commit 'c5fae9593553a89db2ad49306b46b8f9a3631489':
docs: Update wearable lists docs
2015-01-06 02:00:48 +00:00
Joe Fernandez
b1062ad68e
am c3fb32ab: am 4603c122: am 18a75595: Merge "docs: studio device emulator updates" into lmp-docs
...
* commit 'c3fb32ab3989806f49cdd21ca58a044daf74f060':
docs: studio device emulator updates
2015-01-06 02:00:42 +00:00
Sarah Maddox
15e94fdf34
am 4811f9b8: am ecf0ac29: am ca23a587: Merge "docs: Updates the request-location-updates lesson in the location APIs training course." into lmp-docs
...
* commit '4811f9b84766adc17efb730160e15785d74875a3':
docs: Updates the request-location-updates lesson in the location APIs training course.
2015-01-06 02:00:32 +00:00
Ricardo Cervera
fcba64722b
am 9719336b: am 4ef7873d: am 8e631d2d: Merge "docs: Adding vector drawables video" into lmp-docs
...
* commit '9719336b3a9a059c31200137a93f74445d3c7185':
docs: Adding vector drawables video
2015-01-06 02:00:24 +00:00
Joe Fernandez
f3d9f03053
am adaef486: am e78489b4: am e22b42b3: Merge "docs: plugin reference update" into lmp-docs
...
* commit 'adaef486464af836cd3408657634c972419e4c80':
docs: plugin reference update
2015-01-06 02:00:14 +00:00
Scott Rowe
7515d188dd
docs: Checklist for TV Apps
...
Change-Id: I93b57161b3e519164dab551068411f686d772596
2015-01-05 17:50:59 -08:00
Christopher Tate
603ad6f7d0
Remove the "backup_data_changed" event log
...
Nowadays it's just spammy and uninformative, so away it goes.
Bug 18833115
Change-Id: Ic373c596d7a892c4fedc0343e2c03dc1c295225e
2015-01-05 17:07:57 -08:00
Alan Viverette
ccfd34f6b5
Merge "Scroll handle was half as opaque as it was supposed to be" into lmp-mr1-dev
2015-01-06 00:49:09 +00:00
Shishir Agrawal
8955c54e0e
Merge "Data quick settings - Usage shown should take into account merged IDs." into lmp-mr1-dev
2015-01-06 00:37:07 +00:00
Rich Slogar
626128b1db
docs: studio bundle checksum update
...
Change-Id: I3307009db1be1c4d6f01d158d577a6c373b316bf
2015-01-05 16:23:55 -08:00
Sungsoo Lim
2bdf89b167
Merge "DO NOT MERGE Fix typo" into lmp-mr1-dev
2015-01-06 00:13:14 +00:00
Alan Viverette
c01678ea2d
Scroll handle was half as opaque as it was supposed to be
...
BUG: 18903443
Change-Id: Ie6a220899685f654a40d57ae0408e9c91afe868a
2015-01-05 16:06:26 -08:00
Dianne Hackborn
c478cf5185
Fix issue #18907544 : Activity manager miscomputed high RAM for 64 bit
...
No longer modify the base constants when computing oom adj values.
Change-Id: I1fa1e0013d544ad026de6dffecc7598ef7399911
2015-01-05 16:05:05 -08:00
Quddus Chong
32176c4ca1
docs: Updated GMS version numbering to be consistent with blog post.
...
bug: 18718181
Change-Id: I185157d84ebfe4ecc7b166b44d3d4735d8a106e3
2015-01-05 15:55:13 -08:00
Ricardo Cervera
a9a514331c
am f211b625: am fa6fb0da: docs: Minor fixes to Watch Faces design guidelines.
...
* commit 'f211b6257d3915054e7d92e9cfcb5eeaf3019b1a':
docs: Minor fixes to Watch Faces design guidelines.
2015-01-05 23:38:03 +00:00
Deepanshu Gupta
a6671b7074
am 6461e054: Merge "Add image comparison to LayoutLib tests." into lmp-dev
...
* commit '6461e05420c6f42b0e70134a4e0d2a626161ab74':
Add image comparison to LayoutLib tests.
2015-01-05 23:33:18 +00:00
Deepanshu Gupta
0db2524caa
am b2ebb968: Merge "Remove Time from CreateInfo" into lmp-dev
...
* commit 'b2ebb9683fb5b21543b50772a0d4c646ced7764b':
Remove Time from CreateInfo
2015-01-05 23:33:14 +00:00
Deepanshu Gupta
937db7a39e
am 53f73a97: Merge "Add DatePicker, CalendarView to LayoutLib tests" into lmp-dev
...
* commit '53f73a97542c277a519b973060dfa217849b66de':
Add DatePicker, CalendarView to LayoutLib tests
2015-01-05 23:33:10 +00:00
Deepanshu Gupta
e69e4f8b4d
am f9bb0b5e: Merge "Fix DatePicker rendering." into lmp-dev
...
* commit 'f9bb0b5e133b0c364c3f87623f0fdff0fedc5226':
Fix DatePicker rendering.
2015-01-05 23:33:06 +00:00
Deepanshu Gupta
8c686ddd54
am d20a518c: Merge "Make Preference-cookie map non static." into lmp-dev
...
* commit 'd20a518c82e5e33d33e3dc5d74bf3c17d807f7d7':
Make Preference-cookie map non static.
2015-01-05 23:33:02 +00:00
Deepanshu Gupta
cec8e5a10d
am f861c0ce: Merge "Fix default initial value for preferences" into lmp-dev
...
* commit 'f861c0ce3ff42550f3d5ede837e7bfb3855f5964':
Fix default initial value for preferences
2015-01-05 23:32:58 +00:00
Deepanshu Gupta
7ed145493d
am 7081a114: Merge "Add preferences rendering." into lmp-dev
...
* commit '7081a114d4ee190c746f337057b0f84928c162dd':
Add preferences rendering.
2015-01-05 23:32:53 +00:00
Ricardo Cervera
f211b6257d
am fa6fb0da: docs: Minor fixes to Watch Faces design guidelines.
...
* commit 'fa6fb0daa5e6f9d3b0c17c8831c7525e403bd785':
docs: Minor fixes to Watch Faces design guidelines.
2015-01-05 23:28:24 +00:00
Deepanshu Gupta
4a5baeaec9
Merge "resolved conflicts for a0bc2e7e to lmp-mr1-dev" into lmp-mr1-dev
2015-01-05 23:26:04 +00:00
Deepanshu Gupta
6461e05420
Merge "Add image comparison to LayoutLib tests." into lmp-dev
2015-01-05 23:24:59 +00:00
Deepanshu Gupta
b2ebb9683f
Merge "Remove Time from CreateInfo" into lmp-dev
2015-01-05 23:24:31 +00:00
Deepanshu Gupta
53f73a9754
Merge "Add DatePicker, CalendarView to LayoutLib tests" into lmp-dev
2015-01-05 23:23:42 +00:00
Deepanshu Gupta
f9bb0b5e13
Merge "Fix DatePicker rendering." into lmp-dev
2015-01-05 23:23:33 +00:00
Deepanshu Gupta
d20a518c82
Merge "Make Preference-cookie map non static." into lmp-dev
2015-01-05 23:22:58 +00:00
Deepanshu Gupta
f861c0ce3f
Merge "Fix default initial value for preferences" into lmp-dev
2015-01-05 23:22:45 +00:00
Deepanshu Gupta
7081a114d4
Merge "Add preferences rendering." into lmp-dev
2015-01-05 23:22:29 +00:00
Dianne Hackborn
2980719512
Merge "Fix issue #18901214 : APR: Frequent crash in android" into lmp-mr1-dev
2015-01-05 23:03:48 +00:00
Ricardo Cervera
fa6fb0daa5
docs: Minor fixes to Watch Faces design guidelines.
...
Change-Id: I1b9c26d12bac1b5e5d649e7ea665f58b50d621d7
2015-01-05 15:03:34 -08:00
Quddus Chong
1139a0a4a2
docs: Added explicit filepath for Android Media Browser and Android Messaging simulators.
...
bug: 18759727
Change-Id: Ided6dc4f30d43f8fce252e56a6291bbb1a3d2e05
2015-01-05 15:01:27 -08:00
Rich Slogar
ee371073f1
docs: studio index typo
...
Change-Id: I185e59cdba604ee894bc08f55ebb042281d44cd2
2015-01-05 14:47:19 -08:00
Filip Gruszczynski
8c6b59f46d
Merge "Add system api for disabling touch events in wallpaper behind the window." into lmp-mr1-dev
2015-01-05 22:46:14 +00:00
Dianne Hackborn
b182955a1e
Fix issue #18901214 : APR: Frequent crash in android
...
The ShutdownActivity was implemented in the system server
code, which is no longer part of the boot class path. This would
work fine when requesting a shutdown from the primary user, since
in that case the activity would be loaded in to the main system
process which also has the system service code loaded.
However, when executed from a secondary user, we need to spin up
a new system process for it; that system process is just a regular
app process, without the system service code, so *boom*.
To fix this, move ShutdownActivity to the framework jar.
Change-Id: Icb831cd6ed619da5feede5605c45ef177a892fbc
2015-01-05 14:40:24 -08:00
Alan Viverette
1f3f47b368
Merge "Avoid double-translating View background" into lmp-mr1-dev
2015-01-05 22:26:54 +00:00
Alan Viverette
b15703c9b4
Avoid double-translating View background
...
Reverse-translate the canvas before passing to Drawable.draw() so that
we don't double-apply the drawable's translation.
BUG: 18904688
Change-Id: I8450de9b240ddeae887b4e1003c0608da814a001
2015-01-05 14:20:42 -08:00
Quddus Chong
5619d929a6
docs: Updated the description of the enhanced camera APIs in L.
...
bug: 18142680
Change-Id: I0b15048bb099443a4cb790fbd2100456f2bfa4d6
2015-01-05 14:15:45 -08:00
Hui Shu
bb84515211
Merge "pm path needs to return 0 when it succeeds." into lmp-mr1-dev
2015-01-05 22:07:16 +00:00
Wale Ogunwale
1d893785bd
Merge "Don't restore persistent task to a stack until needed." into lmp-mr1-dev
2015-01-05 22:03:21 +00:00
Alan Viverette
748902420d
Merge "Don't override dialog icon drawable unless valid resource ID was set" into lmp-mr1-dev
2015-01-05 21:39:13 +00:00
Jason Monk
ee2e13e753
Merge "Don't unregister MobileSignalControllers still used" into lmp-mr1-dev
2015-01-05 21:09:23 +00:00
Jason Monk
b142b7552a
Merge "QS WiFi panel trigger settings on correct user" into lmp-mr1-dev
2015-01-05 21:09:05 +00:00
Filip Gruszczynski
fe56835934
Add system api for disabling touch events in wallpaper behind the window.
...
Bug: 18721756
Change-Id: I40b749a9916536d52042e5dd49a23575bedad754
2015-01-05 12:57:19 -08:00
Alan Viverette
5c2d8f7d51
Don't override dialog icon drawable unless valid resource ID was set
...
Fixes a regression where Builder.setIcon(Drawable) would get overridden
even when Builder.setIcon(int) had never been called and was still 0.
Fixes attribute id to respect all valid resource IDs (e.g. non-zero).
Updates documentation to reflect the long-standing override behavior.
BUG: 18904762
Change-Id: I905703993a59910555d5a858e0aaecab63221a02
2015-01-05 12:56:45 -08:00
Jason Monk
c014decc74
Don't unregister MobileSignalControllers still used
...
Also add some more testing for this section of code that manages
when MobileSignalControllers are added/removed to make sure we
are all good.
Bug: 18728593
Change-Id: I9902854c54d2e1deb58b38b7bd97dac1617831c0
2015-01-05 15:53:00 -05:00
Alan Viverette
22a3163f1d
Merge "Fix selector bug" into lmp-mr1-dev
2015-01-05 20:23:47 +00:00