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

140441 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Igor Murashkin
a296fece2b camera2: Fix cts test StillCaptureTest#testTakePicture 
* Introduce 'fake' metadata for 3A+flash (hardcoded to support nothing)
(will be removed in a later release)

* Open the camera1 device in its own thread, so that the looper it
captures is also our own (and not the main looper)

* Set the picture size based on the size of the JPEG surface outputs

Change-Id: Iaeb5031c6b352115b73d2261a39d65347d75fdc8
 2014-06-24 10:56:26 -07:00
Adam Powell
755c919ba2 Merge "Set the default content description for Toolbars acting as action bars" 2014-06-23 21:50:10 +00:00
Ricardo Cervera
5145e62369 am 15f7ddfb: am 8b938c54: docs: Removing mercedes logo from auto site 
* commit '15f7ddfbb50d900a726b0de4aad9d345538b2da6':
  docs: Removing mercedes logo from auto site
 2014-06-25 01:18:26 +00:00
Adam Powell
7901b2a549 Set the default content description for Toolbars acting as action bars 
Bug 15814044

Change-Id: I07c20de1349cb07f21eaf0db718da94c0ba7043d
 2014-06-24 17:32:06 -07:00
Winson Chung
a2b7fcbc68 Merge "Refactoring Recents layout into an xml." 2014-06-24 17:32:43 +00:00
Joe Fernandez
3dcccd96f4 am b44aa788: am e748fb58: Merge "Android TV Design Guidelines" into klp-modular-dev 
* commit 'b44aa788af951e4438dd8ce78dd486026f8a0831':
  Android TV Design Guidelines
 2014-06-25 00:44:17 +00:00
Quddus Chong
203531b161 am 2b22c304: am f9a4666b: Merge "docs: Updated L Preview Highlights (hopefully final)." into klp-modular-dev 
* commit '2b22c30422daeaeccb4a18154523517abbcd542b':
  docs: Updated L Preview Highlights (hopefully final).
 2014-06-25 00:44:12 +00:00
Ricardo Cervera
946976a7c0 am 670f7c72: am b00ec477: Merge "docs: Last minute eng feedback piece on L preview docs" into klp-modular-dev 
* commit '670f7c724f67ecbb5d3f8ec1718184a8e78690d0':
  docs: Last minute eng feedback piece on L preview docs
 2014-06-25 00:44:07 +00:00
Winson Chung
8e548f7025 Refactoring Recents layout into an xml. 
- Hiding the search bar when entering filtering mode

Change-Id: Ifce8429d6f331406e9688c96cd978f6900879c96
 2014-06-24 15:42:33 -07:00
Ricardo Cervera
23a0e2ac1b Merge "docs: Replaced gifs" into klp-modular-dev 2014-06-23 21:50:10 +00:00
Ricardo Cervera
aa0a376d7e docs: Replaced gifs 
Change-Id: I043d3f6dace9294e6a50bdf181b38f701d4d8c1c
 2014-06-24 14:11:52 -07:00
Andrew Solovay
906eda45b2 Merge "docs: Fixed instructions on checking VM version." into klp-docs 2014-06-23 21:50:10 +00:00
Andrew Solovay
dccf940c4b docs: Fixed instructions on checking VM version. 
Per IRogers@ , you check the VM version by calling
System.getProperty("java.vm.version") -- not, as previously
documented, "dalvik.vm.version" (Ian says there's no such property as
dalvik.vm.version.) BDC@ and/or AnwarG@, can you confirm?

Revised doc is staged to:

http://asolovay.mtv:9001/guide/practices/verifying-apps-art.html#GC_Migration

bug: 15836664
Change-Id: Ie5e2e058fa9ce033afd18a0f4079faa81bbf317e
 2014-06-24 13:04:54 -07:00
Robert Ly
17f1b0a670 Merge "docs: fix blog post link, add arm image, fix ecosystem text" into klp-modular-dev 2014-06-23 21:50:10 +00:00
Robert Ly
7b459e46ed docs: fix blog post link, add arm image, fix ecosystem text 
Change-Id: I1fab7f67d99ca787a6057c89b90e2892241df1d3
 2014-06-23 20:01:17 -07:00
Ricardo Cervera
5b225bf474 Merge "docs: Added three columns on the Auto SDK." into klp-modular-dev 2014-06-23 21:50:10 +00:00
Ricardo Cervera
245528738f docs: Added three columns on the Auto SDK. 
Also updated the images from the design guys.

Change-Id: Idca893d461dd8a1d8374774c9eac670f1bc78d49
 2014-06-23 17:36:17 -07:00
Robert Ly
7cfd2e03c4 Merge "docs: fix lmp and index pages" into klp-modular-dev 2014-06-23 21:50:10 +00:00
Adam Powell
4212d1f2e9 Merge "Inflate fragments from layout into child FragmentManagers" 2014-06-23 21:50:10 +00:00
Adam Powell
371a809179 Inflate fragments from layout into child FragmentManagers 
Previously, if an app inflated a layout in a Fragment's onCreateView
that itself had fragments included, those fragments would be added to
the Activity-level FragmentManager and would not share the same
lifecycle with the fragment it was inflated for. This led to some
nasty management headaches.

