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

80153 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Craig Mautner
69d00187c1 am 0721bde2: am 47adf865: Merge "Fix exposing wallpaper on rotations and other." into jb-dev 
* commit '0721bde26c73861bb40a5732cb63741d13776e36':
  Fix exposing wallpaper on rotations and other.
 2012-06-12 13:00:19 -07:00
Dianne Hackborn
b1add0b8f2 am 6892f1ec: am 0f6471ac: Merge "Fix issue #6641368: can\'t launch gallery" into jb-dev 
* commit '6892f1ec9670432f1cab71813592077bea991a8b':
  Fix issue #6641368: can't launch gallery
 2012-06-12 13:00:15 -07:00
Eric Fischer
830dfe41d1 am 19e046c4: (-s ours) am 1b159f66: Merge "Import translations. DO NOT MERGE" into jb-dev 
* commit '19e046c4d2f11e6ed5d324122996080942e94569':
  Import translations. DO NOT MERGE
 2012-06-12 13:00:08 -07:00
Chia-chi Yeh
7c727e50f1 am a2becffc: am d667aebf: Merge "VPN: move VpnDialogs away from system uid." into jb-dev 
* commit 'a2becffcf2a19889b90256a8479e276081ce6108':
  VPN: move VpnDialogs away from system uid.
 2012-06-12 12:59:59 -07:00
Amith Yamasani
82f47c95b6 Merge "Disable lockscreen using a system property." 2012-06-12 12:57:18 -07:00
Craig Mautner
0721bde26c am 47adf865: Merge "Fix exposing wallpaper on rotations and other." into jb-dev 
* commit '47adf865bddf6c81051d457e04785408d2710f60':
  Fix exposing wallpaper on rotations and other.
 2012-06-12 12:41:50 -07:00
Dianne Hackborn
6892f1ec96 am 0f6471ac: Merge "Fix issue #6641368: can\'t launch gallery" into jb-dev 
* commit '0f6471ace77387560988964ed0679f843bba6f1f':
  Fix issue #6641368: can't launch gallery
 2012-06-12 12:41:36 -07:00
Eric Fischer
19e046c4d2 am 1b159f66: Merge "Import translations. DO NOT MERGE" into jb-dev 
* commit '1b159f66eed528f9cda04a316a1958a7ce79ee48':
  Import translations. DO NOT MERGE
 2012-06-12 12:41:20 -07:00
Chia-chi Yeh
a2becffcf2 am d667aebf: Merge "VPN: move VpnDialogs away from system uid." into jb-dev 
* commit 'd667aebfb34085960e2b41a2f52d10ae749ec44c':
  VPN: move VpnDialogs away from system uid.
 2012-06-12 12:41:12 -07:00
Jeff Brown
681f745916 am 7d9a18ee: Merge "resolved conflicts for merge of 926a5c50 to jb-dev-plus-aosp" into jb-dev-plus-aosp 
* commit '7d9a18eeb684e87da5a907c96d25da21918119b5':
  Remove edge slop handling from ScaleGestureDetector.
 2012-06-12 12:41:11 -07:00
Jeff Brown
7d9a18eeb6 Merge "resolved conflicts for merge of 926a5c50 to jb-dev-plus-aosp" into jb-dev-plus-aosp 2012-06-12 12:37:42 -07:00
Amith Yamasani
d1645f8d0f Disable lockscreen using a system property. 
For factory testing.

Change-Id: Ie5b8be432ab8ad40d8752f978899987c95a5aef9
 2012-06-12 11:53:26 -07:00
Jeff Brown
f195b80c2b resolved conflicts for merge of 926a5c50 to jb-dev-plus-aosp 
Change-Id: I1426b282bb4c392b0a5bcb96760c04f215a26b4e
 2012-06-12 11:10:26 -07:00
Irfan Sheriff
42da1f401b Merge "Clear interface addresses upon disconnect" 2012-06-12 10:36:11 -07:00
George Mount
7c79dd674a Merge "Move handle into view after using it for scrolling." 2012-06-12 08:32:48 -07:00
George Mount
ab70020137 Merge "Fix caret handle offset" 2012-06-12 08:32:35 -07:00
Jean-Baptiste Queru
275784f26c am 01cb25fd: resolved conflicts for merge of 29bea61c to jb-dev-plus-aosp 
* commit '01cb25fddeb03d72585ae13a8a1f1721f4bcef8c':
  Added support for customization of mobile data setting.
 2012-06-12 08:28:55 -07:00
Jean-Baptiste Queru
01cb25fdde resolved conflicts for merge of 29bea61c to jb-dev-plus-aosp 
Change-Id: If582e1fa99691b4e4182c3a9b148fcef5cad251e
 2012-06-12 08:13:10 -07:00
