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

2758 Commits

Author SHA1 Message Date
Mike Lockwood
04f024d564 Merge changes I80558c62,I6587f580 
* changes:
  UsbService: Blacklist HID boot subclass devices (keyboards and mice)
  UsbService: Add support for blacklisting certain USB busses
 2011-02-03 09:51:06 -08:00
Irfan Sheriff
2fcaf538ce am aec39e62: Merge "resolved conflicts for merge of ec348b49 to honeycomb-plus-aosp" into honeycomb-plus-aosp 
* commit 'aec39e625b95088f4020302a0eac1f38da43c765':
  two digit number handling in croatia and serbia
 2011-02-02 16:21:28 -08:00
Irfan Sheriff
d6d2de6b3c resolved conflicts for merge of ec348b49 to honeycomb-plus-aosp 
Change-Id: I34d034115362f0f858fb65710165bd6cad2fdbd5
 2011-02-02 16:02:37 -08:00
Irfan Sheriff
ec348b4953 resolved conflicts for merge of 0a4b3fd9 to gingerbread-plus-aosp 
Change-Id: I294e6e843ae028377d19c1180e0d5e9aef52897c
 2011-02-02 14:23:10 -08:00
Irfan Sheriff
0a4b3fd93b two digit number handling in croatia and serbia 
If users dial 92-96, dial them normally and not treat
as USSD

Change-Id: If3b6cb37b7ec0ff99d76cb10cba53368094a0b5d
Signed-off-by: sj2202.park@samsung.com
 2011-02-02 14:08:38 -08:00
Jim Miller
b709a85367 am c2c2360b: am 22d23eb5: Merge "Fix 3410155: Remove hint text from password entry field." into honeycomb 
* commit 'c2c2360bf1c7e005225383ec9fb5c39c0ef88a74':
  Fix 3410155: Remove hint text from password entry field.
 2011-02-02 13:22:47 -08:00
Jim Miller
22d23eb5d1 Merge "Fix 3410155: Remove hint text from password entry field." into honeycomb 2011-02-02 12:41:07 -08:00
Jim Miller
4c573605d0 Fix 3410155: Remove hint text from password entry field. 
Change-Id: I36882a365e721f038366fea086a0727c9608bf67
 2011-02-02 10:24:56 -08:00
Justin Ho
110913c2ee am 8dd81a2b: am c2e16dc6: Merge "Removing red cross from hdpi emergency symbol" into honeycomb 
* commit '8dd81a2b02f69dc277fe7d7808a6872860ec2c94':
  Removing red cross from hdpi emergency symbol
 2011-02-02 08:39:15 -08:00
Justin Ho
c2e16dc6da Merge "Removing red cross from hdpi emergency symbol" into honeycomb 2011-02-02 08:33:45 -08:00
Justin Ho
a16eb1a77f Removing red cross from hdpi emergency symbol 
Change-Id: Ic4b5ac44f267395ee50414ebf4ce717f45030439
 2011-02-02 08:32:39 -08:00
Justin Ho
6a0417d048 am 53e56c36: am 6d134754: Making default upload and download arrows more visible Bug: 3399982 
* commit '53e56c362a7c4f1bd1255bb2a27091fa6a429774':
  Making default upload and download arrows more visible Bug: 3399982
 2011-02-01 13:26:47 -08:00
Justin Ho
5d1c293350 am daa95d67: am 50bd7362: Merge "Updating Froyo framework assets to Holo style Bug: 3362749" into honeycomb 
* commit 'daa95d679c063dca451e9207e61bb35496a9c1b2':
  Updating Froyo framework assets to Holo style Bug: 3362749
 2011-02-01 13:26:37 -08:00
Justin Ho
9b000ad577 am c0957f3c: am 186d8d36: Merge "Fix bug 3410400 - Holo rating bar assets" into honeycomb 
* commit 'c0957f3ce18b2ea4f4d95dbd8a0fa113a1695ee9':
  Fix bug 3410400 - Holo rating bar assets
 2011-02-01 13:24:47 -08:00
Mike Lockwood
a8e3a898a2 UsbService: Add support for blacklisting certain USB busses 
This can be used to prevent applications from connecting to
sensitive internal USB devices (like the modem)

Change-Id: I6587f58018e3f8d8f78405d4004cce64db23b628
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-02-01 13:46:50 -05:00
Justin Ho
6d134754ef Making default upload and download arrows more visible 
Bug: 3399982

