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

5452 Commits

Author SHA1 Message Date
Svetoslav
6d803dede7 am 410fc394: am ef2088a2: Merge "Handle print serivce crashes." into klp-dev 
* commit '410fc39444d479ee708193ac2ae1a81b72187dd3':
  Handle print serivce crashes.
 2013-09-12 16:44:37 -07:00
Svetoslav
410fc39444 am ef2088a2: Merge "Handle print serivce crashes." into klp-dev 
* commit 'ef2088a26a42621329c6b9fecb323566e19490e4':
  Handle print serivce crashes.
 2013-09-12 13:27:47 -07:00
Svetoslav
ef2088a26a Merge "Handle print serivce crashes." into klp-dev 2013-09-12 20:24:40 +00:00
Vinit Deshapnde
b20642b999 am 2f2184b7: am 074dc2eb: Merge "Don\'t restore EAP-TLS networks from backup" into klp-dev 
* commit '2f2184b755f995dcf661c383b520e4a36f8a432d':
  Don't restore EAP-TLS networks from backup
 2013-09-12 10:59:42 -07:00
Vinit Deshapnde
2f2184b755 am 074dc2eb: Merge "Don\'t restore EAP-TLS networks from backup" into klp-dev 
* commit '074dc2eb2da23976bc2916cfe7c61dfcd9977e8f':
  Don't restore EAP-TLS networks from backup
 2013-09-12 10:56:15 -07:00
Vinit Deshapnde
074dc2eb2d Merge "Don't restore EAP-TLS networks from backup" into klp-dev 2013-09-12 17:53:39 +00:00
Svetoslav
c6066799ad Handle print serivce crashes. 
1. Now after a print service crashes we are bringing it to the same
    state of its lifecycle. For example, if a service does a discovery
    and crashes we recreate the discovery session call the start
    discovery method and so on.

2. Turned off debugging logs since we have fully fledged state dump.

bug:10697779

Change-Id: Id790537461428e96b197eef12258996bda2bd1ce
 2013-09-12 10:52:26 -07:00
John Spurlock
0159c6194f am 932c1251: am 43c70b0c: Merge "Status bar interaction veto revoked on ups/cancels." into klp-dev 
* commit '932c1251e412abd8a7555fdf8346bb71defd17d7':
  Status bar interaction veto revoked on ups/cancels.
 2013-09-12 09:22:25 -07:00
Jeff Sharkey
d4aa10d5be am c3414dc4: am 357f9e34: Merge "Handle pipe thumbnails, acquire unstable refs." into klp-dev 
* commit 'c3414dc4baf2bb2c3ef5761912fea7f44d804ebc':
  Handle pipe thumbnails, acquire unstable refs.
 2013-09-12 09:22:22 -07:00
John Spurlock
932c1251e4 am 43c70b0c: Merge "Status bar interaction veto revoked on ups/cancels." into klp-dev 
* commit '43c70b0ccface3e7e0730d9bc0a46b90f16c4b17':
  Status bar interaction veto revoked on ups/cancels.
 2013-09-12 09:17:05 -07:00
Jeff Sharkey
c3414dc4ba am 357f9e34: Merge "Handle pipe thumbnails, acquire unstable refs." into klp-dev 
* commit '357f9e34ca4f0336e406044db35834530379db47':
  Handle pipe thumbnails, acquire unstable refs.
 2013-09-12 09:17:02 -07:00
John Spurlock
43c70b0ccf Merge "Status bar interaction veto revoked on ups/cancels." into klp-dev 2013-09-12 16:05:56 +00:00
Jeff Sharkey
357f9e34ca Merge "Handle pipe thumbnails, acquire unstable refs." into klp-dev 2013-09-12 16:00:40 +00:00
John Spurlock
5fee8360f8 Status bar interaction veto revoked on ups/cancels. 
If we get an ACTION_UP or ACTION_CANCEL and the shade is not
expanded, treat this as a signal of !interacting, revoking
the interaction veto.

Bug:10711758
Change-Id: Ia69ff24880193fa8d99ece79053eeb95dfa9ba71
 2013-09-12 11:35:08 -04:00
