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

47137 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eric Fischer
0dd0a80503 am a78327da: am acca1600: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1 
* commit 'a78327da4588c60b44163d169f9f973edbdde69f':
  Import revised translations.  DO NOT MERGE
 2011-03-15 23:31:55 -07:00
Eric Fischer
a78327da45 am acca1600: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1 
* commit 'acca16004fd58c2b8c489f031281b58551551dc8':
  Import revised translations.  DO NOT MERGE
 2011-03-15 23:29:10 -07:00
Kenny Root
d57440c18e am 29d30cdc: Merge "Add byte limit in addition to ratio for installs DO NOT MERGE" into honeycomb-mr1 
* commit '29d30cdc641fd4ee55434aa487c07b2d4434a7ac':
  Merge "Add byte limit in addition to ratio for installs DO NOT MERGE" into honeycomb-mr1
 2011-03-15 23:23:52 -07:00
Kenny Root
29d30cdc64 Merge "Add byte limit in addition to ratio for installs DO NOT MERGE" into honeycomb-mr1 2011-03-15 23:09:13 -07:00
Justin Ho
cb2d1be93d am a1e4b659: am 9b183a72: Merge "Updated notification asset for DND mode" into honeycomb-mr1 
* commit 'a1e4b659ebeb44e21de7c7cd8f772d218e7553ec':
  Updated notification asset for DND mode
 2011-03-15 21:42:10 -07:00
Justin Ho
a1e4b659eb am 9b183a72: Merge "Updated notification asset for DND mode" into honeycomb-mr1 
* commit '9b183a72bcaab75897d1571d55ecbaf228ed4abd':
  Updated notification asset for DND mode
 2011-03-15 21:37:27 -07:00
Dianne Hackborn
9b7c1274dd am e2e8da7c: am 7c2e76f0: Merge "Improve error reporting for issue #3183612" into gingerbread 
* commit 'e2e8da7c734b71c4b6b81e51e16ce3f4061f0f07':
  Improve error reporting for issue #3183612
 2011-03-15 15:44:18 -07:00
Mike Lockwood
a32b5978b7 am 3c9aa1aa: (-s ours) am b0976320: Merge "DO NOT MERGE: Backport more USB accessory changes from honeycomb" into gingerbread 
* commit '3c9aa1aa093ff8acc5ec71190a35b9ab04d64fda':
  DO NOT MERGE: Backport more USB accessory changes from honeycomb
 2011-03-15 15:44:13 -07:00
Eric Fischer
acca16004f Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1 2011-03-15 14:59:33 -07:00
Dianne Hackborn
e2e8da7c73 am 7c2e76f0: Merge "Improve error reporting for issue #3183612" into gingerbread 
* commit '7c2e76f0a4daa7e4316e7a85d41d3c391319d955':
  Improve error reporting for issue #3183612
 2011-03-15 14:49:45 -07:00
Mike Lockwood
3c9aa1aa09 am b0976320: Merge "DO NOT MERGE: Backport more USB accessory changes from honeycomb" into gingerbread 
* commit 'b09763209980ff9210cc353f2410598220ec0480':
  DO NOT MERGE: Backport more USB accessory changes from honeycomb
 2011-03-15 14:49:37 -07:00
Justin Ho
9b183a72bc Merge "Updated notification asset for DND mode" into honeycomb-mr1 2011-03-15 14:41:30 -07:00
Dianne Hackborn
7c2e76f0a4 Merge "Improve error reporting for issue #3183612" into gingerbread 2011-03-15 14:40:56 -07:00
Eric Fischer
4670b4d95c Import revised translations. DO NOT MERGE 
Change-Id: Ief48781413cadb2a9bd786974e4688ac222d7b36
 2011-03-15 14:40:53 -07:00
Dianne Hackborn
1ab43775d8 Improve error reporting for issue #3183612 
java.lang.SecurityException: Neither user 1209 nor current process
has android.permission.WAKE_LOCK.

Change-Id: I465972ab91b007e04b2ac62550f78583956a4048
 2011-03-15 14:38:02 -07:00
Mike Lockwood
b097632099 Merge "DO NOT MERGE: Backport more USB accessory changes from honeycomb" into gingerbread 2011-03-15 14:04:54 -07:00
Kenny Root
b315078448 am 7ddd62b5: (-s ours) Merge "Add byte limit in addition to ratio for installs DO NOT MERGE" into honeycomb-mr1 
* commit '7ddd62b5bedf9065bba00e25aa62f2eae14cf92e':
  Add byte limit in addition to ratio for installs DO NOT MERGE
 2011-03-15 14:03:50 -07:00
