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

113224 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Primiano Tucci
2442675002 Adding freeMemoryForTests static method to WebView. 
This is going to be used by pagecycler tests.
See: b/10629847

Change-Id: Ie3fda214e7808429d7ed63734ab301525f58513f
 2013-09-12 10:58:29 +01:00
Narayan Kamath
d6b37fdf6c Allow SSL caches to be installed directly on SSLContexts. 
This allows clients to enable ssl session caching without
having to use SSLCertificateSocketFactory.

Change-Id: Id63b8b31f51c96e73beefe9ecc5fd0cf0a1852c6
 2013-09-11 08:49:59 +00:00
Jeff Sharkey
a45580793c am a339f2e5: am 1434a407: Merge "More tweaks to match UX spec." into klp-dev 
* commit 'a339f2e5bbcfa94e9ba2cee9734a699816f3a413':
  More tweaks to match UX spec.
 2013-09-10 21:23:08 -07:00
Jeff Sharkey
a339f2e5bb am 1434a407: Merge "More tweaks to match UX spec." into klp-dev 
* commit '1434a4075d4582d932023b1720b2a1213e6ea282':
  More tweaks to match UX spec.
 2013-09-10 21:20:46 -07:00
Jeff Sharkey
1434a4075d Merge "More tweaks to match UX spec." into klp-dev 2013-09-11 04:18:13 +00:00
Jeff Sharkey
ed903213e6 More tweaks to match UX spec. 
Fixed text colors to match spec.  Behold The Greyening!  Centered
loader spinner in grid mode.  Show multiple lines in status messages.

Add string descriptions.  Fix bug where toggling size setting didn't
kick a UI rebind.

Bug: 10510022
Change-Id: Icb41ebeb4de0fed8c04fc6cf5213af1587b72641
 2013-09-10 20:04:11 -07:00
Tor Norbye
78d0005027 Merge "Add @NotNull, @Nullable, and @IntDef/@StringDef annotations" 2013-09-11 01:24:02 +00:00
Jeff Brown
a6b9a0e1cc am cf667ad7: am 2f1ef77c: Merge "WirelessChargerDetector: Work around bad sensor timestamps." into klp-dev 
* commit 'cf667ad7d77559cde0416e2f97a60827acf5e73d':
  WirelessChargerDetector: Work around bad sensor timestamps.
 2013-09-10 17:40:36 -07:00
Jeff Brown
cf667ad7d7 am 2f1ef77c: Merge "WirelessChargerDetector: Work around bad sensor timestamps." into klp-dev 
* commit '2f1ef77c07da2ed7168f75551dd632026b20f8cc':
  WirelessChargerDetector: Work around bad sensor timestamps.
 2013-09-10 17:38:31 -07:00
Jeff Brown
2f1ef77c07 Merge "WirelessChargerDetector: Work around bad sensor timestamps." into klp-dev 2013-09-11 00:35:39 +00:00
Jeff Brown
20e2875343 WirelessChargerDetector: Work around bad sensor timestamps. 
It turns out that on some devices the sensor event timestamp
may be non-monotonic.  This may cause the detector to hold
a wakelock indefinitely if the time jumps backwards.  These
timestamps are not well tested in general so there may be
other artifacts as well.  Use elapsed realtime instead.

Bug: 9926451
Change-Id: Idb0b316e22b23aac86837bd25b953daf49f9b758
 2013-09-10 17:17:08 -07:00
Jeff Sharkey
d375d07538 am fa907baf: am 042bd400: Merge "Include system packages in packages.list." into klp-dev 
* commit 'fa907baf5eaaf3efe4259a40b4ea4305881b0450':
  Include system packages in packages.list.
 2013-09-10 17:15:34 -07:00
Jeff Sharkey
fa907baf5e am 042bd400: Merge "Include system packages in packages.list." into klp-dev 
* commit '042bd400547dda7dce4a526fb3b68303fa934229':
  Include system packages in packages.list.
 2013-09-10 17:12:30 -07:00
Amith Yamasani
41be933285 am 485d9afe: am a0a47c73: Merge "Backup and restore ringtone and notification ringtone" into klp-dev 
* commit '485d9afe60c2e42ccccd95d7934c24c5c8b2c995':
  Backup and restore ringtone and notification ringtone
 2013-09-10 17:08:45 -07:00
Jeff Sharkey
042bd40054 Merge "Include system packages in packages.list." into klp-dev 2013-09-11 00:07:42 +00:00
Amith Yamasani
485d9afe60 am a0a47c73: Merge "Backup and restore ringtone and notification ringtone" into klp-dev 
* commit 'a0a47c737951db52af4943f5737da48d30adc6fe':
  Backup and restore ringtone and notification ringtone
 2013-09-10 17:05:45 -07:00