Baligh Uddin
6304f68dfd Merge "Import translations. DO NOT MERGE" 2013-09-12 02:47:14 +00:00
Baligh Uddin
541db90bf7 Merge "Import translations. DO NOT MERGE" 2013-09-12 02:46:19 +00:00
Baligh Uddin
4dff98689d Merge "Import translations. DO NOT MERGE" into klp-dev 2013-09-12 02:46:12 +00:00
Baligh Uddin
1d7d66fe9d Merge "Import translations. DO NOT MERGE" 2013-09-12 02:46:08 +00:00
Baligh Uddin
629b37fb0e Merge "Import translations. DO NOT MERGE" 2013-09-12 02:45:58 +00:00
Baligh Uddin
c57bd8b996 Merge "Import translations. DO NOT MERGE" into klp-dev 2013-09-12 02:45:52 +00:00
Baligh Uddin
7b476f598e Merge "Import translations. DO NOT MERGE" 2013-09-12 02:45:08 +00:00
Jeff Sharkey
de2b22fbc6 Handle pipe thumbnails, acquire unstable refs. 
Support decoding thumbnails delivered over pipes by wrapping in a
buffered stream.  Also switch to using unstable provider references
to avoid crashing DocumentsUI.

Bug: 10516148, 10510851
Change-Id: I85f6eeaca70c97742bf79656d1d0c6da381fdd47
 2013-09-11 17:33:52 -07:00
Jeff Sharkey
123eeea6d6 am e2d76fa8: am cecccecc: Merge changes Ib1274847,I2eb2a1bf into klp-dev 
* commit 'e2d76fa8c6d0f5c3d1a73a3ec9756c4bc545806d':
  Fix SDK build.
  Request all tethering interfaces, fix corruption.
 2013-09-11 17:23:29 -07:00
Sandeep Siddhartha
6f64688bc8 am 6c5e9fb4: am f702286c: Merge "Remove HotwordRecognition APIs" into klp-dev 
* commit '6c5e9fb4c4215f76a8a1fd8d72eee1154deb1039':
  Remove HotwordRecognition APIs
 2013-09-11 17:22:55 -07:00
Amith Yamasani
b5dec6a606 am dd9157ce: am b926d484: Merge "Handle the case where the restore environment doesn\'t have the ringtone" into klp-dev 
* commit 'dd9157ce314f3b8d20f6b65a6f9dbf00acbe7ea1':
  Handle the case where the restore environment doesn't have the ringtone
 2013-09-11 17:22:35 -07:00
Jeff Sharkey
e2d76fa8c6 am cecccecc: Merge changes Ib1274847,I2eb2a1bf into klp-dev 
* commit 'ceccceccffbd2668b98e21487f2323f80d2c7b98':
  Fix SDK build.
  Request all tethering interfaces, fix corruption.
 2013-09-11 13:19:12 -07:00
Jeff Sharkey
ceccceccff Merge changes Ib1274847,I2eb2a1bf into klp-dev 
* changes:
  Fix SDK build.
  Request all tethering interfaces, fix corruption.
 2013-09-11 20:16:59 +00:00
Sandeep Siddhartha
6c5e9fb4c4 am f702286c: Merge "Remove HotwordRecognition APIs" into klp-dev 
* commit 'f702286c94f0df9fc147135c19f12ef34e8594c9':
  Remove HotwordRecognition APIs
 2013-09-11 12:06:29 -07:00
Sandeep Siddhartha
f702286c94 Merge "Remove HotwordRecognition APIs" into klp-dev 2013-09-11 19:01:51 +00:00
Baligh Uddin
86ad10f874 Import translations. DO NOT MERGE 
Change-Id: I2dfe3d6bca7948bce139f0f0f1404214ad8c99f2
Auto-generated-cl: translation import
 2013-09-11 11:51:26 -07:00
Baligh Uddin
38a3dfdb9e Import translations. DO NOT MERGE 
Change-Id: I6f30db92a5f2fa7f6c6073b6b9c530ae0436583b
Auto-generated-cl: translation import
 2013-09-11 11:49:10 -07:00
Baligh Uddin
243a2c4293 Import translations. DO NOT MERGE 
Change-Id: I92fdf6e34e65d70e813b5f3f5139659fb0eab2ce
Auto-generated-cl: translation import
 2013-09-11 11:46:30 -07:00
Baligh Uddin
ca892360a0 Import translations. DO NOT MERGE 
Change-Id: I41d53a68f479490dab20dc25d2d020ec098a1ff8
Auto-generated-cl: translation import
 2013-09-11 11:45:08 -07:00
Amith Yamasani
dd9157ce31 am b926d484: Merge "Handle the case where the restore environment doesn\'t have the ringtone" into klp-dev 
* commit 'b926d484a76eda4152ba46d3ef517517226ca699':
  Handle the case where the restore environment doesn't have the ringtone
 2013-09-11 11:30:08 -07:00