Kenny Root
7ddd62b5be Merge "Add byte limit in addition to ratio for installs DO NOT MERGE" into honeycomb-mr1 2011-03-15 14:01:39 -07:00
Mike Lockwood
638d7cb3ee DO NOT MERGE: Backport more USB accessory changes from honeycomb 
Change-Id: I8459c5ab9fbf0b3cad752041484a5de44ca9badd
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-03-15 16:50:18 -04:00
Glenn Kasten
7d7dcb5ea8 am 4528a7db: Merge "Bug 4016329 do full string comparisons" into honeycomb-mr1 
* commit '4528a7db389b4da73207d00ca15b306a111650cc':
  Bug 4016329 do full string comparisons
 2011-03-15 13:46:27 -07:00
Glenn Kasten
4528a7db38 Merge "Bug 4016329 do full string comparisons" into honeycomb-mr1 2011-03-15 13:44:58 -07:00
Mike Lockwood
c9b82ebb97 am 3b7871c2: Merge "USB Manager string clean up:" into honeycomb-mr1 
* commit '3b7871c242bea5834c657c25fbb89c382566f66f':
  USB Manager string clean up:
 2011-03-15 13:42:44 -07:00
Svetoslav Ganov
3b901c4b89 am bdabdda8: Merge "CheckBoxPreferences do not fire accessibility events" into honeycomb-mr1 
* commit 'bdabdda8954a70625368fbfe6bb283a9200bf2f8':
  CheckBoxPreferences do not fire accessibility events
 2011-03-15 13:42:38 -07:00
Mike Lockwood
6a20784e46 am afd1c014: Merge "SqliteDatabase: Fix local reference leak in custom_function_callback()" into honeycomb-mr1 
* commit 'afd1c0143dfa63bd133e3a4163cc9cc4216e3514':
  SqliteDatabase: Fix local reference leak in custom_function_callback()
 2011-03-15 13:42:35 -07:00
Mike Lockwood
3b7871c242 Merge "USB Manager string clean up:" into honeycomb-mr1 2011-03-15 13:34:06 -07:00
Mike Lockwood
ad5f83e91b USB Manager string clean up: 
- Use "Cancel" instead of "Ignore"
- Customize the text for the "always use" checkbox for devices and accessories
- Clean up strings for AccessoryChat test program

Bug: 4074719

Change-Id: Ideec838e4c1f1a82ef4ae411c9124417ffb63165
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-03-15 16:23:40 -04:00
Svetoslav Ganov
bdabdda895 Merge "CheckBoxPreferences do not fire accessibility events" into honeycomb-mr1 2011-03-15 13:23:17 -07:00
Mike Lockwood
afd1c0143d Merge "SqliteDatabase: Fix local reference leak in custom_function_callback()" into honeycomb-mr1 2011-03-15 13:20:58 -07:00
Adam Powell
fbe9ca7262 am 1d233d97: Merge "Fix bug 4088936 - Tabs in the action bar don\'t seem to have a fading edge" into honeycomb-mr1 
* commit '1d233d9708e39f5b57b231746df658567b153484':
  Fix bug 4088936 - Tabs in the action bar don't seem to have a fading edge
 2011-03-15 12:51:07 -07:00
Stephen Hines
ae2f3b3a46 am c2db0d40: Merge "Make RS Matrix functions threadable." into honeycomb-mr1 
* commit 'c2db0d405b7d4b7654dbd3740cc065802e4c294e':
  Make RS Matrix functions threadable.
 2011-03-15 12:50:57 -07:00
Jamie Gennis
0ea44ac0de am 00f47af8: Merge "SurfaceTexture: disallow unsupported uses." into honeycomb-mr1 
* commit '00f47af85a98c6dc3b20d04d8ee6b9a327175ab6':
  SurfaceTexture: disallow unsupported uses.
 2011-03-15 12:50:55 -07:00
Romain Guy
5c84a1341b am a1bd5a5f: Merge "Fix disappearing edges in lists/scrollviews/etc. Bug #4093871" into honeycomb-mr1 
* commit 'a1bd5a5fd7107483290627d942ae2dd1910b57ca':
  Fix disappearing edges in lists/scrollviews/etc. Bug #4093871
 2011-03-15 12:50:50 -07:00
Scott Main
d021784432 am 197d7752: am e8f95e7f: docs: update device dashboard 
* commit '197d77528648b7ec3d44ca6ab63e3036669c1bc8':
  docs: update device dashboard
 2011-03-15 12:50:47 -07:00
Amith Yamasani
4a04f11b43 am 7e978441: Merge "Use more padding on the sides for SearchView" into honeycomb-mr1 
* commit '7e978441eeed9defb1031cc17c2857cf06cf825a':
  Use more padding on the sides for SearchView
 2011-03-15 12:50:35 -07:00
Kenny Root
1aa73a1bba Add byte limit in addition to ratio for installs DO NOT MERGE 
Previously you were not allowed to install anything to the internal
storage if there was less than 10% free space available on the
internal storage. This doesn't make sense on devices with huge storage
capacity, so just add in a hard-coded byte limit.

This will be cleaned up at a later time to use the same code as
DeviceStorageMonitorService to determine the limits.

Bug: 4086510
Change-Id: I39f69b5272ef44fea218e3b45171b48e2eab2480
 2011-03-15 12:43:07 -07:00