Jeff Sharkey
d7ae147446 am bd56a17d: am af4d039f: Merge "More UX work for thumbnails, search, management." into klp-dev 
* commit 'bd56a17df26a3c7f4e32ca3be08fbf28f625dffa':
  More UX work for thumbnails, search, management.
 2013-09-10 17:05:07 -07:00
Amith Yamasani
a0a47c7379 Merge "Backup and restore ringtone and notification ringtone" into klp-dev 2013-09-11 00:03:50 +00:00
Jeff Sharkey
bd56a17df2 am af4d039f: Merge "More UX work for thumbnails, search, management." into klp-dev 
* commit 'af4d039fb3a45d4a74683a69ee48071b8338a13d':
  More UX work for thumbnails, search, management.
 2013-09-10 17:02:11 -07:00
Jeff Sharkey
af4d039fb3 Merge "More UX work for thumbnails, search, management." into klp-dev 2013-09-10 23:59:43 +00:00
Jeff Brown
279f3cdf70 am 9993f8ff: am dc6fd0a2: Merge "Propagate input ANR reason to activity manager log." into klp-dev 
* commit '9993f8ff24718553c05872d9f13f4114701b3428':
  Propagate input ANR reason to activity manager log.
 2013-09-10 16:58:06 -07:00
Jeff Sharkey
cc8f710a50 Include system packages in packages.list. 
This provides group membership to the FUSE daemon, since system
packages like NFC and Bluetooth hold sdcard_rw.

Bug: 10610659
Change-Id: I7428e999cfa4087ffe220b9d8bd80827191ab997
 2013-09-10 16:57:24 -07:00
Jeff Brown
9993f8ff24 am dc6fd0a2: Merge "Propagate input ANR reason to activity manager log." into klp-dev 
* commit 'dc6fd0a20a095ac0fb544184d8a4258e80b4a14d':
  Propagate input ANR reason to activity manager log.
 2013-09-10 16:55:25 -07:00
Jeff Brown
dc6fd0a20a Merge "Propagate input ANR reason to activity manager log." into klp-dev 2013-09-10 23:52:53 +00:00
Jeff Brown
bd181bb832 Propagate input ANR reason to activity manager log. 
Make it a little easier to diagnose input dispatch timeouts by
providing the detailed reason as the ANR annotation in the log.

Bug: 10689184
Change-Id: Ie18fd9ad066b0673d1f57c030e027ad0085f4650
 2013-09-10 16:44:24 -07:00
Jeff Brown
d0d99a474b Merge "Fix crash when Looper used after quit." 2013-09-10 23:41:25 +00:00
Jeff Sharkey
4ec973925f More UX work for thumbnails, search, management. 
Hide non-finished downloads from normal picker UI, but keep them
around in management mode.  Uses a Uri query parameter and a hidden
API on DocumentsProvider.

Scale thumbnails to fit viewport, always show MIME icon while waiting
on thumbnails, and crossfade between them.  Cancel thumbnail tasks
when views are recycled.

Filter directories out of search results for now.  Also leave sort
ordering from backend intact, since it's custom ranking.  Fix
SearchView interaction to dismiss properly and restore across
orientation and drawer state changes.

Hide most actions when drawer is open.  Invalidate RootInfo cache
when locale changes.  Apply sort ordering when showing recent create
directories.  Hide recent summary string when icon is enough for user
to disambiguate.

Bug: 10667184, 10665663
Change-Id: I331d3272a08c497f88dc659d9e112231cb35aa69
 2013-09-10 16:40:36 -07:00
Yorke Lee
a6eba00dde am 2f38d460: am 4459f498: Merge "Update javadocs for number presentation" into klp-dev 
* commit '2f38d460f38efc2cadc6dce0f924fa1523123200':
  Update javadocs for number presentation
 2013-09-10 16:33:34 -07:00
Yorke Lee
2f38d460f3 am 4459f498: Merge "Update javadocs for number presentation" into klp-dev 
* commit '4459f49869d85a4c88cfa311a9a2af45ecc8d056':
  Update javadocs for number presentation
 2013-09-10 16:30:37 -07:00
Yorke Lee
4459f49869 Merge "Update javadocs for number presentation" into klp-dev 2013-09-10 23:25:15 +00:00
Alan Viverette
b1e91e37a3 Merge "Add public attr for fragmentBreadCrumbStyle, apply in constructor" 2013-09-10 23:03:42 +00:00
Yorke Lee
49e1cf946f Update javadocs for number presentation 
Bug: 10461762
Change-Id: Idfd19fb5f522569afa775ce95e0ba975324a0ee2
 2013-09-10 15:34:34 -07:00
