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

113616 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert Greenwalt
eccc0905bd am 540784f9: Merge "Cleanup the shutdown of BatchedScans." into klp-dev 
* commit '540784f903c8a9e808ef88d14fe5e1227bda4561':
  Cleanup the shutdown of BatchedScans.
 2013-09-20 10:50:39 -07:00
Robert Greenwalt
540784f903 Merge "Cleanup the shutdown of BatchedScans." into klp-dev 2013-09-20 17:43:30 +00:00
Svetoslav
b206f1271d Null not handled when parsing media size resource id attribute. 
bug:10835715

Change-Id: I0c9c1120c26e68b4c582599bbda3753d0e443d8c
 2013-09-20 10:43:29 -07:00
Robert Greenwalt
81fec6be04 Supsend/resume batched scans around dhcp. 
Scanning while dhcp is running breaks dhcp, so stop the batched scans
when we need dhcp and start it up again after.

bug:10691401
Change-Id: Ifdeb6f35cfe4509b90fed1e1e694d0c107f24a7e
 2013-09-20 10:13:46 -07:00
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
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
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
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
David Braun
3372cb2654 Merge "Add config setting for default sms app." into klp-dev 2013-09-20 00:26:32 +00:00
Craig Mautner
f51b5588d7 Only show launcher for the bottom activity in a task 
When transitioning from activity-over-launcher to task-over-launcher
ensureActivitiesVisibleLocked() was too aggressive in showing the
launcher. If there were any non-fullscreen activities in a task that
sits over the launcher then the launcher would be shown.

This fix adds a test to make sure the launcher will only be shown if
the bottommost activity in such a task is non-fullscreen.

Fixes bug 10840919.

Change-Id: I5dcd63be3fa2865ae38cbb921332937dfa4b5d47
 2013-09-19 17:19:51 -07:00
Chet Haase
9b985721da Add equals() and hashcode() to SpannableString 
ActionBar uses a transition to animate text changes. This transition
depends on testing the equality of start/end text values in CharSequence
objects. Without equals(), SpannableString will return false for objects
whose references are different, but whose text is exactly the same.

This CL adds the equals() method, and the accompanying hashcode method,
to ensure that two Spanned implementations will always be equal
if their text and span data are equal.

Issue #10760075 Wrong unread count in actionbar

Change-Id: I5e77d40dd302eca035e8c56d40f3cd0aef8e6424
 2013-09-19 17:18:55 -07:00
Jim Miller
caf24fc2c4 Add camera affordance to navigation bar on phones 
This adds a camera button on phones that can be used to show
and launch the camera.

- Minor refactoring of touch event dispatch in PagedView.
- Disables usability hints when keyguard loads.
- Only add a touch handler for camera icon once during layout.
- Update after review.
- Updated with latest UX camera and camera background assets

Change-Id: I09cd5cb0e501fd0f4659bea96d00c92b07f805c4
 2013-09-19 17:14:59 -07:00
Glenn Kasten
0fbb74847a am 9d53e30e: Merge "Workaround for slow AudioRecord destructor" into klp-dev 
* commit '9d53e30e5eaf53cb0bd57319e02025ba7182bba3':
  Workaround for slow AudioRecord destructor
 2013-09-19 17:13:51 -07:00
Svetoslav
6811f4e92c Move PdfDocument to android.graphics.pdf 
1. Move PdfDocument to android.graphics.pdf.

2. Changed the PdfDocument as per API concil request.

3. Updated the documentation.

bug:10461180
bug:10552565
bug:10681585
bug:10552336

Change-Id: I08e15b34cf37bb064248c887e6f59808019cafe8
 2013-09-19 17:12:47 -07:00
Christopher Tate
9ac23d0952 Don't back up apps in the 'stopped' state 
E.g. right after install from the Play Store, or after a force stop.

Bug 10845317

Change-Id: I7764ce61caa77136ca2758657f111928f9740fc0
 2013-09-19 17:12:27 -07:00
Glenn Kasten
9d53e30e5e Merge "Workaround for slow AudioRecord destructor" into klp-dev 2013-09-20 00:08:58 +00:00
Joe Fernandez
cda1500201 am a17309fd: am 41c3c2b6: am 6e3b21cc: am 72f65780: Merge "docs: Fix for SDK 22.2.1 Windows download checksum and size" into jb-mr2-docs 
* commit 'a17309fd9ed705bb3a9d7adbf3b30eb71952dabc':
  docs: Fix for SDK 22.2.1 Windows download checksum and size
 2013-09-19 16:53:09 -07:00
Joe Fernandez
a17309fd9e am 41c3c2b6: am 6e3b21cc: am 72f65780: Merge "docs: Fix for SDK 22.2.1 Windows download checksum and size" into jb-mr2-docs 
* commit '41c3c2b687fa19d10c450a6d4b0b9f9a707a3854':
  docs: Fix for SDK 22.2.1 Windows download checksum and size
 2013-09-19 16:50:16 -07:00
Joe Fernandez
41c3c2b687 am 6e3b21cc: am 72f65780: Merge "docs: Fix for SDK 22.2.1 Windows download checksum and size" into jb-mr2-docs 
* commit '6e3b21cc83da2b227704b9a6b0cbad258ea5bd84':
  docs: Fix for SDK 22.2.1 Windows download checksum and size
 2013-09-19 16:47:56 -07:00
Joe Fernandez
29ccf51fc7 am 27f525c4: am 354b4fef: am 0d8f0849: am 1d65500d: docs: Google APIs emulator 18 r3 - Platform Release Notes 
* commit '27f525c422aa9bdc2b0c1dccb989989f6fc8dbe4':
  docs: Google APIs emulator 18 r3 - Platform Release Notes
 2013-09-19 16:46:21 -07:00
Ed Heyl
3ece827017 am 812c4d73: Merge "fix typo" into klp-dev 
* commit '812c4d737896fbf5dffa272f5d15863fb185d956':
  fix typo
 2013-09-19 16:46:18 -07:00