If an app targets L or above, add the fragment to the child
FragmentManager of the current fragment when inflated using the
LayoutInflater passed to the parent fragment.

Bug 12763389

Change-Id: Iad4ed7d5df602aea9579bf1503e206fa894630c1
 2014-06-24 12:29:32 -07:00
Craig Mautner
3b6e53fc00 Merge "Don't set return to recents on every resume" 2014-06-23 21:50:10 +00:00
Craig Mautner
76e2a765b4 Don't set return to recents on every resume 
Checking for previous task to be the Recents activity every time
through resumeTopActivityLocked() leads to missetting the
mTaskToReturnTo to Recents for Recents. Instead check for
Recents launching a task in moveTaskToFront and startActivity.

Fixes bug 15832448.

Change-Id: Ib64fe26f3fd3fdcd878edafb041928ec02757e63
 2014-06-24 09:05:43 -07:00
Yigit Boyar
e8c8617c28 Merge "Clone animators before running in StateListAnimator" 2014-06-23 21:50:10 +00:00
Robert Ly
d271c1c071 am f843f797: am 2d50cda2: Merge "docs: Noted that ADT require Java 7 for L dev preview." into klp-modular-dev 
* commit 'f843f79775309d7563d40c1982dfbaab42c79d8c':
  docs: Noted that ADT require Java 7 for L dev preview.
 2014-06-25 00:29:19 +00:00
Robert Ly
48577018ea am 11291ee3: am 65d8b6b7: Merge "docs: Adding Create a Project instructions for L preview." into klp-modular-dev 
* commit '11291ee30822aaab69804dfb9aed2fd8ab11da6b':
  docs: Adding Create a Project instructions for L preview.
 2014-06-25 00:29:13 +00:00
Ricardo Cervera
ec75420f44 am 6a94082f: am 7561313e: docs: Replaced one of the gifs for the auto site 
* commit '6a94082f8df630d92836b2d60a01dacd0a96ceb2':
  docs: Replaced one of the gifs for the auto site
 2014-06-25 00:29:07 +00:00
Joe Fernandez
cdd1fd76a6 am 9d644b66: am 6fd69be6: Merge "docs: Android TV Dev Guide, final (probably)" into klp-modular-dev 
* commit '9d644b668c2c28be1e753c7157c3bb35fcc9f8eb':
  docs: Android TV Dev Guide, final (probably)
 2014-06-25 00:28:55 +00:00
Andrew Solovay
c7707240db am 296b5a77: am 5918a9c8: am 1d5976c8: am 906eda45: Merge "docs: Fixed instructions on checking VM version." into klp-docs 
* commit '296b5a77c7416ac3b77ca1167bdf5d19189bd8e4':
  docs: Fixed instructions on checking VM version.
 2014-06-25 00:28:39 +00:00
Robert Ly
b202d6850a am 1ad113a1: am 5f036fb8: Merge "docs: ad dnew hero, remove arm" into klp-modular-dev 
* commit '1ad113a1c87f986e485b57a8073cff009426e957':
  docs: ad dnew hero, remove arm
 2014-06-25 00:28:34 +00:00
Ricardo Cervera
7abf934d67 am b30ad745: am 5f5610ca: Merge "docs: Material L Preview engineering review fixes" into klp-modular-dev 
* commit 'b30ad7455e80266aacf57c9c18fe569833eca118':
  docs: Material L Preview engineering review fixes
 2014-06-25 00:28:28 +00:00
Ricardo Cervera
b9e3dcd7f0 am a78fcd68: am 4af882fd: Merge "docs: Adding docs for the new Android Studio wizards" into klp-modular-dev 
* commit 'a78fcd688efaa4d5585c3d810a376171a30f2455':
  docs: Adding docs for the new Android Studio wizards
 2014-06-25 00:28:23 +00:00
Ricardo Cervera
1e18e068d4 am af11452d: am 23a0e2ac: Merge "docs: Replaced gifs" into klp-modular-dev 
* commit 'af11452d763fb7a4b975ce997652e715733424a0':
  docs: Replaced gifs
 2014-06-25 00:28:18 +00:00
Robert Ly
4ce899c048 am 1bac56dd: am 9d9b71f8: Merge "docs: fix plus link" into klp-modular-dev 
* commit '1bac56dd42e3ab7b5764f102dd9045acb6726f67':
  docs: fix plus link
 2014-06-25 00:27:52 +00:00
smain@google.com
0b2303fc1c am 0c18ecac: am f4787f4d: add image to GP education collection card 
* commit '0c18ecac662fdf15ae453e1adba805e7c7fa1260':
  add image to GP education collection card
 2014-06-25 00:27:47 +00:00