Jean-Baptiste Queru
29bea61cac am f01f6b6d: Merge "Added support for customization of mobile data setting." 
* commit 'f01f6b6d379c911a2c1e350bc758cea26bfe6d9d':
  Added support for customization of mobile data setting.
 2012-06-12 08:04:53 -07:00
Jean-Baptiste Queru
f01f6b6d37 Merge "Added support for customization of mobile data setting." 2012-06-12 07:48:53 -07:00
Geremy Condra
3a4832aa64 am 6e668238: (-s ours) am e1b573a3: (-s ours) am b4151b29: (-s ours) Merge "DO NOT MERGE Add API for file origin policy." 
* commit '6e66823873915bfd6e6c7b9b5c92e1e7e010977f':
  DO NOT MERGE Add API for file origin policy.
 2012-06-11 17:52:11 -07:00
Geremy Condra
6e66823873 am e1b573a3: (-s ours) am b4151b29: (-s ours) Merge "DO NOT MERGE Add API for file origin policy." 
* commit 'e1b573a32b3c381dd2d0fd90f3d1cce7d5719ca9':
  DO NOT MERGE Add API for file origin policy.
 2012-06-11 17:47:16 -07:00
Geremy Condra
e1b573a32b am b4151b29: (-s ours) Merge "DO NOT MERGE Add API for file origin policy." 
* commit 'b4151b296fbeb39a367bb9930d605180d683ca11':
  DO NOT MERGE Add API for file origin policy.
 2012-06-11 17:43:10 -07:00
Geremy Condra
b4151b296f Merge "DO NOT MERGE Add API for file origin policy." 2012-06-11 16:53:43 -07:00
Dianne Hackborn
0ed6f9a01f am 3430959c: am 569f5bdd: am 37d8ac1b: Merge "SystemServer: Looper\'s getMainLooper to return ServerThread" 
* commit '3430959c4dce7ff5e4a8bac2f9e1c3f3a8307079':
  SystemServer: Looper's getMainLooper to return ServerThread
 2012-06-11 16:41:24 -07:00
Dianne Hackborn
fdfe58126d am acfb11b7: am 2e479fef: am bb536096: Merge "Improved documentation (clarify on issue 8727)" 
* commit 'acfb11b7c49cd0c3e653700f414c014fccc5aec3':
  Improved documentation (clarify on issue 8727)
 2012-06-11 16:41:19 -07:00
Wink Saville
702182d340 am e0f8b91e: am 4853f944: am 3fe79dfd: Merge "Adds utility method to convert 0.25 secs to decimal degrees" 
* commit 'e0f8b91e049b51770329c43e38aa88ccbb957104':
  Adds utility method to convert 0.25 secs to decimal degrees
 2012-06-11 16:41:16 -07:00
Dianne Hackborn
23a947664f am 82b131f2: am f6e39b06: am a03696dc: Merge "ApplicationThread: Check interface before invoking scheduleLowMemory" 
* commit '82b131f27418ecdd60d52638a72d01d4ad2b109f':
  ApplicationThread: Check interface before invoking scheduleLowMemory
 2012-06-11 16:41:13 -07:00
Wink Saville
f8030e419c am f75e3e01: am c07055c4: am bc69f97c: Merge "Adds documentation to CdmaCellLocation get lat/long methods" 
* commit 'f75e3e01f6e574a411fa936e070a7a9f2f606da7':
  Adds documentation to CdmaCellLocation get lat/long methods
 2012-06-11 16:41:10 -07:00
Dianne Hackborn
3430959c4d am 569f5bdd: am 37d8ac1b: Merge "SystemServer: Looper\'s getMainLooper to return ServerThread" 
* commit '569f5bddd2494bdeae07a6b278f6df6cc8579981':
  SystemServer: Looper's getMainLooper to return ServerThread
 2012-06-11 16:36:52 -07:00
Dianne Hackborn
acfb11b7c4 am 2e479fef: am bb536096: Merge "Improved documentation (clarify on issue 8727)" 
* commit '2e479fefbfcb388d2aa62978307420357f322441':
  Improved documentation (clarify on issue 8727)
 2012-06-11 16:36:49 -07:00
Wink Saville
e0f8b91e04 am 4853f944: am 3fe79dfd: Merge "Adds utility method to convert 0.25 secs to decimal degrees" 
* commit '4853f944ac4befba42219f6db8ed02b44a3e0d2b':
  Adds utility method to convert 0.25 secs to decimal degrees
 2012-06-11 16:36:46 -07:00
Dianne Hackborn
82b131f274 am f6e39b06: am a03696dc: Merge "ApplicationThread: Check interface before invoking scheduleLowMemory" 
* commit 'f6e39b068d1d5491dc3d73d73f598790688a1c4e':
  ApplicationThread: Check interface before invoking scheduleLowMemory
 2012-06-11 16:36:42 -07:00
