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

118528 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeff Sharkey
9186827629 am 66d079bf: am f7eb3398: am 19949b9d: Merge "Guard against missing document columns." into klp-dev 
* commit '66d079bf25ff3f99dbba91e02d392c936238170b':
  Guard against missing document columns.
 2013-10-29 12:01:44 -07:00
Jeff Sharkey
66d079bf25 am f7eb3398: am 19949b9d: Merge "Guard against missing document columns." into klp-dev 
* commit 'f7eb3398f16f4d76d2a342cf571040360d5a6df6':
  Guard against missing document columns.
 2013-10-29 11:58:21 -07:00
Jeff Sharkey
f7eb3398f1 am 19949b9d: Merge "Guard against missing document columns." into klp-dev 
* commit '19949b9d3de584b283fa9d1ef2489d3e97a3b41a':
  Guard against missing document columns.
 2013-10-29 11:56:27 -07:00
Jeff Sharkey
19949b9d3d Merge "Guard against missing document columns." into klp-dev 2013-10-29 18:53:41 +00:00
Jeff Sharkey
5d321d472d Guard against missing document columns. 
When filtering and sorting, guard against missing columns to avoid
crashing entire app.

Bug: 11377065
Change-Id: I04f035c918d743bcc84592f05e3ef9ad0ebfadce
 2013-10-29 11:48:30 -07:00
Dirk Dougherty
e14002b30b am b752c1b5: am 718991b6: am 24445c35: Doc change: fix docs build. 
* commit 'b752c1b559a277675f90489eff4f7e7f9d03cc2f':
  Doc change: fix docs build.
 2013-10-29 11:44:50 -07:00
Dirk Dougherty
b752c1b559 am 718991b6: am 24445c35: Doc change: fix docs build. 
* commit '718991b69c3a19d3992f5151b256df3589ed3f58':
  Doc change: fix docs build.
 2013-10-29 11:41:15 -07:00
Dirk Dougherty
718991b69c am 24445c35: Doc change: fix docs build. 
* commit '24445c35211a85a92a68527fb93271eadc8d822d':
  Doc change: fix docs build.
 2013-10-29 11:38:28 -07:00
Dirk Dougherty
24445c3521 Doc change: fix docs build. 
Change-Id: Ifdb25d52629e62b0e909aa3ac00bff4df257ffd2
 2013-10-29 11:33:33 -07:00
Dirk Dougherty
aed5da3fbe am 96e6ef62: am 57449569: am 3bdf60dc: Merge "Doc change: Add update ProGuard keep rules for Google Play Services." into klp-dev 
* commit '96e6ef623ac3e8b44e6a34c694926eb4ef847445':
  Doc change: Add update ProGuard keep rules for Google Play Services.
 2013-10-29 10:47:47 -07:00
Dirk Dougherty
96e6ef623a am 57449569: am 3bdf60dc: Merge "Doc change: Add update ProGuard keep rules for Google Play Services." into klp-dev 
* commit '57449569b7290c56f823e90bbfa1281e982ae5f5':
  Doc change: Add update ProGuard keep rules for Google Play Services.
 2013-10-29 10:44:38 -07:00
Chris Wren
7aff326aa7 am e0b3f3e1: am 4742fe3c: am 64742f84: Merge "show duration instead of remaining time." into klp-dev 
* commit 'e0b3f3e106d5b0b9eb31ed3bd43c8a536eb8d1ee':
  show duration instead of remaining time.
 2013-10-29 10:43:13 -07:00
Chris Wren
38363d14d6 am af5d6e49: am f535a6ae: am 5ab93d87: Merge "reduce garbage generation in KeyguardTransportControlView." into klp-dev 
* commit 'af5d6e49526e97a267bedf076797fde6e9589bba':
  reduce garbage generation in KeyguardTransportControlView.
 2013-10-29 10:43:09 -07:00
Dirk Dougherty
57449569b7 am 3bdf60dc: Merge "Doc change: Add update ProGuard keep rules for Google Play Services." into klp-dev 
* commit '3bdf60dc290f24d4f3f994466fb2f19d4e01d833':
  Doc change: Add update ProGuard keep rules for Google Play Services.
 2013-10-29 10:42:56 -07:00
Chris Wren
e0b3f3e106 am 4742fe3c: am 64742f84: Merge "show duration instead of remaining time." into klp-dev 
* commit '4742fe3cd79cf1f7d0c84ba87ee3ebdd5eb175d0':
  show duration instead of remaining time.
 2013-10-29 10:41:09 -07:00
Chris Wren
af5d6e4952 am f535a6ae: am 5ab93d87: Merge "reduce garbage generation in KeyguardTransportControlView." into klp-dev 
* commit 'f535a6aef04b9673a0f6748da0018b962833dd9e':
  reduce garbage generation in KeyguardTransportControlView.
 2013-10-29 10:41:06 -07:00
