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

39838 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Romain Guy
701d7c90c2 am dee6089c: am 2e0c5261: Merge "Add logging to the new layers API." into honeycomb 
* commit 'dee6089c2de42fcddfd22781c90a2e797b5f592c':
  Add logging to the new layers API.
 2011-01-12 14:35:59 -08:00
Mike Lockwood
fa824023b0 am 0b44f6f5: am 0dd9f4de: MediaScanner: Do not update the file path when updating records already in the database 
* commit '0b44f6f588bb8836c1ef94e8b1f70ed49e2be53b':
  MediaScanner: Do not update the file path when updating records already in the database
 2011-01-12 14:33:42 -08:00
Romain Guy
dee6089c2d am 2e0c5261: Merge "Add logging to the new layers API." into honeycomb 
* commit '2e0c52610bd5787d716840c71c54ee23ac3fcdd4':
  Add logging to the new layers API.
 2011-01-12 14:33:10 -08:00
Mike Lockwood
d568d1ef2a am 7ff08aeb: am a2946433: Merge "Media Provider and MTP now use emulated /mnt/sdcard instead of /data/media" into honeycomb 
* commit '7ff08aeb7e858513c295e5289f6659b2d1d5574d':
  Media Provider and MTP now use emulated /mnt/sdcard instead of /data/media
 2011-01-12 14:31:24 -08:00
Mike Lockwood
0d06250058 am b43982e1: am c13db225: Merge "Remove permission android.permission.WRITE_MEDIA_STORAGE" into honeycomb 
* commit 'b43982e10de1d13734badb2a10d6eaf2ff8fb298':
  Remove permission android.permission.WRITE_MEDIA_STORAGE
 2011-01-12 14:31:21 -08:00
Mike Lockwood
0b44f6f588 am 0dd9f4de: MediaScanner: Do not update the file path when updating records already in the database 
* commit '0dd9f4de3ed681e83bd79ddcd4fd463093d11ed3':
  MediaScanner: Do not update the file path when updating records already in the database
 2011-01-12 14:30:53 -08:00
Romain Guy
2e0c52610b Merge "Add logging to the new layers API." into honeycomb 2011-01-12 14:29:15 -08:00
Romain Guy
1fc883b271 Add logging to the new layers API. 
Change-Id: I78b9426eb17de3e775aca9fafe4a50bd9c0785c4
 2011-01-12 14:31:55 -08:00
Mike Lockwood
7ff08aeb7e am a2946433: Merge "Media Provider and MTP now use emulated /mnt/sdcard instead of /data/media" into honeycomb 
* commit 'a29464335a1d164fde0817715d86ba6224d0a61f':
  Media Provider and MTP now use emulated /mnt/sdcard instead of /data/media
 2011-01-12 14:28:37 -08:00
Mike Lockwood
b43982e10d am c13db225: Merge "Remove permission android.permission.WRITE_MEDIA_STORAGE" into honeycomb 
* commit 'c13db22581aebe0ad16a833e778eedf947eccd1f':
  Remove permission android.permission.WRITE_MEDIA_STORAGE
 2011-01-12 14:28:33 -08:00
Mike Lockwood
0dd9f4de3e MediaScanner: Do not update the file path when updating records already in the database 
The path should never change (media scanner treats renames as a delete and an insert)
and we want to preserve the mixed case paths in the database to avoid exposing the
lowercase squashing to MTP.

Change-Id: I79ef37e143c607242d438a4a0643d40191965b6a
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-01-12 17:27:37 -05:00
Mike Lockwood
a29464335a Merge "Media Provider and MTP now use emulated /mnt/sdcard instead of /data/media" into honeycomb 2011-01-12 14:25:13 -08:00
Mike Lockwood
c13db22581 Merge "Remove permission android.permission.WRITE_MEDIA_STORAGE" into honeycomb 2011-01-12 14:25:05 -08:00
Romain Guy
0880af5983 am 1138401f: am e465b117: Merge "Better debug info for layers." into honeycomb 
* commit '1138401f348b2e30dc48c01da9a26e66e51b318c':
  Better debug info for layers.
 2011-01-12 14:19:51 -08:00
Romain Guy
3aaff3aef4 Better debug info for layers. 
Change-Id: I816c2446a33a1135553eaeea2f89c7418641cfe1
 2011-01-12 14:18:47 -08:00
Romain Guy
1138401f34 am e465b117: Merge "Better debug info for layers." into honeycomb 
* commit 'e465b11745cdc49283c360fb2acf01649f4f4fb0':
  Better debug info for layers.
 2011-01-12 14:17:59 -08:00
