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

88780 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Zhihai Xu
1bab04356e am 11181c7a: am 8e080d7e: Merge "License of files Bluetooth package is not updated to ASL2" into jb-mr1-dev 
* commit '11181c7ae6a9f8278fbf99676b3476173b18b098':
 2012-10-29 12:45:52 -07:00
Dirk Dougherty
9b9d4e0676 am 7833ea17: am d8d83faa: am cde979d2: am 3d087920: am 76cdbdc8: Doc change: update develop landing page content. 
* commit '7833ea17ad32fcb012b27c32b3be946e86f35e19':
 2012-10-29 12:45:49 -07:00
Dianne Hackborn
98385f8465 am cc9106bb: am ecf4725e: Merge "Fix issue #7401818: Wrong transition animation when clearing task" into jb-mr1-dev 
* commit 'cc9106bb7ae91affb4c5cd489a29f1971eca5974':
 2012-10-29 12:45:45 -07:00
Dave Burke
dfe05a5e11 am 4d56a167: am 799916e6: Merge "Revert "Check non-primary user dirs during package scan"" into jb-mr1-dev 
* commit '4d56a16728b21b2825500c24b5af1b4e0573a15e':
 2012-10-29 12:45:41 -07:00
Eric Laurent
6b6d896b7b am 22df26ca: am f52cbb6b: Merge "AudioService: add fix for corrupted settings" into jb-mr1-dev 
* commit '22df26cac2e9a2215e7a8af9f1b7444aac08992d':
 2012-10-29 12:45:37 -07:00
Kenny Root
c9cc6e5a53 am 16106a76: am 92bc9b31: PMS: check outInfo for null during delete 
* commit '16106a7641bac1590476459d9e349ab18f4ca44c':
 2012-10-29 12:45:34 -07:00
Dianne Hackborn
f650447c07 am a4dcf311: am 56e75631: Merge "Fix issue #7342364: JellyBean broke Toddler Lock, again" into jb-mr1-dev 
* commit 'a4dcf311c1955108e0b81e9dcd48723acde1acca':
 2012-10-29 12:45:30 -07:00
Svetoslav Ganov
0223483d14 am 40ca868a: am e1655c98: (-s ours) Merge "When A11y is on, use a longer interval between lockout announcements." into jb-mr1-dev 
* commit '40ca868a08e2c764a206a5e32b7e9af46fd168da':
 2012-10-29 12:45:24 -07:00
John Spurlock
8c480e4b1f am 86b6357e: Manual f/b merge of lockhotness camera integration. 
* commit '86b6357e5eb91950eac7de7ffe29e5a4ad32903b':
  Manual f/b merge of lockhotness camera integration.
 2012-10-29 12:45:17 -07:00
Adam Powell
7e83e33953 am 848a5557: Merge "Fix up GlowPadView attributes" into jb-mr1-lockscreen-dev 
* commit '848a5557dba25defd5f332ebc20b61d0097f27f0':
  Fix up GlowPadView attributes
 2012-10-29 12:45:13 -07:00
Jim Miller
412b6a5ef2 am 19a52670: Merge latest prototype changes into keyguard 
* commit '19a5267003e7dc70100a4bd4f1f449523b2ff38b':
  Merge latest prototype changes into keyguard
 2012-10-29 12:45:09 -07:00
Kenny Root
f834fb33dc am 356f2f59: am da2509c4: Merge "Check non-primary user dirs during package scan" into jb-mr1-dev 
* commit '356f2f59410be228cfb60ccc3c1878c8ba99da07':
 2012-10-29 12:45:06 -07:00
Craig Mautner
ae2a3c776b am ce1696c2: am 6757572b: Merge "Add throwing InvalidDisplayException from addView." into jb-mr1-dev 
* commit 'ce1696c22a2fab8c3df63fd504a844f3fccd6cfc':
 2012-10-29 12:45:02 -07:00
Hiroshi Lockheimer
50920f5f58 am 5c731480: am c63aa962: Merge "Fix NPE." into jb-mr1-dev 
* commit '5c731480ca3dec47362023076bc827e535da979d':
 2012-10-29 12:44:58 -07:00
Chet Haase
cc0696e527 am 4a4ae0b7: am fbba753f: Merge "Handle offscreen animations correctly" into jb-mr1-dev 
* commit '4a4ae0b7e2d41cac79a97f1e91ba5ed4c632df1f':
 2012-10-29 12:44:54 -07:00
Romain Guy
773f299f2c am aae03bb4: am b75ade9c: Merge "Use existing display list to render the resize buffer Bug #7400903" into jb-mr1-dev 
* commit 'aae03bb4e3e0d4c64390dc9ff4eca08a4ca6d0b7':
 2012-10-29 12:44:49 -07:00