Dirk Dougherty
3bdf60dc29 Merge "Doc change: Add update ProGuard keep rules for Google Play Services." into klp-dev 2013-10-29 17:40:49 +00:00
Chris Wren
4742fe3cd7 am 64742f84: Merge "show duration instead of remaining time." into klp-dev 
* commit '64742f8469ce270b6ecf437a624b69dde7a5a056':
  show duration instead of remaining time.
 2013-10-29 10:39:28 -07:00
Chris Wren
f535a6aef0 am 5ab93d87: Merge "reduce garbage generation in KeyguardTransportControlView." into klp-dev 
* commit '5ab93d873f95256fdcddb8a78fa3c4a6697ec01a':
  reduce garbage generation in KeyguardTransportControlView.
 2013-10-29 10:39:25 -07:00
Chris Wren
64742f8469 Merge "show duration instead of remaining time." into klp-dev 2013-10-29 17:37:29 +00:00
Chris Wren
5ab93d873f Merge "reduce garbage generation in KeyguardTransportControlView." into klp-dev 2013-10-29 17:37:13 +00:00
Chris Wren
6af85cc2c6 show duration instead of remaining time. 
Bug: 11351406
Change-Id: I1238408c439f9cd12382d9a0889321bbb75618d3
 2013-10-29 13:19:54 -04:00
Chris Wren
cab6965b19 reduce garbage generation in KeyguardTransportControlView. 
Bug: 11243508
Change-Id: I8315c27faf935d2465b3ce9e958e6edee00a4d4d
 2013-10-29 13:04:00 -04:00
Alex Klyubin
be7f22b7a8 am 07873e3a: am 56922039: am b4cae4a9: Merge "Fix SSLCertificateSocketFactory.getDefaultCipherSuites." 
* commit '07873e3a72da254bcdf965f6fa76bdcc800ef511':
  Fix SSLCertificateSocketFactory.getDefaultCipherSuites.
 2013-10-29 08:56:18 -07:00
Alex Klyubin
07873e3a72 am 56922039: am b4cae4a9: Merge "Fix SSLCertificateSocketFactory.getDefaultCipherSuites." 
* commit '569220399841ae1a3fd62a1b77fa087bca2ee0f3':
  Fix SSLCertificateSocketFactory.getDefaultCipherSuites.
 2013-10-29 08:54:15 -07:00
Alex Klyubin
5692203998 am b4cae4a9: Merge "Fix SSLCertificateSocketFactory.getDefaultCipherSuites." 
* commit 'b4cae4a955ebd91cf35aaeb00ab12ce6f1d5fc48':
  Fix SSLCertificateSocketFactory.getDefaultCipherSuites.
 2013-10-29 08:50:28 -07:00
Alex Klyubin
b4cae4a955 Merge "Fix SSLCertificateSocketFactory.getDefaultCipherSuites." 2013-10-29 15:47:34 +00:00
Svetoslav
76a8dac72d am 3a855ba5: am a4e1f435: am ac5d3827: Merge "Share pack historical sorting using wrong keys." into klp-dev 
* commit '3a855ba5225ac6b3f85397713178a7b85069057a':
  Share pack historical sorting using wrong keys.
 2013-10-29 08:35:07 -07:00
Svetoslav
3a855ba522 am a4e1f435: am ac5d3827: Merge "Share pack historical sorting using wrong keys." into klp-dev 
* commit 'a4e1f4352149b15fa64e9b85928f0b1ba00486fb':
  Share pack historical sorting using wrong keys.
 2013-10-29 08:31:39 -07:00
Svetoslav
201006fd35 am 37a5a1ea: am 330c6be9: am 86bfb3af: Merge "Not show share targets that cannot be launched." into klp-dev 
* commit '37a5a1ea8743d439db7bc0384f62589537c21d28':
  Not show share targets that cannot be launched.
 2013-10-29 08:30:33 -07:00
Svetoslav
a4e1f43521 am ac5d3827: Merge "Share pack historical sorting using wrong keys." into klp-dev 
* commit 'ac5d3827409dff757531347c5232bb34ea727274':
  Share pack historical sorting using wrong keys.
 2013-10-29 08:28:45 -07:00
Svetoslav
37a5a1ea87 am 330c6be9: am 86bfb3af: Merge "Not show share targets that cannot be launched." into klp-dev 
* commit '330c6be9dcda95cc2666c2a0cb62ea1cfc9a1d48':
  Not show share targets that cannot be launched.
 2013-10-29 08:28:05 -07:00
Svetoslav
330c6be9dc am 86bfb3af: Merge "Not show share targets that cannot be launched." into klp-dev 
* commit '86bfb3af4296a1263cb2c01a9e87b5b20015fedb':
  Not show share targets that cannot be launched.
 2013-10-29 08:25:18 -07:00
