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

1615 Commits

Author SHA1 Message Date
Mike Lockwood
af64e751e2 am 27d9fb57: DO NOT MERGE: Improve message for the "no app for USB accessory" dialog. 
* commit '27d9fb57168da5b5c1385df5f0c493cf8339933f':
  DO NOT MERGE:  Improve message for the "no app for USB accessory" dialog.
 2011-03-17 16:20:32 -07:00
Daniel Sandler
f6ac83bef9 am 1b4890c9: am 45026366: am 8f5cab8b: Merge "Remove logspew." into honeycomb-mr1 
* commit '1b4890c96898ee9e66380a5513c88f858bbd0dc3':
  Remove logspew.
 2011-03-17 06:40:37 -07:00
Daniel Sandler
4502636629 am 8f5cab8b: Merge "Remove logspew." into honeycomb-mr1 
* commit '8f5cab8b31014a261f4e6e12e6d751de51de37c3':
  Remove logspew.
 2011-03-17 06:31:56 -07:00
Daniel Sandler
8f5cab8b31 Merge "Remove logspew." into honeycomb-mr1 2011-03-17 06:23:45 -07:00
Simon Wilson
3f5995da76 Merge "DO NOT MERGE Add images to ERI icon list" into gingerbread 2011-03-16 19:51:07 -07:00
sy310.choi
c10571a8ea DO NOT MERGE Add images to ERI icon list 
Add images to 'sRoamingIndicatorImages_cdma' array.

Change-Id: Ie8fb8162219aa5e7140359daf1d64c92a3c0f769
Signed-off-by: sy310.choi <sy310.choi@samsung.com>
 2011-03-16 19:45:10 -07:00
Eric Fischer
c657fcce45 am 20ccaf6c: Import revised translations. DO NOT MERGE 
* commit '20ccaf6cc1a79a3f7973e5875c66e2bce2ebee7c':
  Import revised translations.  DO NOT MERGE
 2011-03-16 17:10:09 -07:00
Eric Fischer
20ccaf6cc1 Import revised translations. DO NOT MERGE 
Change-Id: I59b21268d693f0fac87e787fceb4f41b3f3e6acd
 2011-03-16 16:48:09 -07:00
Mike Lockwood
83361fe18b am 89de72d8: am 1d8b5a5e: am 75d62cee: Merge "USB System UI: Improve message for the "no app for USB accessory" dialog." into honeycomb-mr1 
* commit '89de72d83a1593ceb268f9433cd10455c66fc3af':
  USB System UI:  Improve message for the "no app for USB accessory" dialog.
 2011-03-16 12:35:55 -07:00
Mike Lockwood
1d8b5a5e86 am 75d62cee: Merge "USB System UI: Improve message for the "no app for USB accessory" dialog." into honeycomb-mr1 
* commit '75d62cee30557145e48d792fdce4769235daa9ce':
  USB System UI:  Improve message for the "no app for USB accessory" dialog.
 2011-03-16 12:06:58 -07:00
Mike Lockwood
27d9fb5716 DO NOT MERGE: Improve message for the "no app for USB accessory" dialog. 
Change-Id: I642a38d3e541b3d531eed1a00708f6864d8cab4c
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-03-16 15:04:22 -04:00
Mike Lockwood
75d62cee30 Merge "USB System UI: Improve message for the "no app for USB accessory" dialog." into honeycomb-mr1 2011-03-16 12:03:39 -07:00
Daniel Sandler
8d5d19c990 Remove logspew. 
Bug: 4114202
Change-Id: I88de0f98bb33f0d1258b702169d754e98648e403
 2011-03-16 15:02:18 -04:00
Mike Lockwood
b893916fb8 USB System UI: Improve message for the "no app for USB accessory" dialog. 
Change-Id: I72bdc3afa152ed7a0e30b1a0e8d9cb2e53ca3f29
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-03-16 14:10:03 -04:00
Eric Fischer
d5eb3bbbf2 am cc571e96: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1 
* commit 'cc571e9643865edc3f25aa133c467ace46ce8e80':
  Import revised translations.  DO NOT MERGE
 2011-03-16 10:51:56 -07:00
Eric Fischer
cc571e9643 Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1 2011-03-16 10:23:02 -07:00
Eric Fischer
326c1c7247 Import revised translations. DO NOT MERGE 
Change-Id: I654f633a58cb935a3388e5b558101912dae7fde7
 2011-03-16 10:11:58 -07:00
Mike Lockwood
92f87fb9b5 am c132f45c: am 2b2aaf2b: am ff51d29a: Merge "USB System UI: Fix string localization problems" into honeycomb-mr1 
* commit 'c132f45c5b47874746aad01156d7fb57b144e07f':
  USB System UI: Fix string localization problems
 2011-03-16 04:37:05 -07:00
Mike Lockwood
2b2aaf2be9 am ff51d29a: Merge "USB System UI: Fix string localization problems" into honeycomb-mr1 
* commit 'ff51d29a0bbf7006833ad67b1aa8a52a8a9a2514':
  USB System UI: Fix string localization problems
 2011-03-16 04:33:29 -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
d71792e17d am cb2d1be9: am a1e4b659: am 9b183a72: Merge "Updated notification asset for DND mode" into honeycomb-mr1 
* commit 'cb2d1be93d51c90152eaa453028c7be97a3d58e5':
  Updated notification asset for DND mode
 2011-03-15 21:44:17 -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