Change-Id: I0d614c590deb2b30147ae1e64edf2ef551cc1d40
 2011-02-01 08:41:01 -08:00
Justin Ho
50bd7362a1 Merge "Updating Froyo framework assets to Holo style Bug: 3362749" into honeycomb 2011-02-01 07:28:04 -08:00
Justin Ho
b83f6987df Updating Froyo framework assets to Holo style 
Bug: 3362749

Change-Id: Ibd2042f1dad4ba3fdc96944a2af93b44df1bc839
 2011-02-01 07:27:36 -08:00
Justin Ho
186d8d36d3 Merge "Fix bug 3410400 - Holo rating bar assets" into honeycomb 2011-01-31 20:59:46 -08:00
Adam Powell
02a30a8ceb Fix bug 3410400 - Holo rating bar assets 
Change-Id: I107f7d3eea2f82ee49a906b0409f01afe78e69b9
 2011-01-31 19:35:20 -08:00
Svetoslav Ganov
78ed7b801d Merge "Clean up of the DatePicker" 2011-01-31 17:53:00 -08:00
Eric Fischer
122106cb9b Merge "Import revised translations. DO NOT MERGE. Bug 3394542" into honeycomb 2011-01-31 17:27:30 -08:00
Svetoslav Ganov
13427a04de Clean up of the DatePicker 
1. Removed a duplicate DatePicker stylable.

2. Fixed a bug that if the user wrongly desires to have the
   calendar view and spinners hidden despite that DataPicker
   ovrrides such incorrect choice to show at least the spinners
   the min adn max date attributes are igonored.

Change-Id: I6307db71aca837ad790aea59fa70ead393feb066
 2011-01-31 16:37:33 -08:00
Eric Fischer
3efb315313 am a019d15b: Merge "Import revised translations. DO NOT MERGE" into gingerbread 
* commit 'a019d15b667a72d7cb29afc7f153d5c517abcb76':
  Import revised translations. DO NOT MERGE
 2011-01-31 16:18:27 -08:00
Justin Ho
81e5beab84 am c15d7f63: am 53fe1045: Merge "Updated fallback sound for Honeycomb tablet" into honeycomb 
* commit 'c15d7f63f047149e3fee0f2fc57539fb32856260':
  Updated fallback sound for Honeycomb tablet
 2011-01-31 15:45:55 -08:00
Justin Ho
53fe104571 Merge "Updated fallback sound for Honeycomb tablet" into honeycomb 2011-01-31 14:26:20 -08:00
Eric Fischer
0ddd275ede Import revised translations. DO NOT MERGE. Bug 3394542 
Change-Id: I49b085e0d1c4a3a131ba0f967166b915aaa24c57
 2011-01-31 12:41:43 -08:00
Eric Fischer
a85afd133f Import revised translations. DO NOT MERGE 
Change-Id: I07d18c234d74184a6bc83894a3e874ce1ae782da
 2011-01-31 12:17:36 -08:00
Gilles Debunne
6d54ec7e82 am 85ebed39: am ccfcd9e8: Merge "Fxi initial error popup dialog in TextEdit and refreshed assets." into honeycomb 
* commit '85ebed39e4b7710b56e25d10038172dde12ef7b0':
  Fxi initial error popup dialog in TextEdit and refreshed assets.
 2011-01-31 11:16:16 -08:00
Gilles Debunne
ccfcd9e813 Merge "Fxi initial error popup dialog in TextEdit and refreshed assets." into honeycomb 2011-01-31 11:10:53 -08:00
Justin Ho
6871ede4be Updated fallback sound for Honeycomb tablet 
Change-Id: I01b27b5d095d7280ed1fc4662ce2c84f61e7b681
 2011-01-31 08:45:55 -08:00
Dianne Hackborn
58468459dc am 9e3754ff: am 54ad3611: Merge "Fix issue #3404571: Commit final APIs" into honeycomb 
* commit '9e3754ff6dcc81c43708ce0e13c75de836173f64':
  Fix issue #3404571: Commit final APIs
 2011-01-30 16:15:13 -08:00
Dianne Hackborn
3b024a6d28 Fix issue #3404571: Commit final APIs 
Change-Id: I7f01f8df9cfb82a9bb987e3df7c8eaa1c5aab81a
 2011-01-30 14:26:31 -08:00
