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

94142 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Jason Simmons
d45f2ae845 am e49b9c05: am df304ba0: resolved conflicts for merge of 83b9647d to jb-mr1-aah-dev 
* commit 'e49b9c05c3774ab9409701788d4e00ced6292a4a':
  Integrate new PIN pad.
 2012-10-29 12:26:18 -07:00
Jason Simmons
e49b9c05c3 am df304ba0: resolved conflicts for merge of 83b9647d to jb-mr1-aah-dev 
* commit 'df304ba0babc04025c3b39c079a64aed8d1a6e07':
  Integrate new PIN pad.
 2012-10-29 12:23:45 -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
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
3af4f620a8 Import translations. DO NOT MERGE 
Change-Id: Ide6197bbfefc0d74400e594f87c983eee2a75f66
Auto-generated-cl: translation import
 2012-10-29 10:20:09 -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
Baligh Uddin
02dd5adb81 Import translations. DO NOT MERGE 
Change-Id: I598ef225d48f01d3fe75bfeda11f77d282def602
Auto-generated-cl: translation import
 2012-10-29 10:09:21 -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
Jeff Brown
a862a8fb67 am f2012747: am 46ea0544: am f33ff923: am 6fd394ae: Merge "Improve auto-brightness hysteresis." into jb-mr1-dev 
* commit 'f2012747c3abd0802809b589aa10a4e0a62b6530':
 2012-10-29 09:34:08 -07:00
Chris Wren
e5289a1120 am c5bb27d2: am 0882fe87: am 3867ddab: Merge "merge new multiuser avatars in from proto app" into jb-mr1-lockscreen-dev 
* commit 'c5bb27d246cdc2b66b20cf11e5521e6c1d1f7ac5':
  merge new multiuser avatars in from proto app
 2012-10-29 09:34:03 -07:00
Baligh Uddin
0963dcf1d2 am d541b057: (-s ours) am 52b5f97d: am 1afe7788: am 8ed48222: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit 'd541b05725e786e5dd2dfabc260c31ed93ea45cf':
 2012-10-29 09:33:59 -07:00
Baligh Uddin
4b40a3a9ce am 8d631daf: (-s ours) am 3adefe73: am 22f91da2: Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev 
* commit '8d631daf5bc68e0937e79e2287100a8be78b8600':
  Import translations. DO NOT MERGE
 2012-10-29 09:33:55 -07:00
Romain Guy
92208e0cf6 am f3cb39a4: am 9808258f: am 0472d565: am 04c8d402: Merge "Properly draw the window background on window resize Bug #7385090" into jb-mr1-dev 
* commit 'f3cb39a41e809eb699b466b34486adc521f5baef':
 2012-10-29 09:33:51 -07:00
Irfan Sheriff
f530f8b0ae am 0e930cd6: am bc685c49: am 086dc1ce: am c48ca657: Merge "Fix driver stop handling" into jb-mr1-dev 
* commit '0e930cd6ff483f29caf3eb90775bf928772f81f3':
 2012-10-29 09:33:47 -07:00
Baligh Uddin
838abd170d am 4145dc50: (-s ours) am f501a9cd: am bd28f237: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev 
* commit '4145dc5009391a85be5556c6fb0892e89b9bda48':
  Import translations. DO NOT MERGE
 2012-10-29 09:33:44 -07:00
Baligh Uddin
57a83a554a am 59660b3a: (-s ours) am 379c47ec: am 66e893fb: (-s ours) am 21ce854b: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit '59660b3a1bdd1d9393093dd1b4f752eea770ce68':
 2012-10-29 09:28:59 -07:00
Victoria Lease
a5f9b3fc26 FusedLocation runs per user as user 
Change-Id: Ib9589000f201902bd6be2d58413c11b9340cf6ac
 2012-10-29 09:28:53 -07:00
Jeff Brown
f2012747c3 am 46ea0544: am f33ff923: am 6fd394ae: Merge "Improve auto-brightness hysteresis." into jb-mr1-dev 
* commit '46ea05449516bfe8c4b90e4d89f92cce5286baaa':
 2012-10-29 09:28:27 -07:00
Chris Wren
c5bb27d246 am 0882fe87: am 3867ddab: Merge "merge new multiuser avatars in from proto app" into jb-mr1-lockscreen-dev 
* commit '0882fe87d4e104796ffa4dad94e07ec8abc69685':
  merge new multiuser avatars in from proto app
 2012-10-29 09:28:18 -07:00
Baligh Uddin
d541b05725 am 52b5f97d: am 1afe7788: am 8ed48222: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit '52b5f97ddb06b1863ec9ec78a390c5ec699d152d':
 2012-10-29 09:28:11 -07:00
