Ricardo Cervera
0024f12dec
Merge "docs: Design guidelines for watch faces draft." into lmp-docs
2014-12-10 05:12:50 +00:00
Dianne Hackborn
80b1c5608e
Fix issue #18665625 CTS:android.app.cts.InstrumentationTest#...
...
...testCallActivityOnNewIntent test fails with LMP-MR1 Release.
Check for null.
Also fix some small issues with converting intents to/from intents.
Change-Id: Ic391cc57552635935af9a271b2d09353257f6d14
2014-12-09 20:22:08 -08:00
smain@google.com
5a267e72b2
am 5b16e21b: am 6554bb45: am 1a2308bb: Merge "misc updates related to Android Studio. clarify a few doc titles for improved search results clarity. update "get started" page link to Android Studio, add First App link, and remove some biased language." into lmp-docs
...
* commit '5b16e21b9f1b750d66060a25fadfe35c3ebfed30':
misc updates related to Android Studio. clarify a few doc titles for improved search results clarity. update "get started" page link to Android Studio, add First App link, and remove some biased language.
2014-12-10 03:53:26 +00:00
Joe Fernandez
913a683de9
am f8527c7f: am c3ae2596: am 1e824284: Merge "docs: Add Distributing to Android Wear doc" into lmp-docs
...
* commit 'f8527c7f82d1197a7ebaf9caf1a199165b47e353':
docs: Add Distributing to Android Wear doc
2014-12-10 03:53:22 +00:00
Ricardo Cervera
600224c958
am 730a52d0: am eb09f898: am d412b9ab: Merge "docs: Add new classes to Wearable UI library" into lmp-docs
...
* commit '730a52d0cc9c8644791b68530520460860719d1a':
docs: Add new classes to Wearable UI library
2014-12-10 03:53:18 +00:00
Ricardo Cervera
45ea56904a
am 5edaf136: am be80b984: am 0d8f1417: Merge "docs: Add links to wearable support zip for ADT" into lmp-docs
...
* commit '5edaf136c8c3b45dded99e69fad2b5f2fb3a57f2':
docs: Add links to wearable support zip for ADT
2014-12-10 03:53:14 +00:00
Quddus Chong
15e0f7fdb3
am bdb327ad: am c24c5797: am 09e72628: Merge "docs: Updated GMS highlights for v6.5 (Nacho) to reflect removal of LocationClient, PlusClient, and ActivityRecognitionClient." into lmp-docs
...
* commit 'bdb327adb3faf3604becfe0174ef90ca6ff458c2':
docs: Updated GMS highlights for v6.5 (Nacho) to reflect removal of LocationClient, PlusClient, and ActivityRecognitionClient.
2014-12-10 03:53:08 +00:00
smain@google.com
5b16e21b9f
am 6554bb45: am 1a2308bb: Merge "misc updates related to Android Studio. clarify a few doc titles for improved search results clarity. update "get started" page link to Android Studio, add First App link, and remove some biased language." into lmp-docs
...
* commit '6554bb45eab54061e72f3f3414e40cf4f8e62097':
misc updates related to Android Studio. clarify a few doc titles for improved search results clarity. update "get started" page link to Android Studio, add First App link, and remove some biased language.
2014-12-10 03:43:07 +00:00
Joe Fernandez
f8527c7f82
am c3ae2596: am 1e824284: Merge "docs: Add Distributing to Android Wear doc" into lmp-docs
...
* commit 'c3ae259639d79bfec2d6e50d5fff6b2ced353549':
docs: Add Distributing to Android Wear doc
2014-12-10 03:38:05 +00:00
Ricardo Cervera
730a52d0cc
am eb09f898: am d412b9ab: Merge "docs: Add new classes to Wearable UI library" into lmp-docs
...
* commit 'eb09f89896b589059718d7e8f1b94ed8e2969927':
docs: Add new classes to Wearable UI library
2014-12-10 03:38:01 +00:00
Ricardo Cervera
5edaf136c8
am be80b984: am 0d8f1417: Merge "docs: Add links to wearable support zip for ADT" into lmp-docs
...
* commit 'be80b984690ca3a6c54a8bab1d0bd8f15386c5a2':
docs: Add links to wearable support zip for ADT
2014-12-10 03:37:58 +00:00
Quddus Chong
bdb327adb3
am c24c5797: am 09e72628: Merge "docs: Updated GMS highlights for v6.5 (Nacho) to reflect removal of LocationClient, PlusClient, and ActivityRecognitionClient." into lmp-docs
...
* commit 'c24c579770d9663174204e4e9413060bcb8e4a58':
docs: Updated GMS highlights for v6.5 (Nacho) to reflect removal of LocationClient, PlusClient, and ActivityRecognitionClient.
2014-12-10 03:37:53 +00:00
smain@google.com
6554bb45ea
am 1a2308bb: Merge "misc updates related to Android Studio. clarify a few doc titles for improved search results clarity. update "get started" page link to Android Studio, add First App link, and remove some biased language." into lmp-docs
...
* commit '1a2308bb8575602689b02379cb96da008f403b5a':
misc updates related to Android Studio. clarify a few doc titles for improved search results clarity. update "get started" page link to Android Studio, add First App link, and remove some biased language.
2014-12-10 03:32:44 +00:00
smain@google.com
1a2308bb85
Merge "misc updates related to Android Studio. clarify a few doc titles for improved search results clarity. update "get started" page link to Android Studio, add First App link, and remove some biased language." into lmp-docs
2014-12-10 03:28:26 +00:00
Joe Fernandez
c3ae259639
am 1e824284: Merge "docs: Add Distributing to Android Wear doc" into lmp-docs
...
* commit '1e82428495ae0c909a7c67dd2f7879ee1e603245':
docs: Add Distributing to Android Wear doc
2014-12-10 03:23:06 +00:00
Ricardo Cervera
eb09f89896
am d412b9ab: Merge "docs: Add new classes to Wearable UI library" into lmp-docs
...
* commit 'd412b9ab7435ea03392ef3e710a20c0b69056141':
docs: Add new classes to Wearable UI library
2014-12-10 03:23:03 +00:00
Ricardo Cervera
be80b98469
am 0d8f1417: Merge "docs: Add links to wearable support zip for ADT" into lmp-docs
...
* commit '0d8f1417209ba0a38a97ae8e31b4ae87e0f1e7c2':
docs: Add links to wearable support zip for ADT
2014-12-10 03:22:59 +00:00
Quddus Chong
c24c579770
am 09e72628: Merge "docs: Updated GMS highlights for v6.5 (Nacho) to reflect removal of LocationClient, PlusClient, and ActivityRecognitionClient." into lmp-docs
...
* commit '09e72628fc9e58659c18b1bbbb1a0ec8a5878221':
docs: Updated GMS highlights for v6.5 (Nacho) to reflect removal of LocationClient, PlusClient, and ActivityRecognitionClient.
2014-12-10 03:22:54 +00:00
Andre Eisenbach
c91499842f
Merge "Prevent NullPointerException in getStringValue if no value is set" into lmp-mr1-dev
2014-12-10 02:31:33 +00:00
Craig Mautner
73bdf9761b
Add put/getBoolean/Array to PersistableBundle
...
Due to popular demand the methods putBoolean(), getBoolean(),
putBooleanArray() and getBooleanArray() have been added to
PersistableBundle.
Fixes bug 18390436.
Change-Id: Id133ba902aca774f98529e36ce560e873b88ad5b
2014-12-09 18:10:20 -08:00
Joe Fernandez
1e82428495
Merge "docs: Add Distributing to Android Wear doc" into lmp-docs
2014-12-10 02:10:07 +00:00
Eric Laurent
65bc1125b4
Merge "AudioSystem JNI: Add audio policy custom mixes registration" into lmp-mr1-dev
2014-12-10 01:33:09 +00:00
smain@google.com
cf18fa6cd8
misc updates related to Android Studio.
...
clarify a few doc titles for improved search results clarity.
update "get started" page link to Android Studio, add First App link,
and remove some biased language.
Change-Id: I5e4faef8a6eb0a08eec45981a4f9436cb07a995c
2014-12-09 17:26:07 -08:00
Ricardo Cervera
d412b9ab74
Merge "docs: Add new classes to Wearable UI library" into lmp-docs
2014-12-10 00:56:50 +00:00
Ricardo Cervera
0d8f141720
Merge "docs: Add links to wearable support zip for ADT" into lmp-docs
2014-12-10 00:56:15 +00:00
Wale Ogunwale
37f271869e
Always take an activity screenshot when pausing.
...
http://ag/261732 introduced an optimization where we only take
the activity screenshot if is is not the activity we took a
screenshot for last. This causes us to display a stale screenshot
for activities that change their display content (using fragments)
without going through the pause/resume cycle. It should be safe
to always take a screenshot when we are pausing since the code
path is only called once per pause/resume cycle.
Bug: 18682160
Change-Id: Ie5c43cfd806286808af4233c5917ae7071908ebb
(cherry picked from commit eacdf2ce04899b0a3abef55e4e7e1fe9c1649932)
2014-12-10 00:44:28 +00:00
Andre Eisenbach
0fd06a19bd
Prevent NullPointerException in getStringValue if no value is set
...
Bug: 18686365
Change-Id: I5f5d07ef49500e0d8118ba04aaf373ae4514f034
2014-12-09 16:42:14 -08:00
Amith Yamasani
dad85a6c4b
Merge "Allow user shutdown broadcasts to be delivered" into lmp-mr1-dev
2014-12-10 00:30:31 +00:00
vandwalle
08fe024a47
adjust network switching thresholds
...
Bug:18589301
Change-Id: I6f08e4b6cbc642a2de4800dc45b68dafae9c2b61
2014-12-09 16:20:11 -08:00
Quddus Chong
09e72628fc
Merge "docs: Updated GMS highlights for v6.5 (Nacho) to reflect removal of LocationClient, PlusClient, and ActivityRecognitionClient." into lmp-docs
2014-12-10 00:02:17 +00:00
Rich Slogar
e950ce30bc
docs: platform updates for api 21
...
Change-Id: I6dd1897641243a19ece0acfd16866cb0d7c3a24a
2014-12-09 15:49:39 -08:00
Michael Wright
c6de3212c2
Merge "Don't try to scale the bitmaps for null MediaMetadata." into lmp-mr1-dev
2014-12-09 23:39:50 +00:00
Jeff Sharkey
1102e712c1
Merge "Throw IOException when missing default ringtone." into lmp-mr1-dev
2014-12-09 23:34:07 +00:00
Luan Nguyen
cbd0032df2
docs: Add Distributing to Android Wear doc
...
Change-Id: I123f53b4d7a1098c1caabc88a1e6fd6dd828d3fb
2014-12-09 15:30:24 -08:00
Jeff Sharkey
87d76f6a3e
Throw IOException when missing default ringtone.
...
This is caught by Ringtone, and we then fall back to built-in
ringtone, which matches the expected CTS behavior.
Bug: 18610451
Change-Id: I234d17f7cf623b9b0af434e5d367aed28f203b14
2014-12-09 15:27:25 -08:00
Joe Fernandez
d36d2aad9d
am a82fc60c: am 6d481852: am b35a509d: Merge ":docs studio tips and tricks headings updates" into lmp-docs
...
* commit 'a82fc60ce4cc0f7d1167330f4cbb5736551ddd5c':
:docs studio tips and tricks headings updates
2014-12-09 23:22:42 +00:00
Joe Fernandez
a82fc60ce4
am 6d481852: am b35a509d: Merge ":docs studio tips and tricks headings updates" into lmp-docs
...
* commit '6d4818529e435b2e6d285233bd0668e3ba25f6c9':
:docs studio tips and tricks headings updates
2014-12-09 23:12:53 +00:00
John Reck
4f1942d999
Merge "Teach AssetAtlas about more drawables" into lmp-mr1-dev
2014-12-09 23:12:42 +00:00
Ruben Brunk
3ef5033cda
Merge "Camera2: Allow rendering to arbitrary surface sizes in LEGACY mode." into lmp-mr1-dev
2014-12-09 23:09:52 +00:00
Joe Fernandez
6d4818529e
am b35a509d: Merge ":docs studio tips and tricks headings updates" into lmp-docs
...
* commit 'b35a509d0eb4d9c150630fc6108f4bc039a09043':
:docs studio tips and tricks headings updates
2014-12-09 23:04:13 +00:00
Joe Fernandez
b35a509d0e
Merge ":docs studio tips and tricks headings updates" into lmp-docs
2014-12-09 22:56:37 +00:00
Ricardo Cervera
4a6bafcb56
am 12a24dc9: am 47fa6355: am 5155840b: Merge "docs: Adding links to material design videos" into lmp-docs
...
* commit '12a24dc91fa4de5b897acff9a6435647429040d7':
docs: Adding links to material design videos
2014-12-09 22:49:10 +00:00
Quddus Chong
da125f4f12
docs: Updated GMS highlights for v6.5 (Nacho) to reflect removal of LocationClient, PlusClient, and ActivityRecognitionClient.
...
Change-Id: I240feafe4002884dbb2495ffefc599a76b6b7a35
2014-12-09 14:44:05 -08:00
Ricardo Cervera
12a24dc91f
am 47fa6355: am 5155840b: Merge "docs: Adding links to material design videos" into lmp-docs
...
* commit '47fa63553bc53d46bc5e1b8873ff81a774d399e7':
docs: Adding links to material design videos
2014-12-09 22:40:55 +00:00
Rich Slogar
5053344bb6
:docs studio tips and tricks headings updates
...
Change-Id: I5453263b575610b6f418569bdf79f73a693c641b
2014-12-09 14:23:18 -08:00
John Reck
dad7d84c04
Teach AssetAtlas about more drawables
...
Bug: 18317479
Change-Id: I16868ee204d24af72af9a2efc987f7e9eb1d266b
2014-12-09 14:18:33 -08:00
Ricardo Cervera
47fa63553b
am 5155840b: Merge "docs: Adding links to material design videos" into lmp-docs
...
* commit '5155840ba091f62ea3079328b25a620089223887':
docs: Adding links to material design videos
2014-12-09 22:16:58 +00:00
Jason Monk
4a3daac72b
Handle policy change while keyguard disabled
...
Previously the policy change would always re-enable the keyguard,
but that would break the current state. Instead, when the keyguard
is disabled, we need to recalculate the allow state immediately
and only re-enable it if necessary.
Bug: 18430385
Change-Id: Id9e701df2db765031e177c8bc8d3730cfb7f162a
2014-12-09 16:40:06 -05:00
Elliott Hughes
0aac16bbf1
am b034de7e: am 12f100de: am e8f6cb06: Merge "Fix typo." into lmp-docs
...
* commit 'b034de7eefc82a951bbf36a65b304f9475e1b44c':
Fix typo.
2014-12-09 21:34:06 +00:00
smain@google.com
9ecc18e2e3
am 4267450e: am 780a2231: am 2023bec7: revise ADT migration message b/18668828 and fix broken link
...
* commit '4267450e98ae78877cf77a3b28fb4f449b314114':
revise ADT migration message b/18668828 and fix broken link
2014-12-09 21:34:02 +00:00