Danielle Millett
5cba537ae1 am 7c420ec6: Merge "Handling popups correctly for face unlock" into jb-mr1-lockscreen-dev 
* commit '7c420ec69843c8efc95b4f36aa77f17d970d4eaf':
  Handling popups correctly for face unlock
 2012-10-29 12:44:46 -07:00
Jamie Gennis
1a5ddfdfd4 am 0e259dcc: am cd79b35c: Merge "Surface: add the PhysicalDisplayInfo#secure field" into jb-mr1-dev 
* commit '0e259dccfc77a83ce91b0a2770d26e6b88bfd52b':
 2012-10-29 12:44:42 -07:00
Andy McFadden
c3fdaab20b am 2eb8303b: am d401a53c: Merge "Improve systrace tag propagation" into jb-mr1-dev 
* commit '2eb8303b9c60104720a0d81040337409dfab4cbe':
 2012-10-29 12:44:38 -07:00
Michael Jurka
d73f0b1fe9 am cd57bdb5: am a665df57: Merge "Use lighter background for Recents" into jb-mr1-dev 
* commit 'cd57bdb57a9f7ddf5b394ba1d59024d38d86fb23':
 2012-10-29 12:44:33 -07:00
Jean-Michel Trivi
f4a8eb2211 No playback and music widget from other user on user switch 
On user switch:
 - make the current audio focus owner loose audio focus
 - clear the remote control display

Bug 7205290
Bug 7307156

Change-Id: I6ebcb94d1d2bae8c57ab98dd7e795b239a981d28
 2012-10-29 12:42:55 -07:00
Eric Laurent
5ba0ffa023 audio service: make dock audio is off by default 
It is better to turn dock audio off by default if the user
has not yet explicitly turned it on from the settings menu.
There is a discoverability issue with current implementation
as we do not launch the settings menu at first dock insertion.
Having audio routed to the dock by default would make the tablet
silent for media content when docked and users will not be directed
to the settings menu.

As the dock audio enable setting is for low end docks only
(analog connection and no jack detection) disabling audio for low end docks
by default does not impact manta and prime docks.

Bug 7302106.

Change-Id: I571f361d41940cfb811f038442ae9ba9c6361d1d
 2012-10-29 12:31:09 -07:00
Jason Simmons
df304ba0ba resolved conflicts for merge of 83b9647d to jb-mr1-aah-dev 
Change-Id: Ic6d9435cf6c86a8048a99488d2e1dab49b4454c6
 2012-10-29 11:24:11 -07:00
Kenny Root
584c4cdbf3 Move app-lib definition up for system app scanning 
System apps were getting the wrong path because app-lib directory was
defined after the scanning of packages.

Bug: 7425516
Change-Id: I7a7a6b2a74f846c84516440ee950099bdc564d0b
 2012-10-29 10:46:42 -07:00
Victoria Lease
83f60c5247 Merge "FusedLocation runs per user as user" into jb-mr1-dev 2012-10-29 10:34:50 -07:00
Victoria Lease
167282f19f Merge "Revert "make FLP play nicely with multiuser"" into jb-mr1-dev 2012-10-29 10:34:11 -07:00
Baligh Uddin
8405c56953 Import translations. DO NOT MERGE 
Change-Id: I7c05bfd98fd5816324854b1526f00ef055c13395
Auto-generated-cl: translation import
 2012-10-29 10:17:19 -07:00
Baligh Uddin
02aea664e1 Import translations. DO NOT MERGE 
Change-Id: If13cd041168fa97913fa7e76ac2850abc59d5f50
Auto-generated-cl: translation import
 2012-10-29 10:16:10 -07:00
Irfan Sheriff
4bfa1e99e2 Merge "Fix handling escaped chars in ssid" into jb-mr1-dev 2012-10-29 10:11:09 -07:00
Irfan Sheriff
11de9e5537 Fix handling escaped chars in ssid 
Bug: 7427185
Change-Id: Ie669dff01af0865ea50305f3b48cf3f7af92cf6f
 2012-10-29 10:01:38 -07:00
Baligh Uddin
19293bc5f8 Import translations. DO NOT MERGE 
Change-Id: I15a08f4eef8da056adc8c395c82a2c0ef47e2b00
Auto-generated-cl: translation import
 2012-10-29 09:59:15 -07:00
Baligh Uddin
c797fe43c1 Import translations. DO NOT MERGE 
Change-Id: Icecd6584ffbd05db4e596245269c1175c19a9346
Auto-generated-cl: translation import
 2012-10-29 09:57:18 -07:00
Victoria Lease
a5f9b3fc26 FusedLocation runs per user as user 
Change-Id: Ib9589000f201902bd6be2d58413c11b9340cf6ac
 2012-10-29 09:28:53 -07:00