Svetoslav Ganov
1686e9afd4 CheckBoxPreferences do not fire accessibility events 
bug:4091160

We no longer allow not shown views to fire accessibility
events. Therefore, CheckBoxPreference can no longer ask its
associated checkbox to fire an accessibility event because
the latter is not attached to the view hierarchy
(i.e. not shown) by the time the CheckBoxPreference has a
chance to send an accessibility event. Instead the
CheckBoxPreference itself is responsible for firing the event.

Change-Id: Ia742882b13bf6c441cc76fa1e84b47a55cee601c
 2011-03-15 12:30:20 -07:00
Adam Powell
1d233d9708 Merge "Fix bug 4088936 - Tabs in the action bar don't seem to have a fading edge" into honeycomb-mr1 2011-03-15 12:06:45 -07:00
Xavier Ducrohet
9b50c1fcda am b7b877a4: (-s ours) am 0a98226e: Merge 9d76581f from honeycomb. do not merge. 
* commit 'b7b877a45f469336703844a928482e6438442567':
  Merge 9d76581f from honeycomb. do not merge.
 2011-03-15 12:05:46 -07:00
Xavier Ducrohet
20ad955324 am a82a219a: (-s ours) am b243aabd: Merge adaa12cd from honeycomb. do not merge. 
* commit 'a82a219a7aaee82d790810f6660924604b7a7e81':
  Merge adaa12cd from honeycomb. do not merge.
 2011-03-15 12:05:43 -07:00
Brad Fitzpatrick
aaae0573bb am 403da3a7: am 8d25eab1: Merge "Releasing lock even if exception is thrown." 
* commit '403da3a79af78920b33448bbc8d91c4b8aebf4a4':
  Releasing lock even if exception is thrown.
 2011-03-15 12:05:40 -07:00
Brad Fitzpatrick
b8c5fe004d am a74887e8: am 56c4c442: Merge "Lazy initialization must be synchronized to avoid parallel instances cretation." 
* commit 'a74887e87c720fd100f10b2e69a027c493036e20':
  Lazy initialization must be synchronized to avoid parallel instances cretation.
 2011-03-15 12:05:37 -07:00
Brad Fitzpatrick
36ca1d3a69 am 9ac9b285: am b98c8fca: Merge "Removing self-assignment statement." 
* commit '9ac9b28576834b69561a48a4050e7ad027543bcd':
  Removing self-assignment statement.
 2011-03-15 12:05:33 -07:00
Brad Fitzpatrick
b41c37eec1 am b01fc9fb: (-s ours) am 8b5345fb: Merge "Fixing self-assignment in copying code." 
* commit 'b01fc9fb450df941ae7c072247b67c9be32cd8b8':
  Fixing self-assignment in copying code.
 2011-03-15 12:05:29 -07:00
Adam Powell
c18c38f36e Fix bug 4088936 - Tabs in the action bar don't seem to have a fading edge 
Change-Id: I23c736ad458c721dfa86563f66b42dd5d6ca708e
 2011-03-15 11:57:46 -07:00
Xavier Ducrohet
e8a00ad288 am f89c3729: (-s ours) am 48a2a5ad: Merge "Merge 6f2fb570 from honeycomb. do not merge." into gingerbread 
* commit 'f89c37295db5df34c014e0791c976cfa94509068':
  Merge 6f2fb570 from honeycomb. do not merge.
 2011-03-15 11:57:35 -07:00
Xavier Ducrohet
9cb1acda89 am 405cb570: (-s ours) am 14e1f523: Merge "Merge c12b4093 from honeycomb. do not merge." into gingerbread 
* commit '405cb57019e0b0b9c2049c2b06537c0f4981fc37':
  Merge c12b4093 from honeycomb. do not merge.
 2011-03-15 11:57:30 -07:00
Brad Fitzpatrick
b8796212e3 resolved conflicts for merge of ceae9983 to honeycomb-plus-aosp 
Change-Id: Ic677e58dcc182908ae1fde33047b3fda013a37c3
 2011-03-15 11:54:46 -07:00
Stephen Hines
c2db0d405b Merge "Make RS Matrix functions threadable." into honeycomb-mr1 2011-03-15 11:52:36 -07:00
Brad Fitzpatrick
d927e27428 am b7d573e9: am 7972e382: Merge "Removing repetitive conditional; it simply does nothing except slowing down things." 
* commit 'b7d573e901e07fc249df0bc531cf94c574107556':
  Removing repetitive conditional; it simply does nothing except slowing down things.
 2011-03-15 11:43:08 -07:00
Brad Fitzpatrick
6f80f395b7 am c86ea5e2: am 38c6e31c: Merge "Removing repetitive conditional; it simply does nothing except slowing down things." 
* commit 'c86ea5e260a70f7c48890da702f86466d587904e':
  Removing repetitive conditional; it simply does nothing except slowing down things.
 2011-03-15 11:43:03 -07:00