Filip Gruszczynski
96c5d37fb5
Merge "SwipeDismissLayout makes activity opaque only after entry animation ends." into lmp-sprout-dev
2014-11-20 15:51:09 +00:00
Andrew Solovay
b5b9c9b589
am c79173c7: am 05282133: Merge "docs: Bugfix & minor cleanup for "Providing Messaging for Auto"" into lmp-docs
...
* commit 'c79173c7da4de4d809d3b5492e5433393193a652':
docs: Bugfix & minor cleanup for "Providing Messaging for Auto"
2014-11-20 01:46:14 +00:00
Elliott Hughes
4db3fc1c28
am 03c80408: am 6c43e6b5: Fix and be more explicit about plurals best practices.
...
* commit '03c80408d2651bcfaa707233cd0b54b7a8ca57ad':
Fix and be more explicit about plurals best practices.
2014-11-20 01:40:00 +00:00
Andrew Solovay
c79173c7da
am 05282133: Merge "docs: Bugfix & minor cleanup for "Providing Messaging for Auto"" into lmp-docs
...
* commit '05282133c7491fd2b5e8f3da05408ff0165df526':
docs: Bugfix & minor cleanup for "Providing Messaging for Auto"
2014-11-20 01:32:30 +00:00
Andrew Solovay
05282133c7
Merge "docs: Bugfix & minor cleanup for "Providing Messaging for Auto"" into lmp-docs
2014-11-20 01:27:51 +00:00
Elliott Hughes
03c80408d2
am 6c43e6b5: Fix and be more explicit about plurals best practices.
...
* commit '6c43e6b54d7d540e579d2dff8c9cff981cb5ca4a':
Fix and be more explicit about plurals best practices.
2014-11-20 01:21:40 +00:00
Elliott Hughes
6c43e6b54d
Fix and be more explicit about plurals best practices.
...
The "one" case should always include %d. Say so, and fix our examples.
Also make it clear that developers should always provide exactly "one"
and "other".
Bug: 18429565
(cherry picked from commit 1fe7d496db1ddc73289e6aae11f4dd4a970141d5)
Change-Id: I89656c74b7dfd91584e1bb6d0a3f2da1dda81079
2014-11-19 16:38:39 -08:00
Dirk Dougherty
4d82f8ad32
am ef629f1f: am a79acc03: Doc change: localized content.
...
* commit 'ef629f1f9feada596a0c41b55daa0e859e24312e':
Doc change: localized content.
2014-11-20 00:08:05 +00:00
Dirk Dougherty
ef629f1f9f
am a79acc03: Doc change: localized content.
...
* commit 'a79acc0315d33080527b9fb48ba063fb4104de37':
Doc change: localized content.
2014-11-20 00:02:06 +00:00
Dirk Dougherty
a79acc0315
Doc change: localized content.
...
Change-Id: I5440fe8d6003bdd8e3cb4c44bacea422f322c33b
2014-11-19 23:44:05 +00:00
smain@google.com
6e08d30da4
am 555d6e70: am 2411fe88: Merge "add the helpouts widget and necessary tags to "wave 2" of the Getting Started classes" into lmp-docs
...
* commit '555d6e700a84018e1af2e7cf6c58ca00f0611f5d':
add the helpouts widget and necessary tags to "wave 2" of the Getting Started classes
2014-11-19 23:14:10 +00:00
smain@google.com
555d6e700a
am 2411fe88: Merge "add the helpouts widget and necessary tags to "wave 2" of the Getting Started classes" into lmp-docs
...
* commit '2411fe88d7b11f628e5338bd8f314c98a9d45bb4':
add the helpouts widget and necessary tags to "wave 2" of the Getting Started classes
2014-11-19 23:10:06 +00:00
smain@google.com
2411fe88d7
Merge "add the helpouts widget and necessary tags to "wave 2" of the Getting Started classes" into lmp-docs
2014-11-19 23:06:27 +00:00
Quddus Chong
a1e1890797
am 8428c114: am 9b822b96: docs: Added link to CarExtender class from Auto Getting Started doc.
...
* commit '8428c114ab58d7a5a11c72583a49d3e1d036623c':
docs: Added link to CarExtender class from Auto Getting Started doc.
2014-11-19 23:05:59 +00:00
Deepanshu Gupta
ddc83dfa8f
am 4104abf8: Merge "Fix setTextAppearance for styles with dots." into lmp-dev
...
* commit '4104abf875e16ad54c248ce602e573d2144732dd':
Fix setTextAppearance for styles with dots.
2014-11-19 23:00:43 +00:00
Deepanshu Gupta
a0bc2e7e3c
am 455654cf: Merge "LayoutLib: Stub AM/PM keycodes in Time Picker." into lmp-dev
...
* commit '455654cffdaebcbbd4fa33de5bb18fa2752d6c9a':
LayoutLib: Stub AM/PM keycodes in Time Picker.
2014-11-19 23:00:39 +00:00
Quddus Chong
8428c114ab
am 9b822b96: docs: Added link to CarExtender class from Auto Getting Started doc.
...
* commit '9b822b96aaf16ac4ad8e5a1c8da998fba2f3f404':
docs: Added link to CarExtender class from Auto Getting Started doc.
2014-11-19 22:58:30 +00:00
Andrew Solovay
9ab79ccd34
docs: Bugfix & minor cleanup for "Providing Messaging for Auto"
...
Fixeds the gradle dependency line. Also added in Javadoc links for the
various support classes and methods, and other minor cleanup. See
first comment for doc stage location.
bug: 18439090
Change-Id: I7ccc892f38a644d68abc6d56d8d4377df5f864b0
2014-11-19 14:48:52 -08:00
Deepanshu Gupta
4104abf875
Merge "Fix setTextAppearance for styles with dots." into lmp-dev
2014-11-19 22:30:20 +00:00
Deepanshu Gupta
455654cffd
Merge "LayoutLib: Stub AM/PM keycodes in Time Picker." into lmp-dev
2014-11-19 22:29:54 +00:00
Geoffrey Borggaard
db1e7fa097
Merge "Setting ADB_ENABLED may result in a SecurityException." into lmp-dev
...
automerge: e4590cf
* commit 'e4590cff5bbe581a1326abe68115b551585c43ff':
Setting ADB_ENABLED may result in a SecurityException.
2014-11-19 20:50:12 +00:00
Geoffrey Borggaard
e4590cff5b
Merge "Setting ADB_ENABLED may result in a SecurityException." into lmp-dev
2014-11-19 19:56:48 +00:00
xinhe
62a22d5b1f
resolved conflicts for merge of 046f3843 to lmp-sprout-dev(DO NOT MERGE)
...
The change is already in MR1 branch
Change-Id: I4ae35a8f76fdc2d4b1cdf2773dc27ff2da85b5ff
2014-11-19 11:48:43 -08:00
Quddus Chong
9b822b96aa
docs: Added link to CarExtender class from Auto Getting Started doc.
...
Change-Id: Ia446c969a7108d8964c22958cd501b083a84b9d3
2014-11-19 11:37:18 -08:00
Geoffrey Borggaard
ba45b96a37
Setting ADB_ENABLED may result in a SecurityException.
...
If the restriction UserManager.DISALLOW_DEBUGGING_FEATURES is enforced,
then any attempt to set ADB_ENABLED will result in a SecurityException.
This can result in the device not being able to boot.
Bug: 18433477
Change-Id: I21e4b406ad0fa89b7d4b678eac1baf212a3c7acd
2014-11-19 14:26:08 -05:00
Filip Gruszczynski
6eafa902cb
SwipeDismissLayout makes activity opaque only after entry animation ends.
...
Bug: 18340863
Change-Id: Ic60fa2463618f86b1ae23fc4a0c06cd348f28334
2014-11-19 11:05:43 -08:00
xinhe
046f3843f1
Merge "Add configuration to control converting sms destination number" into lmp-dev
2014-11-19 17:47:25 +00:00
Geoff Mendal
5fafd21b1f
Import translations. DO NOT MERGE
...
Change-Id: I97c8d622957c88f2186e7d3116726b7ba33703c7
Auto-generated-cl: translation import
2014-11-19 07:52:29 -08:00
xinhe
67def72d05
Add configuration to control converting sms destination number
...
Romove hard codes about the SimcardOperatorList and NetworkOperatorList.
Bug: 18081228
Change-Id: I0d96972c6097325634413137bfbdb5a246885276
2014-11-18 17:09:54 -08:00
Jeff Hao
c6fdda5284
Merge "Frameworks/base: Compiled-classes support" into lmp-sprout-dev
2014-11-18 23:56:33 +00:00
Ricardo Cervera
b2a2d2c2fe
am e9fddfd8: am 0d18b091: Merge "docs: Add link to "Voice search in your app" video." into lmp-docs
...
* commit 'e9fddfd802f9d00dd2d86bd78e3da3cc2f530d3c':
docs: Add link to "Voice search in your app" video.
2014-11-18 23:26:41 +00:00
Ricardo Cervera
e9fddfd802
am 0d18b091: Merge "docs: Add link to "Voice search in your app" video." into lmp-docs
...
* commit '0d18b091eb5bb5be6f7142821b674e1648158a11':
docs: Add link to "Voice search in your app" video.
2014-11-18 23:21:29 +00:00
Ricardo Cervera
0d18b091eb
Merge "docs: Add link to "Voice search in your app" video." into lmp-docs
2014-11-18 23:16:22 +00:00
Andreas Gampe
cd9c6f508f
Frameworks/base: Compiled-classes support
...
Let AndroidRuntime check for /system/etc/compiled-classes and push
it to the runtime for boot image creation.
Bug: 18410571
(cherry picked from commit ca775941f3b7981aabf3a6a3b84d6c94f4f76aff)
Change-Id: I04d195c12def4bf1136ed8c6b3dc439b640de7b2
2014-11-18 15:14:06 -08:00
Deepanshu Gupta
2c9fbdd29c
Fix setTextAppearance for styles with dots.
...
Bug: http://b.android.com/78842
Change-Id: I65923134b2d3812030e2b7dd8ab96363b0647c1f
2014-11-18 22:52:10 +00:00
Quddus Chong
09cf0729a3
am f256d7ac: am 4741fb4b: docs: Fixed bugs for Auto docs.
...
* commit 'f256d7ac189e58a6c21a5a71e5a1dddeab2d576f':
docs: Fixed bugs for Auto docs.
2014-11-18 22:13:06 +00:00
Quddus Chong
f256d7ac18
am 4741fb4b: docs: Fixed bugs for Auto docs.
...
* commit '4741fb4bb146909fc133ae37ea43dbb7f9edbd04':
docs: Fixed bugs for Auto docs.
2014-11-18 22:08:10 +00:00
Deepanshu Gupta
12b6d29b7b
LayoutLib: Stub AM/PM keycodes in Time Picker.
...
TimePickerSpinnerDelegate doesn't need to deal with input when running
inside LayoutLib. So, we just return the keycodes as if it's running in
English locale.
Bug: http://b.android.com/79189
Change-Id: Ife0ae91a1e34a8dac379bc1dda1c1c8ed461c164
2014-11-18 22:02:40 +00:00
Quddus Chong
4741fb4bb1
docs: Fixed bugs for Auto docs.
...
Change-Id: Iba8406a95374e5c621eb607c6bb0a8ad6a892f59
2014-11-18 13:46:44 -08:00
smain@google.com
cca0d6bfd6
add the helpouts widget and necessary tags to "wave 2" of the Getting Started classes
...
Change-Id: I79d5193d9a4d466d22f495d8685bb43a42d5c3fa
2014-11-18 12:52:15 -08:00
Bryce Lee
8f7b84e037
Merge "Always wake device on power key from non interactive immediately." into lmp-sprout-dev
2014-11-18 19:09:11 +00:00
Selim Cinek
b510a1cb76
am 652afdf5: Increases the falsing threshold when for the keyguard affordances
...
* commit '652afdf504cacaae8dcc334b0f1a9e282a95d768':
Increases the falsing threshold when for the keyguard affordances
2014-11-18 18:33:44 +00:00
Ricardo Cervera
c3b2a00371
docs: Add link to "Voice search in your app" video.
...
Bug: 18407660
Change-Id: I9062c708b64586116e5af4df5d83b73988189e8a
2014-11-18 10:02:15 -08:00
Selim Cinek
652afdf504
Increases the falsing threshold when for the keyguard affordances
...
The minimum amount has been increased by 20dp and in addition the
Motion is cancelled whenever a POINTER_DOWN occurs, which should
help a lot with falsing.
Bug: 18298401
Change-Id: I04b1f30fd2555c08209224f4e84c610ecd7a33f1
(cherry picked from commit 1dc406505cdcbbf98ece4f15a2f98f621e24abdb)
2014-11-18 15:58:01 +00:00
Andrew Solovay
b2d73807a9
am e4662f7e: am a7f226b8: docs: (Preview) Building an Android Messaging App guide.
...
* commit 'e4662f7e4b73a78074bd1f6b5c9fc17509759d45':
docs: (Preview) Building an Android Messaging App guide.
2014-11-18 10:22:54 +00:00
Andrew Solovay
e4662f7e4b
am a7f226b8: docs: (Preview) Building an Android Messaging App guide.
...
* commit 'a7f226b860455b26cc64f6db08f8c279be71117f':
docs: (Preview) Building an Android Messaging App guide.
2014-11-18 10:17:53 +00:00
Andrew Solovay
a7f226b860
docs: (Preview) Building an Android Messaging App guide.
...
See the first comment for doc staging location.
Change-Id: Ibfa0f43abefbdd03c5468186b2ec0c76ed6c9ade
2014-11-18 02:08:05 -08:00
Andrew Solovay
7ca874e71c
am 4a9945e9: am 7fe755e6: docs: (Preview) Building Android Audio Playback Apps guide.
...
* commit '4a9945e9c03e8a2c006febf4b8325f0c1bf84b39':
docs: (Preview) Building Android Audio Playback Apps guide.
2014-11-18 09:56:01 +00:00
Andrew Solovay
4a9945e9c0
am 7fe755e6: docs: (Preview) Building Android Audio Playback Apps guide.
...
* commit '7fe755e66b10244da2382c11f9244346b8184e48':
docs: (Preview) Building Android Audio Playback Apps guide.
2014-11-18 08:59:15 +00:00
Andrew Solovay
7fe755e66b
docs: (Preview) Building Android Audio Playback Apps guide.
...
Doc was previously titled "Building Android Media Apps"; per request,
changed "Media" to "Audio" whenever possible, and moved file location
accordingly.
See the comment after patch set 5 for the updated staging location.
Change-Id: I0d657851d44b46cdfb1b5806a51dad0565312c04
2014-11-18 00:46:58 -08:00