Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
171,267 Commits 3 Branches 0 Tags
f8830fc514b2397c4f6477a03d7def4f60b093d3
Commit Graph

171267 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jason Monk
f8830fc514 am 28fffd58: Merge "CarrierText clear itself when no mob. data support" into lmp-mr1-dev 
automerge: 9309db8

* commit '9309db894df916f0777745eaa3e41ab92930481d':
  CarrierText clear itself when no mob. data support
 2014-12-10 19:09:42 +00:00
Geoff Mendal
e8c7fe7731 Import translations. DO NOT MERGE 
automerge: f6e3882  -s ours

* commit 'f6e388231d2fca71362d417980956c5976e59240':
  Import translations. DO NOT MERGE
 2014-12-10 19:08:03 +00:00
Erik Kline
34b3b53f9c am 33cd463b: Merge "Re-remove CONNECTIVITY_CHANGE_DELAY and supporting functions." into lmp-mr1-dev 
automerge: 56d2e8f

* commit '56d2e8fb7b2ab6e32efea59604eb0cd72745df1b':
  Re-remove CONNECTIVITY_CHANGE_DELAY and supporting functions.
 2014-12-10 19:06:50 +00:00
Ricardo Cervera
c97788f054 am 7cc203d7: am f49c37e7: am 933005e9: am 900efcc9: docs: Add details to Packaging Wearable apps. 
automerge: e4afef4

* commit 'e4afef448deb3524916503becf714c7668a51766':
  docs: Add details to Packaging Wearable apps.
 2014-12-10 19:05:18 +00:00
Joe Fernandez
c6ff45522b am 17cf7789: am 5ff08052: am dfd05f0a: am 1832978c: Merge "docs: Update wording on Packaging requirement description. Add Watch Face requirement." into lmp-docs 
automerge: 39409f2

* commit '39409f28e68d1e43f845497c33167f2688b6bce9':
  docs: Update wording on Packaging requirement description. Add Watch Face requirement.
 2014-12-10 19:03:32 +00:00
Ricardo Cervera
fc1e25f30d am d56b7a39: am 504e213f: am ea15366a: am 26e21055: Merge "docs: Creating Custom Watch Faces training class." into lmp-docs 
automerge: a41a241

* commit 'a41a241f6e5ef959b8dcc9656422f20dd41f3ba3':
  docs: Creating Custom Watch Faces training class.
 2014-12-10 19:02:10 +00:00
Ricardo Cervera
b8217ea7f0 am 2a34e719: am c0d08616: am c6361d8d: Merge "docs: Add details to Packaging Wearable apps." into lmp-dev 
automerge: 7061697

* commit '7061697bfd7c2280ae780356b68ac5c47b3aa1d8':
  docs: Add details to Packaging Wearable apps.
 2014-12-10 19:00:49 +00:00
Ricardo Cervera
85cc409076 am 0342d70e: am f94ee2c1: am ec656c51: am 0024f12d: Merge "docs: Design guidelines for watch faces draft." into lmp-docs 
automerge: 1b46c2c

* commit '1b46c2ccb700749bf7d06c454b8f4337bacde371':
  docs: Design guidelines for watch faces draft.
 2014-12-10 18:59:28 +00:00
Patrick Tjin
6b4a1c6c46 am e3703050: Add recovery kmsg to dropbox 
automerge: 6aa6733

* commit '6aa6733cf8ae79adb703e4cdfd33de5385c970c1':
  Add recovery kmsg to dropbox
 2014-12-10 18:58:12 +00:00
smain@google.com
835ad71635 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 
automerge: 6c1facd

* commit '6c1facdc40bbb02ca5390e0281f1e72172c8065e':
  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 18:56:52 +00:00
Joe Fernandez
b721e45a43 am 913a683d: am f8527c7f: am c3ae2596: am 1e824284: Merge "docs: Add Distributing to Android Wear doc" into lmp-docs 
automerge: caad620

* commit 'caad620d042628457bcad5850f889f46250a2d7c':
  docs: Add Distributing to Android Wear doc
 2014-12-10 18:55:29 +00:00
Ricardo Cervera
b33c8fb4b5 am 600224c9: am 730a52d0: am eb09f898: am d412b9ab: Merge "docs: Add new classes to Wearable UI library" into lmp-docs 
automerge: 768d97d

