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

161399 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ricardo Cervera
c0d08616f2 am c6361d8d: Merge "docs: Add details to Packaging Wearable apps." into lmp-dev 
* commit 'c6361d8df220200419b679ac573c06a86b5fd1ef':
  docs: Add details to Packaging Wearable apps.
 2014-12-10 05:39:36 +00:00
Ricardo Cervera
900efcc91c docs: Add details to Packaging Wearable apps. 
Bug: 17943949

(cherry picked from commit 07c9c63e3dd7ee6c752abed3ba54faa949184ca8)

Change-Id: I765285b7e1a17928778ac161c73b2e48b82b54d6
 2014-12-10 05:36:09 +00:00
Joe Fernandez
1832978cf6 Merge "docs: Update wording on Packaging requirement description. Add Watch Face requirement." into lmp-docs 2014-12-10 05:35:22 +00:00
Ricardo Cervera
0342d70e4e am f94ee2c1: am ec656c51: am 0024f12d: Merge "docs: Design guidelines for watch faces draft." into lmp-docs 
* commit 'f94ee2c10ce168f6eef39cc25dd663bb8b79eac9':
  docs: Design guidelines for watch faces draft.
 2014-12-10 05:34:57 +00:00
Ricardo Cervera
ea15366ae3 am 26e21055: Merge "docs: Creating Custom Watch Faces training class." into lmp-docs 
* commit '26e2105575939918e362f14b854176bc54e39b44':
  docs: Creating Custom Watch Faces training class.
 2014-12-10 05:34:39 +00:00
Ricardo Cervera
c6361d8df2 Merge "docs: Add details to Packaging Wearable apps." into lmp-dev 2014-12-10 05:32:19 +00:00
Ricardo Cervera
26e2105575 Merge "docs: Creating Custom Watch Faces training class." into lmp-docs 2014-12-10 05:28:33 +00:00
Ricardo Cervera
f94ee2c10c am ec656c51: am 0024f12d: Merge "docs: Design guidelines for watch faces draft." into lmp-docs 
* commit 'ec656c51eec62b8b6a8599675add07762f0587cd':
  docs: Design guidelines for watch faces draft.
 2014-12-10 05:28:04 +00:00
Ricardo Cervera
7db2979684 docs: Creating Custom Watch Faces training class. 
Bug: 18338418
Bug: 18533881

Change-Id: I71d38c73b6a76c9bec8b646967a93d60b05c639b
 2014-12-09 21:26:58 -08:00
Patrick Tjin
6aa6733cf8 am e3703050: Add recovery kmsg to dropbox 
* commit 'e37030505ee3d461508611e1a291aff7b9e82a43':
  Add recovery kmsg to dropbox
 2014-12-10 05:23:50 +00:00
Ricardo Cervera
ec656c51ee am 0024f12d: Merge "docs: Design guidelines for watch faces draft." into lmp-docs 
* commit '0024f12dec948d25738c28175ac26d9829b6cd7b':
  docs: Design guidelines for watch faces draft.
 2014-12-10 05:21:30 +00:00
Patrick Tjin
e37030505e Add recovery kmsg to dropbox 
Bug: 18642766

Change-Id: I10e4532904a3a8cac43bec7630b9a7a90c2424ba
Signed-off-by: Patrick Tjin <pattjin@google.com>
 2014-12-10 05:16:33 +00:00
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
6c1facdc40 am 5a267e72: 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." int 
* commit '5a267e72b2e26bd55fa7e7123587e9987dc6415a':
  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:59:23 +00:00
Joe Fernandez
caad620d04 am 913a683d: am f8527c7f: am c3ae2596: am 1e824284: Merge "docs: Add Distributing to Android Wear doc" into lmp-docs 
* commit '913a683de9ca6dfeca5b57ad7506add98b3a624c':
  docs: Add Distributing to Android Wear doc
 2014-12-10 03:59:18 +00:00
Ricardo Cervera
768d97d0b6 am 600224c9: am 730a52d0: am eb09f898: am d412b9ab: Merge "docs: Add new classes to Wearable UI library" into lmp-docs 
* commit '600224c958e26575975a91b45612bdb4783ba03c':
  docs: Add new classes to Wearable UI library
 2014-12-10 03:59:12 +00:00
Ricardo Cervera
739d0a8c6b am 45ea5690: am 5edaf136: am be80b984: am 0d8f1417: Merge "docs: Add links to wearable support zip for ADT" into lmp-docs 
* commit '45ea56904a4c3698be6823ae278108056f3caae4':
  docs: Add links to wearable support zip for ADT
 2014-12-10 03:59:05 +00:00
Quddus Chong
20baf9e47e am 15e0f7fd: 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 '15e0f7fdb3ffab4adad87bee0a3d987e892cf0bc':
  docs: Updated GMS highlights for v6.5 (Nacho) to reflect removal of LocationClient, PlusClient, and ActivityRecognitionClient.
 2014-12-10 03:58:59 +00: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
e8323934c7 am c9149984: Merge "Prevent NullPointerException in getStringValue if no value is set" into lmp-mr1-dev 
* commit 'c91499842fed63c55326e7e2a71b491f7c9315c1':
  Prevent NullPointerException in getStringValue if no value is set
 2014-12-10 02:36:10 +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
5196dd04a0 Merge "AudioSystem JNI: Add audio policy custom mixes registration" into lmp-mr1-dev 
automerge: 65bc112

* commit '65bc1125b4bdb0e982b37e76ab8a9a66adefd2e0':
  AudioSystem JNI: Add audio policy custom mixes registration
 2014-12-10 01:34:33 +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
Wale Ogunwale
bfa6059b78 Always take an activity screenshot when pausing. 
automerge: 37f2718

* commit '37f271869ed9c9e9f0e7de7339017e0bb6719780':
  Always take an activity screenshot when pausing.
 2014-12-10 00:57:51 +00: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
7acd8802d7 Merge "Allow user shutdown broadcasts to be delivered" into lmp-mr1-dev 
automerge: dad85a6

* commit 'dad85a6c4bf51c126978d584703a5320be7f396c':
  Allow user shutdown broadcasts to be delivered
 2014-12-10 00:33:24 +00:00
Amith Yamasani
dad85a6c4b Merge "Allow user shutdown broadcasts to be delivered" into lmp-mr1-dev 2014-12-10 00:30:31 +00: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