Mike Lockwood
3359001b41 USB System UI: Fix string localization problems 
Bug: 4108271
Bug: 4089121

Change-Id: Icd83ba20dc8dc8a71c17cf759138047b53c70fda
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-03-15 22:26:28 -04: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
Kenny Root
d022c23aed Merge "Revise free space checks for package installs" 2011-03-15 14:48:56 -07:00
Justin Ho
9b183a72bc Merge "Updated notification asset for DND mode" into honeycomb-mr1 2011-03-15 14:41:30 -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
Mike Lockwood
7896f1bd55 am c9b82ebb: am 3b7871c2: Merge "USB Manager string clean up:" into honeycomb-mr1 
* commit 'c9b82ebb97411cf4a8494dc83f57039bb77937c5':
  USB Manager string clean up:
 2011-03-15 13:49:14 -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
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
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
Eric Fischer
b2389eaada Merge "Import revised translations." 2011-03-15 12:00:49 -07:00
Eric Fischer
0d1d2a7a2c Import revised translations. 
Change-Id: Ic97284d3867608cbc0f018eb2472affbc783b675
 2011-03-15 10:37:23 -07:00
Justin Ho
f8caec7c72 Updated notification asset for DND mode 
Updating placeholder asset for DND mode in system tray when notifications are disabled

Bug: 3408005
Change-Id: Ic816b9384915a23071da71c08bd6b71d218dca79
 2011-03-15 09:33:59 -07:00
Mike Lockwood
862481c299 am 1c4e4fcc: am 38bc9f07: am f4c9c140: Merge "Fix broadcast receiver leak in UsbConfirmActivity" into honeycomb-mr1 
* commit '1c4e4fcc473f47bda351cec3e48652f5392e6498':
  Fix broadcast receiver leak in UsbConfirmActivity
 2011-03-14 17:51:44 -07:00
Mike Lockwood
38bc9f0701 am f4c9c140: Merge "Fix broadcast receiver leak in UsbConfirmActivity" into honeycomb-mr1 
* commit 'f4c9c140a204c83c6185b9ada0e33e740ecf779b':
  Fix broadcast receiver leak in UsbConfirmActivity
 2011-03-14 17:45:29 -07:00
Kenny Root
62e1b4e9d4 Revise free space checks for package installs 
Change-Id: Ie72bbab77aa89a50ec096edc1f471eab74829e67
 2011-03-14 17:18:24 -07:00
Mike Lockwood
8f6dce44e3 Fix broadcast receiver leak in UsbConfirmActivity 
Change-Id: Ie1db70d9a57f16f192178583871994467f50a636
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-03-14 20:17:13 -04:00
Eric Fischer
9f7b4ba69c Import revised translations. DO NOT MERGE 
Change-Id: I5d1b5c2891ffd19e45dbc6d20caf3449147f7218
 2011-03-14 14:31:58 -07:00
Iliyan Malchev
3070af0882 frameworks/base: remove LOCAL_PRELINK_MODULE 
Change-Id: I54dd62ebef47e7690afa5a858f3cad941b135481
Signed-off-by: Iliyan Malchev <malchev@google.com>
 2011-03-14 14:25:59 -07:00
Eric Fischer
175121a513 Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1 2011-03-14 14:17:01 -07:00
Eric Fischer
7b31d5c84f Import revised translations. DO NOT MERGE 
Change-Id: I5d1b5c2891ffd19e45dbc6d20caf3449147f7218
 2011-03-14 14:06:03 -07:00
Wink Saville
c15cf6353e Merge "Do not merge: Revert the revert of "LTE Changes for Telephony including Multiple PDN support and IPV6 support"" into honeycomb-LTE 2011-03-14 13:40:58 -07:00
Mike Lockwood
ccdac700df am 78b8e1be: Merge "DO NOT MERGE: backport recent USB accessory changes from honeycomb" into gingerbread 
* commit '78b8e1be97c61f7e0b28b145fadd0c646fd1c46b':
  DO NOT MERGE: backport recent USB accessory changes from honeycomb
 2011-03-14 13:37:54 -07:00
Daniel Sandler
9bbaa1564b am 45660662: Merge "Workaround unknown ERI indices." into gingerbread 
* commit '45660662e61e8cc3ff13144668767a86d1d5b7f4':
  Workaround unknown ERI indices.
 2011-03-14 13:34:08 -07:00
Mike Lockwood
78b8e1be97 Merge "DO NOT MERGE: backport recent USB accessory changes from honeycomb" into gingerbread 2011-03-14 13:17:24 -07:00
Wink Saville
9d7d62801d Do not merge: Revert the revert of "LTE Changes for Telephony including Multiple PDN support and IPV6 support" 
This reverts commit eca208fae6d1b6ae9c8c0e42eee092e86dbddbb7
and is the first of the LTE commits in master being back ported
to the LTE branch.

Change-Id: I17d4a1b779ed74bc7dfb409d2c1a30f60fdb27c7
 2011-03-14 12:25:04 -07:00
Irfan Sheriff
fd10d5cf56 am fb897110: am 9b1ea0bd: am e21110f8: Merge "Backup and restore IP and proxy settings" into honeycomb-mr1 
* commit 'fb8971106e5ea105e176c995c1ff3b4fbe630710':
  Backup and restore IP and proxy settings
 2011-03-14 12:10:27 -07:00
Irfan Sheriff
e21110f8b1 Merge "Backup and restore IP and proxy settings" into honeycomb-mr1 2011-03-14 11:48:35 -07:00