smain@google.com
0a3120c68a am bcb29dbd: am 8dd4d096: change start button to red for consistent "primary" action pattern 
* commit 'bcb29dbd10d88488d0526e6e90692ae116ae79e4':
  change start button to red for consistent "primary" action pattern
 2014-06-25 00:27:42 +00:00
smain@google.com
eab8b36dbd am 2d14e7e8: am 80e1a0cf: add Design guide for Wear. adds new Devices section to sidenav. 
* commit '2d14e7e8a864ee3b59a9b39d5ae22ab72b52d1a5':
  add Design guide for Wear. adds new Devices section to sidenav.
 2014-06-25 00:27:36 +00:00
Ricardo Cervera
e9a32d1e01 am 549ac903: am 3c3daf68: docs: Removed template references and addressed feedback. Added missing logos. 
* commit '549ac9036e52e2566cd06b28b707147daf85df78':
  docs: Removed template references and addressed feedback. Added missing logos.
 2014-06-25 00:27:31 +00:00
Robert Ly
6cd093c56e am a1bb1608: am c6cb1cc2: docs: soften up langauge about safety and remove ui templates language 
* commit 'a1bb160897c61b4f1f2cbe1cba25321d0fa01261':
  docs: soften up langauge about safety and remove ui templates language
 2014-06-25 00:27:26 +00:00
Robert Ly
834e5a222a am 7320eeac: am 93c5d262: Merge "docs: fix auto footer" into klp-modular-dev 
* commit '7320eeac12843cd31081e184d1e235fb59fef258':
  docs: fix auto footer
 2014-06-25 00:27:21 +00:00
Robert Ly
c51212d74d am a0d06584: am 3db26d9d: docs: add correct arm image 
* commit 'a0d06584f7284ee2fbea56e1ba2dbfaec849b12a':
  docs: add correct arm image
 2014-06-25 00:27:16 +00:00
Robert Ly
cc79de5b25 am c7dc9d5d: am 17f1b0a6: Merge "docs: fix blog post link, add arm image, fix ecosystem text" into klp-modular-dev 
* commit 'c7dc9d5d20f62915375a7debc3c74400b5a60e38':
  docs: fix blog post link, add arm image, fix ecosystem text
 2014-06-25 00:27:11 +00:00
Robert Ly
eab0f718b6 am d1c8a3eb: am 7395c0db: Merge "docs: Updates to the L Preview Highlights." into klp-modular-dev 
* commit 'd1c8a3eb721a1c789897dcd560006b68d3ef931c':
  docs: Updates to the L Preview Highlights.
 2014-06-25 00:27:06 +00:00
Robert Ly
7f2c383035 am a5314536: am 0ebf5c7f: Merge "docs: Updates for L Preview Support page." into klp-modular-dev 
* commit 'a5314536f6f98dbbc5452802bc9a14eb8d6300a1':
  docs: Updates for L Preview Support page.
 2014-06-25 00:27:00 +00:00
Ricardo Cervera
9ac972ab41 am 9fa541bd: am 7e81aab5: docs: Removed para based on copy review from Auto landing page. 
* commit '9fa541bd4e4e00524b826c6afb2d8a4a81a91f36':
  docs: Removed para based on copy review from Auto landing page.
 2014-06-25 00:26:55 +00:00
Ricardo Cervera
a686b7ba10 am 6c370114: am 5b225bf4: Merge "docs: Added three columns on the Auto SDK." into klp-modular-dev 
* commit '6c370114c27e784ee6aa1b23c1762c9285727dea':
  docs: Added three columns on the Auto SDK.
 2014-06-25 00:26:48 +00:00
Brian Carlstrom
331106dd2f am 4074abed: (-s ours) am c38c0472: Add missing class to preloaded-classes for ART build 
* commit '4074abedf641d00eca4247a56dafd037f1cd7dd0':
  Add missing class to preloaded-classes for ART build
 2014-06-25 00:26:43 +00:00
Michael Wright
85b1af6e9b Global keys should wake the device if they're wake keys. 
Bug: 15430207
Bug: 15434710
Change-Id: I98083e1389079f00b612ae4fae3ecab5a2a51b0d
 2014-06-25 00:16:08 +00:00
Christopher Tate
ab225b301b Add 'fullbackup' to bmgr's usage statement 
Also make it handle the list of packages to be backed up as a single
multiple-app argument to fullTransportBackup() rather than N calls
each backing up one app.

Change-Id: I9fe4d5caca54fafef70ffe9af4c26e3941dc5d26
 2014-06-24 16:52:09 -07:00
Marco Nelissen
c4d37f58a1 am 0eee8ac2: Merge "Fix thumbnail bug" 
* commit '0eee8ac275927264f766bb18023365e83d4bfe5a':
  Fix thumbnail bug
 2014-06-23 21:45:30 +00:00
Robert Greenwalt
3dab92c510 Merge "Clean up and add some Network logging." 2014-06-23 21:44:43 +00:00