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

114749 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Scott Main
81c494b680 am 562ce888: am 8f6ed205: am 208e6079: am 0333302a: Merge "add custom head tag to verify developers@android.com as site owner" into jb-mr2-docs 
* commit '562ce888af21fc18d1610545ff6373ee2ecbbb13':
  add custom head tag to verify developers@android.com as site owner
 2013-09-20 10:12:53 -07:00
Vinit Deshapnde
0fd3b1be14 Fix incorrect exception being thrown from WifiConfiguration 
Bug: 10817189

Change-Id: Ib2985f50080cb9d983a6de6ce668223e8782c3b6
 2013-09-20 10:12:30 -07:00
Scott Main
562ce888af am 8f6ed205: am 208e6079: am 0333302a: Merge "add custom head tag to verify developers@android.com as site owner" into jb-mr2-docs 
* commit '8f6ed205a2523a8170cdd3e824170fd77c4fd65a':
  add custom head tag to verify developers@android.com as site owner
 2013-09-20 10:10:22 -07:00
Scott Main
8f6ed205a2 am 208e6079: am 0333302a: Merge "add custom head tag to verify developers@android.com as site owner" into jb-mr2-docs 
* commit '208e6079b4ccd161de198553319d285711564ea2':
  add custom head tag to verify developers@android.com as site owner
 2013-09-20 10:07:46 -07:00
Scott Main
208e6079b4 am 0333302a: Merge "add custom head tag to verify developers@android.com as site owner" into jb-mr2-docs 
* commit '0333302ad7162f66404c08e1c6c5b6b767aa78b3':
  add custom head tag to verify developers@android.com as site owner
 2013-09-20 10:04:26 -07:00
Igor Murashkin
52c77ea4d1 am a7dd66a4: am 9fa4b7af: Merge "Camera2Tests: create new directory for manual camera2 test apps" into klp-dev 
* commit 'a7dd66a4709353cd27b4482be73d2b3804cbeaa6':
  Camera2Tests: create new directory for manual camera2 test apps
 2013-09-20 09:58:48 -07:00
Yuhao Zheng
5380b780bb am 2e9a4265: am 2ce33623: Merge "Remove STOPSHIP in WifiWatchdogStateMachine" into klp-dev 
* commit '2e9a426529c54774b23609bee8d50118118ab895':
  Remove STOPSHIP in WifiWatchdogStateMachine
 2013-09-20 09:58:45 -07:00
Craig Mautner
de4232f721 am 9ea8bf15: am 7908f190: Merge "Debug for b/10689184." into klp-dev 
* commit '9ea8bf154cdad4b4cb627d9d6c9a9bc01c31abcd':
  Debug for b/10689184.
 2013-09-20 09:58:41 -07:00
Scott Main
0333302ad7 Merge "add custom head tag to verify developers@android.com as site owner" into jb-mr2-docs 2013-09-20 16:58:39 +00:00
petergng@google.com
594c72c8ed am a13e5dd3: am fe4643bb: Merge "Increasing visibility of pressed feedback for default ui widget assets" into klp-dev 
* commit 'a13e5dd3a953344dd3b702b6325a8e58be015625':
  Increasing visibility of pressed feedback for default ui widget assets
 2013-09-20 09:58:35 -07:00
Craig Mautner
2c34bd6a9a am cd569b31: am e8a94224: Merge "Return tasks in correct order." into klp-dev 
* commit 'cd569b31d398fe846eeee567d2816a3bb93dd493':
  Return tasks in correct order.
 2013-09-20 09:58:22 -07:00
Christopher Tate
0719715586 am 654aad21: am 9c5cc571: Merge "Support for "not the home app you\'re looking for" metadata" into klp-dev 
* commit '654aad21609642f7d0891962d72c0dfd4077fb94':
  Support for "not the home app you're looking for" metadata
 2013-09-20 09:58:18 -07:00
John Spurlock
03d4a0920c am cc8dc013: am 0286f5e2: Merge "Bar gradients now 55% to 0% black." into klp-dev 
* commit 'cc8dc0139ef11e8f34a22dfeb5073921030ccf98':
  Bar gradients now 55% to 0% black.
 2013-09-20 09:58:13 -07:00
Amith Yamasani
25fd841bd5 am 80af4f7b: am 7301bd96: Merge "Use a separate thread for services that do NTP lookup" into klp-dev 
* commit '80af4f7b098aa912dcc7c2ccaf4a559e15e608ff':
  Use a separate thread for services that do NTP lookup
 2013-09-20 09:58:08 -07:00
Jeff Sharkey
cc288455e6 am ba8129f1: am 18b94817: Merge "Also catch one more tablet layout NPE." into klp-dev 
* commit 'ba8129f1b15de500f46bd2adee251bf5d8bf5bbd':
  Also catch one more tablet layout NPE.
 2013-09-20 09:57:57 -07:00