Baligh Uddin
e5147ca951 Import translations. DO NOT MERGE 
Change-Id: I218b96b7b7984751f31982cfcd6e574f6f0a813d
Auto-generated-cl: translation import
 2013-09-11 11:17:09 -07:00
Baligh Uddin
caaf6979f3 Import translations. DO NOT MERGE 
Change-Id: I00a9521d0ac1e2463268295d1ea09f2894b1618c
Auto-generated-cl: translation import
 2013-09-11 11:15:47 -07:00
Amith Yamasani
2e804444d6 Handle the case where the restore environment doesn't have the ringtone 
Bug: 10130785

uncanonicalize() can return a null now, so abort restoring the ringtone
in that case.

Change-Id: I28765818c8d3e1fb3f271afdfe66ebc955cfcefe
 2013-09-11 11:11:19 -07:00
Sandeep Siddhartha
65a6ba3478 Remove HotwordRecognition APIs 
- and its usage from Keyguard

Bug: 10708010
Change-Id: Ic4a695a1d0e9312706a3b4ff01e59e2567b6ad9c
 2013-09-11 11:01:13 -07:00
John Spurlock
b5d90ec386 am 7bb21556: am ec7a6ea8: Merge "Add activity indicator icons to quick settings tiles." into klp-dev 
* commit '7bb21556e7e012163fcad56924ca3d9a644d540e':
  Add activity indicator icons to quick settings tiles.
 2013-09-11 10:11:32 -07:00
Daniel Sandler
defb56f692 am d6360a28: am ab6284f1: Merge "New orange color for status bar + qs assets." into klp-dev 
* commit 'd6360a28af56da80cfcc8afad46b4510b4374cbd':
  New orange color for status bar + qs assets.
 2013-09-11 10:11:22 -07:00
John Spurlock
c995b8d6f2 am 79897c0d: am 79ec2a15: Don\'t rely on window state when disabling the panel. 
* commit '79897c0db03448c3465159999e1ffd0296e23cee':
  Don't rely on window state when disabling the panel.
 2013-09-11 10:11:19 -07:00
Baligh Uddin
8d2d844a91 Import translations. DO NOT MERGE 
Change-Id: Ib53dd615609a9ecb1ac6b260f0824a0647c2194a
Auto-generated-cl: translation import
 2013-09-11 10:09:06 -07:00
Jeff Sharkey
aca405cd59 Fix SDK build. 
Change-Id: Ib12748478cb1b42621454ab2035fb8f3163b6ac8
 2013-09-11 09:14:16 -07:00
John Spurlock
7bb21556e7 am ec7a6ea8: Merge "Add activity indicator icons to quick settings tiles." into klp-dev 
* commit 'ec7a6ea84578be91e04a54331ea4ca63e7fb69e1':
  Add activity indicator icons to quick settings tiles.
 2013-09-11 07:51:25 -07:00
John Spurlock
ec7a6ea845 Merge "Add activity indicator icons to quick settings tiles." into klp-dev 2013-09-11 14:50:08 +00:00
John Spurlock
43670879fa Add activity indicator icons to quick settings tiles. 
Wifi + RSSI now have activity in / activity out indicators
wired up to information coming from NetworkController.

Bug: 10634208
Change-Id: I3cf29dc905eeaeb4aea8e7df4fe46e70645e0013
 2013-09-11 10:04:44 -04:00
Daniel Sandler
d6360a28af am ab6284f1: Merge "New orange color for status bar + qs assets." into klp-dev 
* commit 'ab6284f1e0224fcbf07de5bd0c1e9ed58509946a':
  New orange color for status bar + qs assets.
 2013-09-11 06:53:36 -07:00
John Spurlock
79897c0db0 am 79ec2a15: Don\'t rely on window state when disabling the panel. 
* commit '79ec2a15f791ca583c97fa8de772347f93cec568':
  Don't rely on window state when disabling the panel.
 2013-09-11 06:53:32 -07:00
Daniel Sandler
ab6284f1e0 Merge "New orange color for status bar + qs assets." into klp-dev 2013-09-11 13:51:19 +00:00
John Spurlock
79ec2a15f7 Don't rely on window state when disabling the panel. 
Bug:10488453
Change-Id: I09ffbf166dd34489064cf0d73fe7ae4dd356c6c9
 2013-09-11 09:28:49 -04:00