Jeff Brown
46ea054495 am f33ff923: am 6fd394ae: Merge "Improve auto-brightness hysteresis." into jb-mr1-dev 
* commit 'f33ff923139dd7427b84726deaf919e847aac9f5':
 2012-10-29 09:25:21 -07:00
Chris Wren
0882fe87d4 am 3867ddab: Merge "merge new multiuser avatars in from proto app" into jb-mr1-lockscreen-dev 
* commit '3867ddabbe645749ba3d7db9fc0c0ab9ca84690b':
  merge new multiuser avatars in from proto app
 2012-10-29 09:25:16 -07:00
Baligh Uddin
52b5f97ddb am 1afe7788: am 8ed48222: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit '1afe77883e1ad2f79942a5d14b618a31d4643abc':
 2012-10-29 09:25:12 -07:00
Baligh Uddin
3adefe7338 am 22f91da2: Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev 
* commit '22f91da2c2da04d759f329fc69a5f7c0741c0218':
  Import translations. DO NOT MERGE
 2012-10-29 09:25:08 -07:00
Romain Guy
9808258f46 am 0472d565: am 04c8d402: Merge "Properly draw the window background on window resize Bug #7385090" into jb-mr1-dev 
* commit '0472d565f3005a2cae07e18ce83947a5ad300613':
 2012-10-29 09:25:04 -07:00
Irfan Sheriff
bc685c49db am 086dc1ce: am c48ca657: Merge "Fix driver stop handling" into jb-mr1-dev 
* commit '086dc1ce9ba175c30976e5979395cf0e8c1ca9ae':
 2012-10-29 09:25:00 -07:00
Baligh Uddin
f501a9cde8 am bd28f237: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev 
* commit 'bd28f2376f8f6960c1cd7d695a16b90450fa04f2':
  Import translations. DO NOT MERGE
 2012-10-29 09:24:56 -07:00
Baligh Uddin
379c47ec9f am 66e893fb: (-s ours) am 21ce854b: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit '66e893fb9bd0b0e4f6df5e3c58e19930fc57d49b':
 2012-10-29 09:21:05 -07:00
Daniel Sandler
8fe9a197b2 am 79db4800: am 365ece1d: Merge "Dreams/Sleep Mode is now Daydreams." into jb-mr1-dev 
* commit '79db48003b3e9a482cf45764c92bc2100e00df4f':
 2012-10-29 09:17:07 -07:00
Justin Ho
d8b4f07006 am c1c03c42: am 5d6562d3: Merge "Avoid mentioning hidden API in docs." into jb-mr1-dev 
* commit 'c1c03c429a9d1b5ebe7643bfb95675513e1d25df':
 2012-10-29 09:17:03 -07:00
Irfan Sheriff
f4f6636313 am 5f8e3f2b: am bf310d1f: Merge "Fix issues shown on CTS tests" into jb-mr1-dev 
* commit '5f8e3f2b36ae0d85bd73778a6287b6fdfa1c7a04':
 2012-10-29 09:16:59 -07:00
Jeff Sharkey
af8974ddee am 32a1c5f7: am 1c8135ad: Merge "Update docs for multi-user storage behavior." into jb-mr1-dev 
* commit '32a1c5f7d6266942930306a5602172e47726c869':
 2012-10-29 09:16:56 -07:00
Daniel Sandler
7fa5c737cc am cf64067c: am 0058f4ed: Merge "Reset ExpandHelper when the panel is collapsed." into jb-mr1-dev 
* commit 'cf64067c95a83d56381ff62c9222098f314b949a':
 2012-10-29 09:16:52 -07:00
John Spurlock
19a2f53060 am 31821c5b: am 780a13b0: Merge "Fix nav bar glitch when quickly turning screen off then on." into jb-mr1-dev 
* commit '31821c5b6170d5f560c7f74b262278399c9ff3e9':
 2012-10-29 09:16:49 -07:00
Jim Miller
bf83ea6aa3 am 5d3f8599: Merge multi-user stuff from prototype into framework. 
* commit '5d3f8599590026d6fc275739613fe6ddb180af55':
  Merge multi-user stuff from prototype into framework.
 2012-10-29 09:16:45 -07:00
Jim Miller
8615a071c4 am 022554e3: Merge latest prototype changes into keyguard 
* commit '022554e3da6e496524387a5d3ecc67ef9749b587':
  Merge latest prototype changes into keyguard
 2012-10-29 09:16:41 -07:00
Jim Miller
17ac77c767 am c28261d4: Merge "Wire up "add widget" in keyguard" into jb-mr1-lockscreen-dev 
* commit 'c28261d4fabf186cd5af5a563e6bab9023ee3758':
  Wire up "add widget" in keyguard
 2012-10-29 09:16:37 -07:00