* commit '768d97d0b6f3e416deaf29d1c8ca139337af334c':
  docs: Add new classes to Wearable UI library
 2014-12-10 18:53:59 +00:00
Ricardo Cervera
9c6e82e70e am 45ea5690: am 5edaf136: am be80b984: am 0d8f1417: Merge "docs: Add links to wearable support zip for ADT" into lmp-docs 
automerge: 739d0a8c

* commit '739d0a8c6b08abcdc56d592e05f3ad7c01e5b5d2':
  docs: Add links to wearable support zip for ADT
 2014-12-10 18:52:44 +00:00
Quddus Chong
d710011151 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 
automerge: 20baf9e

* commit '20baf9e47e8e89ff595a843de54867fb56a5580d':
  docs: Updated GMS highlights for v6.5 (Nacho) to reflect removal of LocationClient, PlusClient, and ActivityRecognitionClient.
 2014-12-10 18:51:16 +00:00
Andre Eisenbach
f60f29d060 am c9149984: Merge "Prevent NullPointerException in getStringValue if no value is set" into lmp-mr1-dev 
automerge: e832393

* commit 'e8323934c7dd01228b6550ac5dcad08999371a61':
  Prevent NullPointerException in getStringValue if no value is set
 2014-12-10 18:49:41 +00:00
Eric Laurent
093789755e resolved conflicts for merge of 5196dd04 to lmp-mr1-dev-plus-aosp 
Change-Id: I34063a9a516e0d9d209d3176279ef4266b6a113d
 2014-12-10 10:42:08 -08:00
Craig Mautner
93c5cf6a6f am 7438b57c: am 2de55513: Merge "Only one task within the stack should moveToBack" 
* commit '7438b57c8d1e1649c51c570fe71aef861854730d':
  Only one task within the stack should moveToBack
 2014-12-10 18:04:52 +00:00
Craig Mautner
7438b57c8d am 2de55513: Merge "Only one task within the stack should moveToBack" 
* commit '2de55513f81b238ea42b2b36cbf61e8c1a475c45':
  Only one task within the stack should moveToBack
 2014-12-10 17:57:34 +00:00
Craig Mautner
2de55513f8 Merge "Only one task within the stack should moveToBack" 2014-12-10 17:51:32 +00:00
Jason Monk
9309db894d am 28fffd58: Merge "CarrierText clear itself when no mob. data support" into lmp-mr1-dev 
* commit '28fffd58a1e9eea2e84c15b124cbfde1c8dbb2c8':
  CarrierText clear itself when no mob. data support
 2014-12-10 14:33:00 +00:00
Geoff Mendal
f6e388231d Import translations. DO NOT MERGE 
Change-Id: I76e8da5cbb1d3c5e39ea80ebdc0f4f9b129febf7
Auto-generated-cl: translation import
 2014-12-10 06:31:09 -08:00
Jason Monk
28fffd58a1 Merge "CarrierText clear itself when no mob. data support" into lmp-mr1-dev 2014-12-10 14:25:39 +00:00
Erik Kline
56d2e8fb7b am 33cd463b: Merge "Re-remove CONNECTIVITY_CHANGE_DELAY and supporting functions." into lmp-mr1-dev 
* commit '33cd463bbbbe47010ed44815fbfd0ab5e8fbf825':
  Re-remove CONNECTIVITY_CHANGE_DELAY and supporting functions.
 2014-12-10 07:36:35 +00:00
Erik Kline
33cd463bbb Merge "Re-remove CONNECTIVITY_CHANGE_DELAY and supporting functions." into lmp-mr1-dev 2014-12-10 07:29:47 +00:00
Ricardo Cervera
e4afef448d am 7cc203d7: am f49c37e7: am 933005e9: am 900efcc9: docs: Add details to Packaging Wearable apps. 
* commit '7cc203d73418316628818883ea66ad8f1eebaf45':
  docs: Add details to Packaging Wearable apps.
 2014-12-10 06:05:54 +00:00
Joe Fernandez
39409f28e6 am 17cf7789: am 5ff08052: am dfd05f0a: am 1832978c: Merge "docs: Update wording on Packaging requirement description. Add Watch Face requirement." into lmp-docs 
* commit '17cf77898af530dc8672e74b32ed4a210e951cef':
  docs: Update wording on Packaging requirement description. Add Watch Face requirement.
 2014-12-10 06:05:49 +00:00