Craig Mautner
3f339d8193 am 88cfdae6: am cdd82540: Merge "When waiting for activity to finish don\'t reset" into klp-dev 
* commit '88cfdae667bd85931c1bf81781a54472a8fe3ac7':
  When waiting for activity to finish don't reset
 2013-09-10 15:17:23 -07:00
Craig Mautner
88cfdae667 am cdd82540: Merge "When waiting for activity to finish don\'t reset" into klp-dev 
* commit 'cdd82540f2f98e7b4374fdd81e771eb217a27573':
  When waiting for activity to finish don't reset
 2013-09-10 15:14:42 -07:00
Craig Mautner
cdd82540f2 Merge "When waiting for activity to finish don't reset" into klp-dev 2013-09-10 22:11:58 +00:00
Alan Viverette
aaca5d888a Add public attr for fragmentBreadCrumbStyle, apply in constructor 
BUG: 10680808
Change-Id: I7c22c1ff0b91892e62ea6bf6a311d33df6f13d78
 2013-09-10 15:04:10 -07:00
John Reck
2f93af4574 am 53760b4a: am 874ae2ad: Merge "Fix scissor for functor invocation" into klp-dev 
* commit '53760b4a97fb2f88e94da73d647ff80221b3c454':
  Fix scissor for functor invocation
 2013-09-10 14:08:12 -07:00
John Reck
53760b4a97 am 874ae2ad: Merge "Fix scissor for functor invocation" into klp-dev 
* commit '874ae2adf8c24c4b9d68f781239a95ad047e212a':
  Fix scissor for functor invocation
 2013-09-10 14:05:32 -07:00
John Reck
874ae2adf8 Merge "Fix scissor for functor invocation" into klp-dev 2013-09-10 21:03:48 +00:00
Tim Murray
efb6beb438 am 19c727bb: am 895a4375: Merge "Fix FontRenderer bug." into klp-dev 
* commit '19c727bbc6371924bfd2f85e804b5b6b093a8413':
  Fix FontRenderer bug.
 2013-09-10 14:03:39 -07:00
Tim Murray
19c727bbc6 am 895a4375: Merge "Fix FontRenderer bug." into klp-dev 
* commit '895a43751fcf4f33e5437963d75d05c2cd754520':
  Fix FontRenderer bug.
 2013-09-10 14:01:53 -07:00
Tim Murray
895a43751f Merge "Fix FontRenderer bug." into klp-dev 2013-09-10 21:00:37 +00:00
Tim Murray
7a454ba5fe Fix FontRenderer bug. 
bug 10691313

Change-Id: Icd5341a3c2066e337911f040ddc935c48c8d7cd1
 2013-09-10 13:46:49 -07:00
John Reck
25d2f7bc1f Fix scissor for functor invocation 
Bug: 10677765
 enableScissor() must precede setScissorFromClip() as
 otherwise setScissorFromClip() doesn't do anything.
 Also make sure to call setScissorFromClip() if
 enableScissor() returns true as enableScissor() calls
 resetScissor() if the scissor state has changed.

Change-Id: I9226b20bb256c92066aae344e4e6407540b6eae9
 2013-09-10 20:45:29 +00:00
David Braun
84166e888b am 4cd9612c: am b776122a: Merge "Factor out read/write SMS settings seperate from send/receive." into klp-dev 
* commit '4cd9612c3268277581589b34cc49ed04c93873b2':
  Factor out read/write SMS settings seperate from send/receive.
 2013-09-10 13:38:12 -07:00
David Braun
4cd9612c32 am b776122a: Merge "Factor out read/write SMS settings seperate from send/receive." into klp-dev 
* commit 'b776122a8aa9fd082fa8aaa216c8a589d709c4c9':
  Factor out read/write SMS settings seperate from send/receive.
 2013-09-10 13:35:42 -07:00
Jason Monk
96f098ea01 am b28da848: am e6b4163f: Merge "Verify inputs to PAC resolving." into klp-dev 
* commit 'b28da8489619bafcc0206d3e3b725af91134a6b4':
  Verify inputs to PAC resolving.
 2013-09-10 13:34:32 -07:00
David Braun
b776122a8a Merge "Factor out read/write SMS settings seperate from send/receive." into klp-dev 2013-09-10 20:33:28 +00:00
Jason Monk
b28da84896 am e6b4163f: Merge "Verify inputs to PAC resolving." into klp-dev 
* commit 'e6b4163f38c18072ef89ec593d4647c581dd9a8a':
  Verify inputs to PAC resolving.
 2013-09-10 13:32:08 -07:00
Jason Monk
e6b4163f38 Merge "Verify inputs to PAC resolving." into klp-dev 2013-09-10 20:27:23 +00:00