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

161387 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Geoff Mendal
e1bc1c6c9f Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 2014-12-10 17:15:50 +00:00
Geoff Mendal
2f5e130d4d am 295dc004: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit '295dc00409b295d4353eefa6131189a83a29ea5f':
  Import translations. DO NOT MERGE
 2014-12-10 17:13:19 +00:00
Geoff Mendal
295dc00409 Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 2014-12-10 17:07:24 +00:00
Geoff Mendal
5b736551cc Import translations. DO NOT MERGE 
Change-Id: I3a7d9612bf4b18c14981c0a9e115fc4d320069d6
Auto-generated-cl: translation import
 2014-12-10 09:03:48 -08:00
Craig Mautner
864280369c am 7a17e0b6: Merge "Add put/getBoolean/Array to PersistableBundle" into lmp-mr1-dev 
* commit '7a17e0b601c7f65a2ae0b53d8494ae1722c7a28b':
  Add put/getBoolean/Array to PersistableBundle
 2014-12-10 17:02:10 +00:00
Craig Mautner
7a17e0b601 Merge "Add put/getBoolean/Array to PersistableBundle" into lmp-mr1-dev 2014-12-10 16:56:15 +00:00
Geoff Mendal
7e7646487e Import translations. DO NOT MERGE 
Change-Id: I101fba3b08265cb881495252573df6088a439955
Auto-generated-cl: translation import
 2014-12-10 08:40:30 -08: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
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 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