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

5463 Commits

Author SHA1 Message Date
Svetoslav
90ce2f3f52 am 9282b9ac: am b72ff5aa: Merge "Remove unneeded print APIs and update the min margins APIs." into klp-dev 
* commit '9282b9ac8eda1591bb54b46ddc4e88da1c2f0c56':
  Remove unneeded print APIs and update the min margins APIs.
 2013-09-12 21:42:28 -07:00
Jeff Sharkey
156ba58f9b am cf76be71: am 95a6560f: Merge "DocumentsUI tablet support." into klp-dev 
* commit 'cf76be7195fc42ac6d72cb2d38309894fff4d368':
  DocumentsUI tablet support.
 2013-09-12 21:42:22 -07:00
Svetoslav
9282b9ac8e am b72ff5aa: Merge "Remove unneeded print APIs and update the min margins APIs." into klp-dev 
* commit 'b72ff5aa4b8be587bcea82761aa08cd8c14b8b48':
  Remove unneeded print APIs and update the min margins APIs.
 2013-09-12 21:37:37 -07:00
Jeff Sharkey
cf76be7195 am 95a6560f: Merge "DocumentsUI tablet support." into klp-dev 
* commit '95a6560f63563aeb36a56fb0384685a2f925d3c1':
  DocumentsUI tablet support.
 2013-09-12 21:37:18 -07:00
Svetoslav
b72ff5aa4b Merge "Remove unneeded print APIs and update the min margins APIs." into klp-dev 2013-09-13 01:43:41 +00:00
Jeff Sharkey
95a6560f63 Merge "DocumentsUI tablet support." into klp-dev 2013-09-13 00:21:53 +00:00
Svetoslav
651dd4e6ee Remove unneeded print APIs and update the min margins APIs. 
1. Removed unneeded code in Resolution that was storing its
   label as resource and package name. We do not have predefined
   resolutions, therefore we always persist the label.

2. Renamed the print attribute margins to minMargins to reflect
   that these are the minimal margins the printer support. Updated
   the docs as well.

3. Renamed the create method of all builder to build.

bug:10727487

Change-Id: Ie72ab8aaa5215b8bd2853885011b3b4efa4deb2e
 2013-09-12 16:58:58 -07:00
Svetoslav
f4f613b127 am a03cf04b: am 25f17f29: Merge "Not change the print options on printer change if possible." into klp-dev 
* commit 'a03cf04b8d7bd47dac94208cb1f5df3230a36e86':
  Not change the print options on printer change if possible.
 2013-09-12 16:45:37 -07:00
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
Jeff Sharkey
88f322c311 DocumentsUI tablet support. 
Shows as a faux dialog on larger tablets, since the normal dialog
themes from framework don't support action bars.  Instead, this hacks
itself to look like a dialog with an InsetDrawable.  Detects touches
in dim area to dismiss dialog.

Show all action bar icons on tablets, and roots panel is always
visible with a different shadow. Show settings in dialog. Allow mode
switches in recents.

Bug: 10329832
Change-Id: Id02982ce7b0d4694962d32f8d5286fdfcc207208
 2013-09-12 16:39:50 -07:00
Svetoslav
a03cf04b8d am 25f17f29: Merge "Not change the print options on printer change if possible." into klp-dev 
* commit '25f17f295b4da464a2758c11a02cabb51bf4722f':
  Not change the print options on printer change if possible.
 2013-09-12 15:40:28 -07:00
Svetoslav
cc65b0c325 Not change the print options on printer change if possible. 
If the user selects some print options from the dialog and then
changes the printer to one that has the same capabilities the
selections in the UI should not change.

bug:10631856

Change-Id: Ia76ce58c446815e3498d2f4b4739dee62d11d96a
 2013-09-12 14:29:53 -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