Svetoslav
ac5d382740 Merge "Share pack historical sorting using wrong keys." into klp-dev 2013-10-29 15:24:14 +00:00
Svetoslav
86bfb3af42 Merge "Not show share targets that cannot be launched." into klp-dev 2013-10-29 15:23:27 +00:00
Michael Jurka
84661e3bbe am 36b7ea8f: am 160e8aa6: am 2b5297a4: Merge "Load wallpaper images on a bg thread" into klp-dev 
* commit '36b7ea8fac4d1ed6045b3d86266b2bb18f81c144':
  Load wallpaper images on a bg thread
 2013-10-29 05:02:36 -07:00
Michael Jurka
36b7ea8fac am 160e8aa6: am 2b5297a4: Merge "Load wallpaper images on a bg thread" into klp-dev 
* commit '160e8aa6a5188d363866c00526f28704fc61233f':
  Load wallpaper images on a bg thread
 2013-10-29 04:59:33 -07:00
Michael Jurka
160e8aa6a5 am 2b5297a4: Merge "Load wallpaper images on a bg thread" into klp-dev 
* commit '2b5297a40024e9cf136919d3ea0e88cb4ccfa27c':
  Load wallpaper images on a bg thread
 2013-10-29 04:56:17 -07:00
Michael Jurka
2b5297a400 Merge "Load wallpaper images on a bg thread" into klp-dev 2013-10-29 11:41:47 +00:00
Przemyslaw Szczepaniak
97cd647fcd TTS API: Replace "voice id" with "voice name" 
"Voice id" and "voice name" are both used to reference a voice in a
speech synthesis request. Voice id was a random integer, where
voice name is human readable string, that provides more debug
information and readability. Also, it's expected that voice name
will stay consistent, and won't change during the life of the speech
connection. Though, it may disappear.

Change-Id: I180296d413a18301cead1c8e3212de2bd0c7e32d
 2013-10-29 10:56:06 +00:00
Dirk Dougherty
1a1932749c Doc change: Add update ProGuard keep rules for Google Play Services. 
Change-Id: I39cc32c821659b82a4ebf800632571d6beaf5474
Bug-Id: 11336556
 2013-10-28 23:01:40 -07:00
Svetoslav
27f592df8c Share pack historical sorting using wrong keys. 
The ActivityChooserModel keeps a history of the last fifty
share targets and based on past usage orders the targets in
the UI. The soring implementation is using a map for improving
performance. However, the activities in this map were keyed
on the package name but there maybe more that one share
target per package. Thus, the sorting was generating bad
results. Now the unique component name is used.

bug:11195578

Change-Id: I8c7018fea168b7253ddbe57b477028368726e75e
 2013-10-28 18:43:08 -07:00
Adam Koch
f6db763bae am 59782e2d: am 45895d74: am 7fd5c53c: Merge "Displaying Bitmaps Efficiently Training - updates for KitKat inBitmap changes Bug: 10411797" into klp-dev 
* commit '59782e2d74e1e3679dafec0be20c4814b49f029a':
  Displaying Bitmaps Efficiently Training - updates for KitKat inBitmap changes Bug: 10411797
 2013-10-28 17:22:18 -07:00
Adam Koch
59782e2d74 am 45895d74: am 7fd5c53c: Merge "Displaying Bitmaps Efficiently Training - updates for KitKat inBitmap changes Bug: 10411797" into klp-dev 
* commit '45895d743dc3c0d37a097e83b1d46095ac5e2db0':
  Displaying Bitmaps Efficiently Training - updates for KitKat inBitmap changes Bug: 10411797
 2013-10-28 17:20:25 -07:00
Adam Koch
45895d743d am 7fd5c53c: Merge "Displaying Bitmaps Efficiently Training - updates for KitKat inBitmap changes Bug: 10411797" into klp-dev 
* commit '7fd5c53c4507995da1e1f1300a2f9def30bffce8':
  Displaying Bitmaps Efficiently Training - updates for KitKat inBitmap changes Bug: 10411797
 2013-10-28 17:18:28 -07:00
Craig Mautner
00b0de96a1 Merge "Remove starting window when activity is preempted." 2013-10-29 00:18:02 +00:00
Adam Koch
7fd5c53c45 Merge "Displaying Bitmaps Efficiently Training - updates for KitKat inBitmap changes Bug: 10411797" into klp-dev 2013-10-29 00:17:03 +00:00
Adam Koch
3a4a1d7174 Displaying Bitmaps Efficiently Training - updates for KitKat inBitmap changes 
Bug: 10411797

Change-Id: I720d3ade42da31400a6cc7c7ce9e15793f836363
 2013-10-28 20:08:18 -04:00
Svetoslav
d54a331111 am c19c3c8d: am c7f18b52: am 099d842b: Update javadoc to fix the build. 
* commit 'c19c3c8d045059614aaef62e3553ccd06d50782c':
  Update javadoc to fix the build.
 2013-10-28 16:44:28 -07:00
Svetoslav
c19c3c8d04 am c7f18b52: am 099d842b: Update javadoc to fix the build. 
* commit 'c7f18b526f2029e78ea609db688854439e180d31':
  Update javadoc to fix the build.
 2013-10-28 16:39:41 -07:00