Romain Guy
e465b11745 Merge "Better debug info for layers." into honeycomb 2011-01-12 14:15:59 -08:00
Gilles Debunne
51f9ecdde0 am ee3aadbc: am 54c38bf0: Merge "New QuickContactBadge holo style." into honeycomb 
* commit 'ee3aadbc95a7b337bfef4ba5058c2605b10da357':
  New QuickContactBadge holo style.
 2011-01-12 14:11:31 -08:00
Gilles Debunne
ee3aadbc95 am 54c38bf0: Merge "New QuickContactBadge holo style." into honeycomb 
* commit '54c38bf05da42e40b8726ab2b5a33762081e9345':
  New QuickContactBadge holo style.
 2011-01-12 14:09:42 -08:00
Gilles Debunne
54c38bf05d Merge "New QuickContactBadge holo style." into honeycomb 2011-01-12 14:07:26 -08:00
Jason Sams
a804e734d0 am fc6528ec: am 8f597fdf: Merge "Cleanup bitmap uploads Implement standalone mipmap generation." into honeycomb 
* commit 'fc6528ecd1c1285c909cb81ca2196c65086944b1':
  Cleanup bitmap uploads Implement standalone mipmap generation.
 2011-01-12 13:35:05 -08:00
Jason Sams
fc6528ecd1 am 8f597fdf: Merge "Cleanup bitmap uploads Implement standalone mipmap generation." into honeycomb 
* commit '8f597fdfacd1b9cda6dfebf4f3a1c34d1ffb5b2f':
  Cleanup bitmap uploads Implement standalone mipmap generation.
 2011-01-12 13:33:22 -08:00
Jason Sams
8f597fdfac Merge "Cleanup bitmap uploads Implement standalone mipmap generation." into honeycomb 2011-01-12 13:30:41 -08:00
Jason Sams
f7086090cf Cleanup bitmap uploads 
Implement standalone mipmap generation.

Change-Id: Ie3a9781bbe50e2f58adca6f184d84fea50e40263
 2011-01-12 13:28:37 -08:00
Amith Yamasani
071cc154a2 am c738ef5b: am fb0a242b: Merge "Use light preference panel drawable for Theme.Light" into honeycomb 
* commit 'c738ef5b30f15ab8cbb47257a29cbddf830dddae':
  Use light preference panel drawable for Theme.Light
 2011-01-12 13:21:54 -08:00
Amith Yamasani
c738ef5b30 am fb0a242b: Merge "Use light preference panel drawable for Theme.Light" into honeycomb 
* commit 'fb0a242be65e4ddbda0cbaec1ac949d29568ac25':
  Use light preference panel drawable for Theme.Light
 2011-01-12 13:20:04 -08:00
Jim Miller
42118a2c42 am 530f77ea: am a3a078e3: Merge "Fix 3201849: Use custom Drawable for bg in lockscreen" into honeycomb 
* commit '530f77ea61f71e2b2fb8b64b1c5c3267393e5d84':
  Fix 3201849: Use custom Drawable for bg in lockscreen
 2011-01-12 13:18:45 -08:00
Amith Yamasani
fb0a242be6 Merge "Use light preference panel drawable for Theme.Light" into honeycomb 2011-01-12 13:18:20 -08:00
Jim Miller
530f77ea61 am a3a078e3: Merge "Fix 3201849: Use custom Drawable for bg in lockscreen" into honeycomb 
* commit 'a3a078e34317763ad1294e0164c147074584e2e8':
  Fix 3201849: Use custom Drawable for bg in lockscreen
 2011-01-12 13:16:56 -08:00
Jim Miller
a3a078e343 Merge "Fix 3201849: Use custom Drawable for bg in lockscreen" into honeycomb 2011-01-12 13:14:33 -08:00
Dianne Hackborn
e4ec625547 am 45a1ada5: am 02e852f9: Merge "Make ProgressDialog a little less lame." into honeycomb 
* commit '45a1ada57059e012c6d0cf216cafd852dd1b42ed':
  Make ProgressDialog a little less lame.
 2011-01-12 13:03:29 -08:00
Dianne Hackborn
45a1ada570 am 02e852f9: Merge "Make ProgressDialog a little less lame." into honeycomb 
* commit '02e852f968bac83947cd97a5fe7c7a7064774c5a':
  Make ProgressDialog a little less lame.
 2011-01-12 13:01:42 -08:00
Dianne Hackborn
02e852f968 Merge "Make ProgressDialog a little less lame." into honeycomb 2011-01-12 12:59:27 -08:00
Romain Guy
b69e249af8 am 5ecceb7d: am 85354828: Merge "Cleanup GL objects on the correct thread." into honeycomb 
* commit '5ecceb7df70a6e6b2a32ab97630bc625000261da':
  Cleanup GL objects on the correct thread.
 2011-01-12 12:54:28 -08:00