Baligh Uddin
8d631daf5b am 3adefe73: am 22f91da2: Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev 
* commit '3adefe7338df5a7c995540f4094c9f8c30db9a2e':
  Import translations. DO NOT MERGE
 2012-10-29 09:28:08 -07:00
Romain Guy
f3cb39a41e am 9808258f: am 0472d565: am 04c8d402: Merge "Properly draw the window background on window resize Bug #7385090" into jb-mr1-dev 
* commit '9808258f46badbe1e30e67ff66b2c0f1234ca966':
 2012-10-29 09:28:04 -07:00
Irfan Sheriff
0e930cd6ff am bc685c49: am 086dc1ce: am c48ca657: Merge "Fix driver stop handling" into jb-mr1-dev 
* commit 'bc685c49db5a6cf0065c63139ef64fa8ddc1205c':
 2012-10-29 09:28:01 -07:00
Baligh Uddin
4145dc5009 am f501a9cd: am bd28f237: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev 
* commit 'f501a9cde8db8165ddbc8cf134b23b1d5353e470':
  Import translations. DO NOT MERGE
 2012-10-29 09:27:57 -07:00
Daniel Sandler
bf917c32c1 am 9b37258c: am 8fe9a197: am 79db4800: am 365ece1d: Merge "Dreams/Sleep Mode is now Daydreams." into jb-mr1-dev 
* commit '9b37258cdd54c10dba95647da73da93d16bb4b58':
 2012-10-29 09:27:19 -07:00
Justin Ho
6c0eaaf264 am d5d44eec: am d8b4f070: am c1c03c42: am 5d6562d3: Merge "Avoid mentioning hidden API in docs." into jb-mr1-dev 
* commit 'd5d44eec1c1b03bedd653b0b217cb593108f1136':
 2012-10-29 09:27:16 -07:00
Irfan Sheriff
9a3d769d09 am 9e8f2cb1: am f4f66363: am 5f8e3f2b: am bf310d1f: Merge "Fix issues shown on CTS tests" into jb-mr1-dev 
* commit '9e8f2cb1f103227f8644a25a75fecce6f690e2fe':
 2012-10-29 09:27:12 -07:00
Jeff Sharkey
4356a00907 am dc567730: am af8974dd: am 32a1c5f7: am 1c8135ad: Merge "Update docs for multi-user storage behavior." into jb-mr1-dev 
* commit 'dc56773025264c8dbe52515037f3e184c815c43a':
 2012-10-29 09:27:08 -07:00
Daniel Sandler
095622f59d am 8d8985e0: am 7fa5c737: am cf64067c: am 0058f4ed: Merge "Reset ExpandHelper when the panel is collapsed." into jb-mr1-dev 
* commit '8d8985e02b50b3b82aadc5cc51a75b98b2144c66':
 2012-10-29 09:27:05 -07:00
John Spurlock
d52976ce40 am c02aab5f: am 19a2f530: am 31821c5b: am 780a13b0: Merge "Fix nav bar glitch when quickly turning screen off then on." into jb-mr1-dev 
* commit 'c02aab5f8b0f868a9bb14c6f4fda640f2b866aa5':
 2012-10-29 09:26:57 -07:00
Jim Miller
1e944cd381 am 6655f4c9: am bf83ea6a: am 5d3f8599: Merge multi-user stuff from prototype into framework. 
* commit '6655f4c9c7d692b299333ddb93efd68d629c85d3':
  Merge multi-user stuff from prototype into framework.
 2012-10-29 09:26:53 -07:00
Jim Miller
f6faa5312e am 7c7bf36e: am 8615a071: am 022554e3: Merge latest prototype changes into keyguard 
* commit '7c7bf36e48a73727f4ac255f908f78bcfea04507':
  Merge latest prototype changes into keyguard
 2012-10-29 09:26:47 -07:00
Jim Miller
3fd568999b am c5848971: am 17ac77c7: am c28261d4: Merge "Wire up "add widget" in keyguard" into jb-mr1-lockscreen-dev 
* commit 'c584897164c79e5949f41377be9adeede0f36668':
  Wire up "add widget" in keyguard
 2012-10-29 09:26:43 -07:00
erin rosenthal
89c4caa141 am a1759f42: am ea6bfffa: am 9415aa1c: am 36425d19: Merge "Catch badly formed URLs in WebView accessibility injector." into jb-mr1-dev 
* commit 'a1759f4213adf3fdb881eb85d102c2bb6f6321e4':
 2012-10-29 09:26:37 -07:00