Justin Ho
cf5c0741e7 am a5e92d18: am 9b1df164: Merge "Merging Honeycomb style ic_menu that are background safe, refreshed with Holo style" into honeycomb 
* commit 'a5e92d18b045bdf71c0445d34b2bfa775c582ab6':
  Merging Honeycomb style ic_menu that are background safe, refreshed with Holo style
 2011-01-28 22:55:41 -08:00
Justin Ho
9b1df1646f Merge "Merging Honeycomb style ic_menu that are background safe, refreshed with Holo style" into honeycomb 2011-01-28 22:51:51 -08:00
Justin Ho
35326b876e Merging Honeycomb style ic_menu that are background safe, refreshed with Holo style 
Change-Id: Ib78eb3f75b7734c0244fbc9ac58c52d2ffbbdb27
 2011-01-28 22:49:43 -08:00
Gilles Debunne
f1f409a389 Fxi initial error popup dialog in TextEdit and refreshed assets. 
Bug 3398923

Set the background of the popup when it is created so that the first
measure is correct.

New assets.

Change-Id: I4803754ef3115429a608d890f56c6b0c8033d253
 2011-01-28 18:30:52 -08:00
Eric Fischer
0982dc6488 Merge "Import revised translations. DO NOT MERGE" into honeycomb 2011-01-28 15:09:16 -08:00
Justin Ho
d73343e43c am d1bde71a: am 20af1c57: Merge "Correct font size for notifications & control panel." into honeycomb 
* commit 'd1bde71ad917218949555724722cdef7139d5ac9':
  Correct font size for notifications & control panel.
 2011-01-28 15:07:37 -08:00
Justin Ho
20af1c57de Merge "Correct font size for notifications & control panel." into honeycomb 2011-01-28 15:02:55 -08:00
Eric Fischer
0e77f6dfcb Import revised translations. DO NOT MERGE 
Change-Id: I385b9dbf5908ad7030263bc586fba2ebdfe7cf85
 2011-01-28 14:54:54 -08:00
Eric Fischer
287fbba5b8 am 5f2def8c: Merge "Import revised translations. DO NOT MERGE" into gingerbread 
* commit '5f2def8cfdad2491a646be69347444a3be6ddf84':
  Import revised translations.  DO NOT MERGE
 2011-01-28 14:19:36 -08:00
Adam Powell
9cbf8d3028 am 406de58e: am 6b2fda9f: Merge "Fix bug 3399992 - Make ActionBar menu text styleable" into honeycomb 
* commit '406de58e48378bca9ea7e75c61039d243ea81855':
  Fix bug 3399992 - Make ActionBar menu text styleable
 2011-01-28 14:03:31 -08:00
Adam Powell
6b2fda9f4b Merge "Fix bug 3399992 - Make ActionBar menu text styleable" into honeycomb 2011-01-28 13:58:28 -08:00
Adam Powell
55f3af27ed Fix bug 3399992 - Make ActionBar menu text styleable 
Change-Id: Ic67d167c024332575ca3b79725f012a919146286
 2011-01-28 13:42:04 -08:00
Eric Fischer
1c3f1af182 Import revised translations. DO NOT MERGE 
Change-Id: Id8afb303d2ecfc6270d1af1abd189c0ef0bf2314
 2011-01-28 13:16:00 -08:00
Daniel Sandler
ca05585f04 Correct font size for notifications & control panel. 
Bug: 3388577
Bug: 3394785
 2011-01-28 16:07:25 -05:00
Daniel Sandler
e42d0dd741 am 9bd1d320: am f0ca959b: Merge "Fix overlapping app icon & info in notifications with large icons." into honeycomb 
* commit '9bd1d3204f4048b902d0fdf0ea0809f29eddeafd':
  Fix overlapping app icon & info in notifications with large icons.
 2011-01-28 12:22:38 -08:00
Daniel Sandler
f0ca959b02 Merge "Fix overlapping app icon & info in notifications with large icons." into honeycomb 2011-01-28 12:18:11 -08:00
Daniel Sandler
db173394aa Fix overlapping app icon & info in notifications with large icons. 
Bug: 3398728
Bug: 3394785
Change-Id: I50f065d482815612b2b187f1bc4360489d7455e6
 2011-01-28 14:55:42 -05:00