Romain Guy
5ecceb7df7 am 85354828: Merge "Cleanup GL objects on the correct thread." into honeycomb 
* commit '853548287ffe4eb85d1bd10669270292336d137a':
  Cleanup GL objects on the correct thread.
 2011-01-12 12:52:41 -08:00
Romain Guy
b89718ef7c am b353b3ca: am cf894c91: Merge "Fix CTS test. Bug #3345445" into honeycomb 
* commit 'b353b3ca7a615b1c857514d775829d95fd6431bc':
  Fix CTS test. Bug #3345445
 2011-01-12 12:51:23 -08:00
Romain Guy
853548287f Merge "Cleanup GL objects on the correct thread." into honeycomb 2011-01-12 12:50:50 -08:00
Romain Guy
57066eb64c Cleanup GL objects on the correct thread. 
Change-Id: Iddfea6e08a6591a4fab147151098ef27005f373d
 2011-01-12 12:53:32 -08:00
Romain Guy
9454fe1080 Fix CTS test. 
Bug #3345445

Change-Id: I3e9fa6002d173e6c9182ee5798420829e4bd2e30
 2011-01-12 12:50:05 -08:00
Romain Guy
b353b3ca7a am cf894c91: Merge "Fix CTS test. Bug #3345445" into honeycomb 
* commit 'cf894c91a9b6c7749c9bb325c9e54336b97df900':
  Fix CTS test. Bug #3345445
 2011-01-12 12:49:35 -08:00
Romain Guy
cf894c91a9 Merge "Fix CTS test. Bug #3345445" into honeycomb 2011-01-12 12:47:30 -08:00
Kenny Root
79bf996243 am aee96e97: am 5e9ba49f: Merge "Skip SD card tests on devices without SD cards" into honeycomb 
* commit 'aee96e9773c0bddc64f80c4d9ebc0b132726ea1d':
  Skip SD card tests on devices without SD cards
 2011-01-12 12:32:09 -08:00
Kenny Root
aee96e9773 am 5e9ba49f: Merge "Skip SD card tests on devices without SD cards" into honeycomb 
* commit '5e9ba49f5efed4f0adc7ffcf5052668cdfd92a25':
  Skip SD card tests on devices without SD cards
 2011-01-12 12:30:17 -08:00
Kenny Root
5e9ba49f5e Merge "Skip SD card tests on devices without SD cards" into honeycomb 2011-01-12 12:28:39 -08:00
Jaikumar Ganesh
404e1a3ccf am 7347f5e8: am 95a4751f: Merge "Add ability to parse keyboard fixed pin auto pair blacklist." into honeycomb 
* commit '7347f5e830b08685f78299d5bcbf6987753dd0ed':
  Add ability to parse keyboard fixed pin auto pair blacklist.
 2011-01-12 12:26:50 -08:00
Jaikumar Ganesh
b67d1befcd am 5e2f9db3: am fc019bd4: Merge "Revert "Add temporary hack for keyboards not following spec."" into honeycomb 
* commit '5e2f9db3f15f36ad931213c15837d48c5fdb590f':
  Revert "Add temporary hack for keyboards not following spec."
 2011-01-12 12:26:44 -08:00
Kenny Root
3c67689584 Skip SD card tests on devices without SD cards 
Tests were giving false failures when they should instead be skipped.
Forcing an install to an SD card on a device without one shouldn't count
as a failure. It's expected behavior.

Bug: 3216422
Change-Id: Ia523861d1331e74c76b434f7ba73b642d474a9cc
 2011-01-12 12:26:26 -08:00
Jaikumar Ganesh
7347f5e830 am 95a4751f: Merge "Add ability to parse keyboard fixed pin auto pair blacklist." into honeycomb 
* commit '95a4751f2111d5d7c03c131e9d9dfad6cc32ceed':
  Add ability to parse keyboard fixed pin auto pair blacklist.
 2011-01-12 12:25:01 -08:00
Jaikumar Ganesh
5e2f9db3f1 am fc019bd4: Merge "Revert "Add temporary hack for keyboards not following spec."" into honeycomb 
* commit 'fc019bd4fa3004ec8e287fee0d277db666891ca3':
  Revert "Add temporary hack for keyboards not following spec."
 2011-01-12 12:24:57 -08:00
Jaikumar Ganesh
95a4751f21 Merge "Add ability to parse keyboard fixed pin auto pair blacklist." into honeycomb 2011-01-12 12:22:57 -08:00