Jeff Sharkey
ff8bd2316e am 5de6787d: am 7cb93f4e: Merge "Fix tablet layout and resources." into klp-dev 
* commit '5de6787d1e90991af85d677bf38e242fcba427a1':
  Fix tablet layout and resources.
 2013-09-20 09:57:51 -07:00
Derek Sollenberger
8fa4e29f16 am 23b7bc1b: am a2c6209f: Merge "Update SkTypeface::CreateFromName to handle NULL if familyName does not match" into klp-dev 
* commit '23b7bc1b4409ca5844db5f17992b906aa3e63927':
  Update SkTypeface::CreateFromName to handle NULL if familyName does not match
 2013-09-20 09:57:42 -07:00
Baligh Uddin
457767d267 am be643364: (-s ours) am 25f9f364: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit 'be64336477bf3445da13b29236b6aa038d053daf':
  Import translations. DO NOT MERGE
 2013-09-20 09:57:33 -07:00
Baligh Uddin
58c35d0b61 am 16c68d62: (-s ours) am 07cf6487: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '16c68d62965f97fdc18650181c7faebe27729182':
  Import translations. DO NOT MERGE
 2013-09-20 09:57:29 -07:00
Geoffrey Borggaard
cf83beee99 am ce040924: am 5b05a115: Merge "Remove char limit." into klp-dev 
* commit 'ce040924f7dcfea558e432f9e4c5a643ff2623ef':
  Remove char limit.
 2013-09-20 09:57:25 -07:00
Baligh Uddin
b6f0dcff71 am 26aa6e90: (-s ours) am 8074862d: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '26aa6e904c017abe9b7ce0773f5a353cabae93aa':
  Import translations. DO NOT MERGE
 2013-09-20 09:57:22 -07:00
Svetoslav
03e9838357 "resolved conflicts for merge of db7659e0 to master" 
Change-Id: I5c09680bbc6263d38f995f053c747199eb569c32
 2013-09-20 09:54:56 -07:00
Robert Greenwalt
82f4218c0d Cleanup the shutdown of BatchedScans. 
Fixes binder-death as well as disambiguation when an app has multiple requests in.

bug:10641931
Change-Id: Ib701d531fa51e7e2a027848cfdfcad3b47056923
 2013-09-20 16:32:47 +00:00
John Spurlock
d4c2b67ea6 am 560d2e46: Merge "Include starting windows in the sysui vis calculation." into klp-dev 
* commit '560d2e463ed282badd1d069d60d98b59af3b880f':
  Include starting windows in the sysui vis calculation.
 2013-09-20 09:27:59 -07:00
John Spurlock
560d2e463e Merge "Include starting windows in the sysui vis calculation." into klp-dev 2013-09-20 16:25:30 +00:00
Scott Main
9bcea321af add custom head tag to verify developers@android.com as site owner 
Change-Id: I1a79669ab1e30de152354fafe5e397d5d1598f15
 2013-09-20 09:10:08 -07:00
John Spurlock
79da83347a Include starting windows in the sysui vis calculation. 
Sysui vis needs to be recomputed in the same code path as showing/
hiding the system bar (code path = finishPostLayoutPolicyLw) so
it can perform the new fade in/fade out to transparent modes at
the correct time.

Turns out no new state tracking is required, we already keep track
of this window as mTopFullscreenOpaqueWindowState.

So prefer mFocusedWindow when computing sysui vis as before,
but if null fallback to mTopFullscreenOpaqueWindowState.

Bug:10561554
Change-Id: I492766989a67fdac4f030451dcf00f6741a556c0
 2013-09-20 12:04:47 -04:00
Maggie Benthall
b0bd2bfdbc am db93e1d7: Merge "UX compliance for CA Cert warning tile in QuickSettings" into klp-dev 
* commit 'db93e1d79eca52c7ab27b148f55dc0a5a0c771a1':
  UX compliance for CA Cert warning tile in QuickSettings
 2013-09-20 07:34:52 -07:00
Maggie Benthall
db93e1d79e Merge "UX compliance for CA Cert warning tile in QuickSettings" into klp-dev 2013-09-20 14:30:29 +00:00
Daniel Sandler
0cc9298320 am 4e6f752f: Put soundpooled sounds in the right place. 
* commit '4e6f752f237ac5c3d96d45d1fc60ec66e10ad63e':
  Put soundpooled sounds in the right place.
 2013-09-20 05:18:41 -07:00
Daniel Sandler
4e6f752f23 Put soundpooled sounds in the right place. 
Bug: 10846839
Change-Id: I5318c2d54ea0e25fa74bbafc35fb4f7a2883b351
 2013-09-20 00:27:01 -04:00
Jim Miller
aef8902245 am 3855b99f: Fix the build - replace broken assets. 
* commit '3855b99ff088abe5c25b35e0dc000644eb2d5fcb':
  Fix the build - replace broken assets.
 2013-09-19 20:06:56 -07:00
