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

89013 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dianne Hackborn
62778aaa03 am db3efba6: am ead7d90e: Merge "Fix issue #7408647: Add getUserCount() API" into jb-mr1-dev 
* commit 'db3efba6fc3a71cfd0a6406704970f1bcb13242f':
 2012-10-29 13:30:09 -07:00
Daniel Sandler
4dc794a779 am 5fbc82ef: am 38c904a6: Merge changes Ia0c2450f,I0fac062f into jb-mr1-dev 
* commit '5fbc82ef79277d14444549098147ecea69caf6a6':
 2012-10-29 13:30:04 -07:00
Adam Powell
662bf7b23e am eee20931: Beginnings of bouncer support; add scrims and state tracking 
* commit 'eee209313d564be37b8fc068f785b3844cd6597e':
  Beginnings of bouncer support; add scrims and state tracking
 2012-10-29 13:30:00 -07:00
Irfan Sheriff
446e66edd8 am 9253f561: am 4e7f2ffe: Merge "Handle group tear down only at group removed event" into jb-mr1-dev 
* commit '9253f56163a7b88a09bc4347ba6fe631dd7a08d8':
 2012-10-29 13:29:57 -07:00
Jeff Brown
0234e9db97 am 2ca85c20: am 900e0ba5: Merge "Dim the screen quickly in response to user activity timeout." into jb-mr1-dev 
* commit '2ca85c20517037a86fd59eba7946267dd49b4c61':
 2012-10-29 13:29:47 -07:00
Adam Powell
82da5b173c am c0657fb3: Integrate changes from lockscreen proto app 
* commit 'c0657fb36ce5ede652e8af084e484d07abfb449d':
  Integrate changes from lockscreen proto app
 2012-10-29 13:29:43 -07:00
Romain Guy
b18e19f5a0 am ee0f615f: am 99333315: Merge "Ensure we have a GL context before deleting View layers Bug #7391098" into jb-mr1-dev 
* commit 'ee0f615ffdbb790a6bb64b0efe444b4c7f8fe291':
 2012-10-29 13:29:40 -07:00
Baligh Uddin
38f7ae14df am f785af4d: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev 
* commit 'f785af4d2ed49b8bf947df28d77b6c9b7cf1611d':
  Import translations. DO NOT MERGE
 2012-10-29 13:29:36 -07:00
Baligh Uddin
511e3874ff am a187b478: (-s ours) am 188bf0e6: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit 'a187b478b6d19daa39c2879c434fea7fba463c0d':
 2012-10-29 13:25:43 -07:00
Amith Yamasani
9b083fd87b am 599885d5: am cd668554: Merge "Fix a crash in InputMethodManagerService due to permission failure." into jb-mr1-dev 
* commit '599885d5308992b2554993903b717c5f0eb5b6a8':
 2012-10-29 12:46:28 -07:00
Chris Wren
0d3215c24c am f0cec427: Merge "remove debug logs." into jb-mr1-lockscreen-dev 
* commit 'f0cec427a4f73bda130eda98c2a7f70e44ff587b':
  remove debug logs.
 2012-10-29 12:46:24 -07:00
Victoria Lease
de877ac28d am 405e6746: am f704e9f6: Merge "revise android.location.Geofence documentation" into jb-mr1-dev 
* commit '405e6746c671a41742581fa1313ca6d52f3484c7':
 2012-10-29 12:46:20 -07:00
Adam Cohen
f2344e087c am a9f16669: Merge "Fading side pages as per mock" into jb-mr1-lockscreen-dev 
* commit 'a9f166695b92e91ea6bb13a41f3aa1fb3f6ee77c':
  Fading side pages as per mock
 2012-10-29 12:46:16 -07:00
Chris Wren
a90f82fc10 am ff872257: Merge "catch exceptional cases on factory-fresh devices." into jb-mr1-lockscreen-dev 
* commit 'ff8722574ee335453845c3dc04435a20dc94a99b':
  catch exceptional cases on factory-fresh devices.
 2012-10-29 12:46:13 -07:00
Christopher Tate
d56476e205 am 698e144f: am acf5943c: Merge "Fix the Backup Manager\'s uninstall tracking" into jb-mr1-dev 
* commit '698e144f70ff1482452922f159789c2f24a5162c':
 2012-10-29 12:46:09 -07:00
Baligh Uddin
ea2078e82f am 985dc142: Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev 
* commit '985dc142642c43e54c15a436027a11d9b61ab3d8':
  Import translations. DO NOT MERGE
 2012-10-29 12:46:05 -07:00
Baligh Uddin
b7ac4cbe50 am 2171fa1c: am 0fa4cf5b: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit '2171fa1cd3be23fba4d3be077ff0cd6521762107':
 2012-10-29 12:46:00 -07:00
Jeff Brown
9b687f45d0 am d9fb5848: am 1202c436: Merge "Secure windows, secure surface views and secure displays." into jb-mr1-dev 
* commit 'd9fb5848c8f049b1b2e08b415e40e08de814c5e5':
 2012-10-29 12:45:56 -07:00
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
3e31a0dc91 am 83f60c52: Merge "FusedLocation runs per user as user" into jb-mr1-dev 
* commit '83f60c5247ba60b6aa536b2d8191df9289102600':
  FusedLocation runs per user as user
 2012-10-29 10:36:46 -07:00
Victoria Lease
c3921fd000 am 167282f1: Merge "Revert "make FLP play nicely with multiuser"" into jb-mr1-dev 
* commit '167282f19f58ba5271c37bb16c4ea5bcd0bf6303':
  Revert "make FLP play nicely with multiuser"
 2012-10-29 10:36:43 -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
9ba407e3af Import translations. DO NOT MERGE 
Change-Id: Ideb9e258dada5d4f7fcc570ffe4d514597b04f30
Auto-generated-cl: translation import
 2012-10-29 10:18:33 -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
5193efba34 am 4bfa1e99: Merge "Fix handling escaped chars in ssid" into jb-mr1-dev 
* commit '4bfa1e99e2ce5aa96465872a159377102a5bb4cb':
  Fix handling escaped chars in ssid
 2012-10-29 10:14:05 -07:00