Jorim Jaggi
bcce183020
am c79343ce: Merge "Fix SysUI when an app started from the affordances crashes" into lmp-mr1-dev
...
automerge: 57b440e
2014-12-10 19:16:38 +00:00
Dan Sandler
9b0f0d1142
am 35850627: Merge "BluetoothControllerImpl: track bluetooth better" into lmp-mr1-dev
...
automerge: b394253
2014-12-10 19:15:11 +00:00
Geoff Mendal
f26040f05a
am fa3f4314: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
...
automerge: 4ce2c65
2014-12-10 19:13:46 +00:00
Geoff Mendal
1fb480998d
Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
...
automerge: 83c26e1
2014-12-10 19:12:31 +00:00
Geoff Mendal
0840f961e5
am b7180c45: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
...
automerge: 2a5f0b4
2014-12-10 19:11:10 +00:00
Jason Monk
f8830fc514
am 28fffd58: Merge "CarrierText clear itself when no mob. data support" into lmp-mr1-dev
...
automerge: 9309db8
2014-12-10 19:09:42 +00:00
Geoff Mendal
e8c7fe7731
Import translations. DO NOT MERGE
...
automerge: f6e3882
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
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
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
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
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
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
2014-12-10 18:59:28 +00:00
Patrick Tjin
6b4a1c6c46
am e3703050: Add recovery kmsg to dropbox
...
automerge: 6aa6733
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
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
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
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
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
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
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
Jorim Jaggi
57b440e206
am c79343ce: Merge "Fix SysUI when an app started from the affordances crashes" into lmp-mr1-dev
...
* commit 'c79343ce6545a78fd7673f05ec0a41209be9b27d':
Fix SysUI when an app started from the affordances crashes
2014-12-10 16:40:09 +00:00
Jorim Jaggi
c79343ce65
Merge "Fix SysUI when an app started from the affordances crashes" into lmp-mr1-dev
2014-12-10 16:32:20 +00:00
Jorim Jaggi
826730aeb9
Fix SysUI when an app started from the affordances crashes
...
- Fix infinite recursion in this case.
- If the app crashes, we are waiting for either setOccluded or
hideKeyguard to be called. However, neither of these gets called
in this case, so we recover from it by adding a timeout of 5
seconds.
Bug: 18652789
Change-Id: Ib9a043f5692a8578703df1db08e1a6b9dcfbc742
2014-12-10 17:22:58 +01:00
Dan Sandler
b394253a3f
am 35850627: Merge "BluetoothControllerImpl: track bluetooth better" into lmp-mr1-dev
...
* commit '3585062760990b8ec3148b266155ae9ec033934d':
BluetoothControllerImpl: track bluetooth better
2014-12-10 15:53:59 +00:00
Dan Sandler
3585062760
Merge "BluetoothControllerImpl: track bluetooth better" into lmp-mr1-dev
2014-12-10 15:43:43 +00:00
Jason Monk
4630c89a76
BluetoothControllerImpl: track bluetooth better
...
Match settings behavior better:
- Get connection info from profiles so it is for all devices
(CONNECTION_STATE_CHANGED only updates one)
- Disconnect from all known connections so that 'x' does something
- When device is disconnected without CONNECTION_STATE_CHANGED
then find a new 'last' device that is connected
- Listen to a bunch more broadcasts to make sure info is always
up to date.
Bug: 18210666
Bug: 18638010
Change-Id: Ie003b67bbdd0d452b7472c644d90bca929e5cd29
2014-12-10 10:32:43 -05:00
Geoff Mendal
4ce2c654bd
am fa3f4314: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
...
* commit 'fa3f43145ac1af62ed063d3cd7ba1c30a81bb3fd':
Import translations. DO NOT MERGE
2014-12-10 15:00:58 +00:00
Geoff Mendal
83c26e18fc
Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
2014-12-10 15:00:16 +00:00
Geoff Mendal
da0571b7e5
Import translations. DO NOT MERGE
...
Change-Id: I9cdc7fac5598329caf1ec9532c197d9a0fe8dbbf
Auto-generated-cl: translation import
2014-12-10 06:59:21 -08:00
Geoff Mendal
fa3f43145a
Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
2014-12-10 14:54:48 +00:00
Geoff Mendal
a65ea3dfdc
Import translations. DO NOT MERGE
...
Change-Id: Icfd467c7b204b82119ee78b0bfa34d385786d251
Auto-generated-cl: translation import
2014-12-10 06:52:52 -08:00
Geoff Mendal
2a5f0b4e3b
am b7180c45: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
...
* commit 'b7180c450e8364077f37f792160c94941d8839c6':
Import translations. DO NOT MERGE
2014-12-10 14:33:06 +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
Geoff Mendal
b7180c450e
Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
2014-12-10 14:30:40 +00:00
Geoff Mendal
aa72294174
Import translations. DO NOT MERGE
...
Change-Id: I63ccbdea01d869627116121f95c9d35cd64da04e
Auto-generated-cl: translation import
2014-12-10 06:26:53 -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