Jim Miller
3855b99ff0 Fix the build - replace broken assets. 
Change-Id: If039dee6d7e663d6abacd5239557d4d0a07fc912
 2013-09-19 20:01:56 -07:00
Jeff Sharkey
89dec7e6e9 am a9ce049d: Load RootInfo in background, invalidation. 
* commit 'a9ce049db87259e302e2368d2a4a1c11a94fd831':
  Load RootInfo in background, invalidation.
 2013-09-19 19:59:22 -07:00
Jeff Sharkey
a9ce049db8 Load RootInfo in background, invalidation. 
Move all RootInfo queries to background threads to avoid janking
the UI.  Update passes happen on spawed task, which swaps out updated
cache results when finished.  Support partial updates when only a
single package/authority has changed.  Watch for change notifications
for roots, since flags can change over time.

Ignore stopped packages when in background, but query them for roots
when launching any picker UI.

Optimize management launches by treating as one-shot requests that
don't need to wait for all RootInfo.

Bug: 10600454, 10745490
Change-Id: Ibc7b15688ef6b41bd7e9dd0d7564b501e60e49a9
 2013-09-19 19:53:32 -07:00
Michael Jurka
48c52bea8b am bdac73fe: Merge "Fix default wallpaper dimensions" into klp-dev 
* commit 'bdac73fec8e6d4686398654f7a74db465e6de8e0':
  Fix default wallpaper dimensions
 2013-09-19 19:36:16 -07:00
Michael Jurka
bdac73fec8 Merge "Fix default wallpaper dimensions" into klp-dev 2013-09-20 02:33:47 +00:00
Michael Jurka
8b4836085b Fix default wallpaper dimensions 
Bug: 10834711
 2013-09-20 04:32:20 +02:00
Christopher Tate
2e6eef655f am 3301f76b: Merge "Don\'t back up apps in the \'stopped\' state" into klp-dev 
* commit '3301f76b2317d2ee2d72e2cdd396e29be63fd414':
  Don't back up apps in the 'stopped' state
 2013-09-19 19:21:11 -07:00
Christopher Tate
3301f76b23 Merge "Don't back up apps in the 'stopped' state" into klp-dev 2013-09-20 02:16:10 +00:00
Igor Murashkin
5c9eaf6796 camera2: Add more camera device states, make #openCamera async. 
* Move CAMERA_IN_USE, MAX_CAMERAS_IN_USE to StateListener#onError
* Copy CAMERA_DISABLED to StateListener#onError

Bug: 10360518
Change-Id: Idd8cf42e1511d12682018588b2b413116cf65116
 2013-09-19 19:01:32 -07:00
Jim Miller
f3d1ef00c5 am af638c4f: Merge "Add camera affordance to navigation bar on phones" into klp-dev 
* commit 'af638c4f9daa74b4c8e0905f07e11290f6845abe':
  Add camera affordance to navigation bar on phones
 2013-09-19 18:36:57 -07:00
Jim Miller
af638c4f9d Merge "Add camera affordance to navigation bar on phones" into klp-dev 2013-09-20 01:33:28 +00:00
Svetoslav Ganov
22cb9170d3 Update android.print.PrintAttributes documentation 
bug:10550844

Change-Id: Ic1bbb2cb6ab55826eb66242f6002b7165aff37a4

Conflicts:
	core/java/android/print/PrintAttributes.java
 2013-09-19 18:31:48 -07:00
Svetoslav
c0e1ae0176 am facc08c7: Merge "Move PdfDocument to android.graphics.pdf" into klp-dev 
* commit 'facc08c7757cef56da6d10e78ce99ef7949700e3':
  Move PdfDocument to android.graphics.pdf
 2013-09-19 18:17:05 -07:00
Svetoslav
facc08c775 Merge "Move PdfDocument to android.graphics.pdf" into klp-dev 2013-09-20 01:14:02 +00:00
Craig Mautner
f15024c8c8 am 12946530: Merge "Only show launcher for the bottom activity in a task" into klp-dev 
* commit '12946530cfba2024fa45c06b0060fe5c91252aab':
  Only show launcher for the bottom activity in a task
 2013-09-19 17:53:38 -07:00
Craig Mautner
12946530cf Merge "Only show launcher for the bottom activity in a task" into klp-dev 2013-09-20 00:51:20 +00:00
Svetoslav
44634bbefc resolved conflicts for merge of db7659e0 to master 
Change-Id: I6b56fabd07b18dfcb25be83834e4f248f8aa4a40
 2013-09-19 17:44:13 -07:00
David Braun
e28962fe8e am 3372cb26: Merge "Add config setting for default sms app." into klp-dev 
* commit '3372cb2654e002e953e15d1b8513f090e9b6997d':
  Add config setting for default sms app.
 2013-09-19 17:30:42 -07:00