Ricardo Cervera
7cc203d734 am f49c37e7: am 933005e9: am 900efcc9: docs: Add details to Packaging Wearable apps. 
* commit 'f49c37e723b2f1b4f03cce0b205feb84e9c18648':
  docs: Add details to Packaging Wearable apps.
 2014-12-10 05:57:22 +00:00
Joe Fernandez
17cf77898a am 5ff08052: am dfd05f0a: am 1832978c: Merge "docs: Update wording on Packaging requirement description. Add Watch Face requirement." into lmp-docs 
* commit '5ff0805238787f938bf5bcadba46ac8f92e8d440':
  docs: Update wording on Packaging requirement description. Add Watch Face requirement.
 2014-12-10 05:57:19 +00:00
Ricardo Cervera
a41a241f6e am d56b7a39: am 504e213f: am ea15366a: am 26e21055: Merge "docs: Creating Custom Watch Faces training class." into lmp-docs 
* commit 'd56b7a39e1be1bec10032c256a28ba88b693cb0e':
  docs: Creating Custom Watch Faces training class.
 2014-12-10 05:53:36 +00:00
Ricardo Cervera
7061697bfd am 2a34e719: am c0d08616: am c6361d8d: Merge "docs: Add details to Packaging Wearable apps." into lmp-dev 
* commit '2a34e71947e9009672a9df180aad9658fa03dc10':
  docs: Add details to Packaging Wearable apps.
 2014-12-10 05:53:31 +00:00
Ricardo Cervera
f49c37e723 am 933005e9: am 900efcc9: docs: Add details to Packaging Wearable apps. 
* commit '933005e9e2912a5695ae8b1eeadcb77b05309d2d':
  docs: Add details to Packaging Wearable apps.
 2014-12-10 05:49:52 +00:00
Joe Fernandez
5ff0805238 am dfd05f0a: am 1832978c: Merge "docs: Update wording on Packaging requirement description. Add Watch Face requirement." into lmp-docs 
* commit 'dfd05f0a867a4c5f6d940aa41a11c034fb7934ab':
  docs: Update wording on Packaging requirement description. Add Watch Face requirement.
 2014-12-10 05:49:49 +00:00
Ricardo Cervera
d56b7a39e1 am 504e213f: am ea15366a: am 26e21055: Merge "docs: Creating Custom Watch Faces training class." into lmp-docs 
* commit '504e213fd514f7210eaa95df48620c26c0382487':
  docs: Creating Custom Watch Faces training class.
 2014-12-10 05:46:39 +00:00
Ricardo Cervera
2a34e71947 am c0d08616: am c6361d8d: Merge "docs: Add details to Packaging Wearable apps." into lmp-dev 
* commit 'c0d08616f2280d7c7359bf27e33c0c012a906803':
  docs: Add details to Packaging Wearable apps.
 2014-12-10 05:46:34 +00:00
Ricardo Cervera
933005e9e2 am 900efcc9: docs: Add details to Packaging Wearable apps. 
* commit '900efcc91c980a0b30fc1d3017e33e30198b8eb8':
  docs: Add details to Packaging Wearable apps.
 2014-12-10 05:43:00 +00:00
Ricardo Cervera
1b46c2ccb7 am 0342d70e: am f94ee2c1: am ec656c51: am 0024f12d: Merge "docs: Design guidelines for watch faces draft." into lmp-docs 
* commit '0342d70e4ee97bbb4e7d21826786065beb13f0fe':
  docs: Design guidelines for watch faces draft.
 2014-12-10 05:42:57 +00:00
Joe Fernandez
dfd05f0a86 am 1832978c: Merge "docs: Update wording on Packaging requirement description. Add Watch Face requirement." into lmp-docs 
* commit '1832978cf6355515016139e453ced187f4b4e29d':
  docs: Update wording on Packaging requirement description. Add Watch Face requirement.
 2014-12-10 05:42:56 +00:00
Ricardo Cervera
504e213fd5 am ea15366a: am 26e21055: Merge "docs: Creating Custom Watch Faces training class." into lmp-docs 
* commit 'ea15366ae304844756ebdd3d0464b8f9f8d9ce9f':
  docs: Creating Custom Watch Faces training class.
 2014-12-10 05:39:40 +00:00
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 07c9c63e3d)

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