Wink Saville
f75e3e01f6 am c07055c4: am bc69f97c: Merge "Adds documentation to CdmaCellLocation get lat/long methods" 
* commit 'c07055c4a6e92a6c82e193c5b87b35d97418a73b':
  Adds documentation to CdmaCellLocation get lat/long methods
 2012-06-11 16:36:39 -07:00
Dianne Hackborn
569f5bddd2 am 37d8ac1b: Merge "SystemServer: Looper\'s getMainLooper to return ServerThread" 
* commit '37d8ac1b5629e3159c662a0d77503cfe85660d86':
  SystemServer: Looper's getMainLooper to return ServerThread
 2012-06-11 16:32:29 -07:00
Dianne Hackborn
2e479fefbf am bb536096: Merge "Improved documentation (clarify on issue 8727)" 
* commit 'bb5360966668ca8e97c02363b0d87dc9c9ae2451':
  Improved documentation (clarify on issue 8727)
 2012-06-11 16:32:26 -07:00
Wink Saville
4853f944ac am 3fe79dfd: Merge "Adds utility method to convert 0.25 secs to decimal degrees" 
* commit '3fe79dfdf4ca63535ec9e586ebed553a862061ea':
  Adds utility method to convert 0.25 secs to decimal degrees
 2012-06-11 16:32:23 -07:00
Dianne Hackborn
f6e39b068d am a03696dc: Merge "ApplicationThread: Check interface before invoking scheduleLowMemory" 
* commit 'a03696dc6b8128bd44dc700b62ef9b5fd3ac4534':
  ApplicationThread: Check interface before invoking scheduleLowMemory
 2012-06-11 16:32:20 -07:00
Wink Saville
c07055c4a6 am bc69f97c: Merge "Adds documentation to CdmaCellLocation get lat/long methods" 
* commit 'bc69f97c663ec37aabf8ac4192752ecba0e00200':
  Adds documentation to CdmaCellLocation get lat/long methods
 2012-06-11 16:32:17 -07:00
Dianne Hackborn
37d8ac1b56 Merge "SystemServer: Looper's getMainLooper to return ServerThread" 2012-06-11 16:02:34 -07:00
Dianne Hackborn
bb53609666 Merge "Improved documentation (clarify on issue 8727)" 2012-06-11 16:01:38 -07:00
Wink Saville
3fe79dfdf4 Merge "Adds utility method to convert 0.25 secs to decimal degrees" 2012-06-11 15:58:26 -07:00
Dianne Hackborn
a03696dc6b Merge "ApplicationThread: Check interface before invoking scheduleLowMemory" 2012-06-11 15:58:22 -07:00
Wink Saville
bc69f97c66 Merge "Adds documentation to CdmaCellLocation get lat/long methods" 2012-06-11 15:57:03 -07:00
Irfan Sheriff
b81bb9b408 Clear interface addresses upon disconnect 
Change-Id: I8ce289cfc72babe894ce9f4d0119a2f2ac5f0859
Signed-off-by: Irfan Sheriff <isheriff@google.com>
Signed-off-by: Yoshihiko Ikenaga <yoshihiko.ikenaga@jp.sony.com>
 2012-06-11 15:48:50 -07:00
Jean-Baptiste Queru
5a6b62400c am 21e13d9c: am 237fa190: (-s ours) am 68ecb32e: Merge "stagefright aacenc: Move system headers before local headers" 
* commit '21e13d9c7de1c2853eed5d35a74955e1865abfa4':
  stagefright aacenc: Move system headers before local headers
 2012-06-11 14:33:53 -07:00
Jean-Baptiste Queru
21e13d9c7d am 237fa190: (-s ours) am 68ecb32e: Merge "stagefright aacenc: Move system headers before local headers" 
* commit '237fa1901fee9617e5e8073470bd4fb7a224541f':
  stagefright aacenc: Move system headers before local headers
 2012-06-11 14:29:22 -07:00
Jean-Baptiste Queru
237fa1901f am 68ecb32e: Merge "stagefright aacenc: Move system headers before local headers" 
* commit '68ecb32eed09e1c6e834269e8f0c248ccb4097cf':
  stagefright aacenc: Move system headers before local headers
 2012-06-11 14:18:58 -07:00
Jean-Baptiste Queru
68ecb32eed Merge "stagefright aacenc: Move system headers before local headers" 2012-06-11 14:02:08 -07:00
Martin Storsjo
8606e6b4da stagefright aacenc: Move system headers before local headers 
This avoids issues with the encoder's own definition of __inline,
which conflicts with headers brought in by string.h in glibc.

Change-Id: I9e3fbf8d892529940ea67a46e67a9abe71d9c5fa
 2012-06-11 23:32:42 +03:00