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

2963 Commits

Author SHA1 Message Date
Justin Ho
71ee3ba0f0 am f47a1683: Merge "Updated HTML5 media playback controls Bug: 4080127" into honeycomb-mr1 
* commit 'f47a16837cc0516e23811850f69839bb2f7ac95b':
  Updated HTML5 media playback controls Bug: 4080127
 2011-03-14 18:25:45 -07:00
Justin Ho
1586c133a3 am cc886b93: Merge "Fixing naming for disabled paste assets Updated paste assets" into honeycomb-mr1 
* commit 'cc886b93681b75a9b89331930435e0f527b2c3d7':
  Fixing naming for disabled paste assets Updated paste assets
 2011-03-14 18:25:43 -07:00
Justin Ho
7bc341cf80 am 3e317542: Merge "Updated textfield search assets Bug: 3321263" into honeycomb-mr1 
* commit '3e3175428c81501d72cda3c026b927ca6408243f':
  Updated textfield search assets Bug: 3321263
 2011-03-14 18:25:40 -07:00
Justin Ho
f47a16837c Merge "Updated HTML5 media playback controls Bug: 4080127" into honeycomb-mr1 2011-03-14 18:24:13 -07:00
Justin Ho
cc886b9368 Merge "Fixing naming for disabled paste assets Updated paste assets" into honeycomb-mr1 2011-03-14 18:24:06 -07:00
Justin Ho
3e3175428c Merge "Updated textfield search assets Bug: 3321263" into honeycomb-mr1 2011-03-14 18:23:18 -07:00
Justin Ho
4a21cabb9f Fixing naming for disabled paste assets 
Updated paste assets

Bug: 4083486
Change-Id: I21bc469ef42c4eca4bcbea953f3c9e3a72b13388
 2011-03-14 18:19:25 -07:00
Justin Ho
db92972c53 Updated HTML5 media playback controls 
Bug: 4080127

Change-Id: I89e7822f18c11536aea92adf4a01a5af61ed1186
 2011-03-14 18:01:36 -07:00
Nicolas Roard
373ece1fa1 am 65c28204: Merge "Adding placeholders for the large play button used by the browser for HTML5 video (the button will appear surimposed to the video)" into honeycomb-mr1 
* commit '65c282042dab1dfa75b10517190ba38834782c3b':
  Adding placeholders for the large play button used by the browser for HTML5 video (the button will appear surimposed to the video)
 2011-03-14 15:39:37 -07:00
Nicolas Roard
b6866f81a9 am 0fd8fa33: Merge "Adding placeholders for the fullscreen button used by the browser for HTML5 video" into honeycomb-mr1 
* commit '0fd8fa33e28df28568532c30f53a91a8d652b35d':
  Adding placeholders for the fullscreen button used by the browser for HTML5 video
 2011-03-14 15:21:46 -07:00
Nicolas Roard
3efaa34015 Adding placeholders for the large play button 
used by the browser for HTML5 video (the button will appear
surimposed to the video)

bug:4080127
Change-Id: I681d2a4a3de1b2db64ffb3bbf4ce883320c771f1
 2011-03-14 15:14:28 -07:00
Nicolas Roard
0fd8fa33e2 Merge "Adding placeholders for the fullscreen button used by the browser for HTML5 video" into honeycomb-mr1 2011-03-14 15:11:55 -07:00
Eric Fischer
9f7b4ba69c Import revised translations. DO NOT MERGE 
Change-Id: I5d1b5c2891ffd19e45dbc6d20caf3449147f7218
 2011-03-14 14:31:58 -07:00
Eric Fischer
aa3ea7be0c Add "new incognito window" translations. 
These are all unfortunately for the "window" version instead of the
"tab" version because I didn't realize that there were two versions.

Change-Id: If9a4bd6d0d70fe8992b4bf63e674865080f8c597
 2011-03-14 14:31:42 -07:00
Justin Ho
5e6b4b0392 Updated textfield search assets 
Bug: 3321263

Change-Id: I3e453f5d969cc94b11ec51a3807bc74948473833
 2011-03-14 14:19:17 -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
9f70f5268f Merge "Add "new incognito window" translations." into honeycomb-mr1 2011-03-14 14:13:29 -07:00
Eric Fischer
7b31d5c84f Import revised translations. DO NOT MERGE 
Change-Id: I5d1b5c2891ffd19e45dbc6d20caf3449147f7218
 2011-03-14 14:06:03 -07:00
Nicolas Roard
5ee534cf88 Adding placeholders for the fullscreen button 
used by the browser for HTML5 video

bug:4080127
Change-Id: I8fedef7eb0442de547ff083f15f6fcc7a9fea791
 2011-03-14 13:59:04 -07:00
Ramesh Sudini
c06c5c1a13 Do not merge: Telephony: Fix config to reflect the correct CM conn type. 
Reflect the correct connectivity manager connection type in the config.xml.

Change-Id: Ida4d0a6275addda6fe11878fa96dbac70283df91
 2011-03-14 13:44:30 -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
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
Gilles Debunne
f2f3627f65 am 8503af84: Merge "Paste popup uses a disabled icon when there is nothing to paste." into honeycomb-mr1 
* commit '8503af848657356411a9bb4cf15d798d4f15111b':
  Paste popup uses a disabled icon when there is nothing to paste.
 2011-03-14 11:27:54 -07:00
Eric Fischer
5ce32d9fde Add "new incognito window" translations. 
These are all unfortunately for the "window" version instead of the
"tab" version because I didn't realize that there were two versions.

Change-Id: If9a4bd6d0d70fe8992b4bf63e674865080f8c597
 2011-03-14 11:17:02 -07:00
Nick Pelly
a64e2ad4da resolved conflicts for merge of 38d0d562 to honeycomb-plus-aosp 
Change-Id: Iff9ea08b810b0d142a9227272492c0305a9bcf42
 2011-03-14 10:28:11 -07:00
Gilles Debunne
6d0268bf6e Paste popup uses a disabled icon when there is nothing to paste. 
Change-Id: I982aa46ecd225fdea5c879fa2a3e897f5e0e810a
 2011-03-10 17:16:13 -08:00
Nick Pelly
38d0d5628d am 367f41f8: Implement new NFC-EE API\'s as shared library (frameworks/base). 
* commit '367f41f8f61126c2ab34a34cc676756a9fc23ac2':
  Implement new NFC-EE API's as shared library (frameworks/base).
 2011-03-10 16:32:28 -08:00
Nick Pelly
367f41f8f6 Implement new NFC-EE API's as shared library (frameworks/base). 
Change-Id: I45c4eaf59ec78167fc236fdd59676465a5e1bcb7
 2011-03-10 16:03:46 -08:00
Eric Fischer
adcaca260e am ff25b975: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1 
* commit 'ff25b975052ddf0e74627cccca742cddd1c8e2f2':
  Import revised translations.  DO NOT MERGE
 2011-03-10 14:47:57 -08:00
Eric Fischer
ff25b97505 Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1 2011-03-10 14:46:18 -08:00
Eric Fischer
4942d9936a Import revised translations. DO NOT MERGE 
Change-Id: I754a2637bbe533e80f5d863a52e2fbda7731638a
 2011-03-10 14:25:11 -08:00
Justin Ho
9caea5efd9 am fa1d72c8: Merge "New textfield search assets Bug: 3321263" into honeycomb-mr1 
* commit 'fa1d72c894af5b2ab622a1d7612a3307d3f8b2e1':
  New textfield search assets Bug: 3321263
 2011-03-10 13:55:21 -08:00
Justin Ho
fa1d72c894 Merge "New textfield search assets Bug: 3321263" into honeycomb-mr1 2011-03-10 13:53:48 -08:00
Eric Fischer
b23196d647 am 8d257f85: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1 
* commit '8d257f85acc3316b9ba451337f7cbea9000eb8cf':
  Import revised translations.  DO NOT MERGE
 2011-03-10 13:46:28 -08:00
Eric Fischer
c66ef5ab33 Import revised translations. DO NOT MERGE 
Change-Id: I0ee1d6152852c0cb085cc073ed0684dcc03d6ba7
 2011-03-10 11:23:57 -08:00
TK MUN
c01fd043a9 am 4bdab175: DO NOT MERGE WiMAX support 
* commit '4bdab1751f0db3b2f03e8c58ef5c11a543dfa3c7':
  DO NOT MERGE WiMAX support
 2011-03-09 22:54:44 -08:00
TK MUN
4bdab1751f DO NOT MERGE WiMAX support 
- In Connectivity service, start WiMAX service
- 4G icon display in StatusBarPolicy
- Add DHCP renew
- Add radio for WiMAX

Change-Id: Iffff012b270d80e84ec8fbd4486921a8adb847dd
Signed-off-by: TK MUN <tk.mun@samsung.com>
 2011-03-09 22:37:08 -08:00
Justin Ho
9aea53fecd New textfield search assets 
Bug: 3321263

Change-Id: Ifa2dab0df167977317414a18f94b9cb56d6b349a
 2011-03-09 14:35:09 -08:00
Mike Lockwood
093cf07f3c am 9e8e4ea0: Merge changes Ib517e5e4,I93be7695,I49bf22a4 into honeycomb-mr1 
* commit '9e8e4ea0a839b561d329758cddbfd0f7ea23f593':
  Close USB dialogs if their corresponding accessory or device has disconnected
  USB: Add API and dialog for apps to request permissions for USB devices and accessories
  UsbService: Automatically use system apps by default if it is the only choice
 2011-03-09 03:54:28 -08:00
Mike Lockwood
9e8e4ea0a8 Merge changes Ib517e5e4,I93be7695,I49bf22a4 into honeycomb-mr1 
* changes:
  Close USB dialogs if their corresponding accessory or device has disconnected
  USB: Add API and dialog for apps to request permissions for USB devices and accessories
  UsbService: Automatically use system apps by default if it is the only choice
 2011-03-09 03:52:47 -08:00
Adam Powell
529eb76b8a am 12230eaa: Merge "Fix bug 4065021 - Adjust spacing of the "home" action bar item to be consistent with the "up" indicator" into honeycomb-mr1 
* commit '12230eaa5f446cb22032d6645074a1aaca146df9':
  Fix bug 4065021 - Adjust spacing of the "home" action bar item to be consistent with the "up" indicator
 2011-03-09 00:25:10 -08:00
Adam Powell
12230eaa5f Merge "Fix bug 4065021 - Adjust spacing of the "home" action bar item to be consistent with the "up" indicator" into honeycomb-mr1 2011-03-09 00:22:53 -08:00
Adam Powell
2b0952b197 Fix bug 4065021 - Adjust spacing of the "home" action bar item to be 
consistent with the "up" indicator

Make sure that the "home" affordance in the action bar always occupies
the same amount of space regardless of whether or not the "up"
indicator is visible. This means centering the application icon/logo
in the remaining space after the "up" indicator has been added.

Change-Id: I3c81cfe8255546d4dd676af913895713baba4f13
 2011-03-09 00:17:42 -08:00
Mike Lockwood
3a68b8338b USB: Add API and dialog for apps to request permissions for USB devices and accessories 
New APIs:

UsbManager.hasPermission returns true if the caller has permission
for the given device or accessory

UsbManager.requestPermission poses a dialog to allow the user to give the caller
permission for the device or accessory.
Result is returned via a PendingIntent.
No dialog is displayed if the caller already has permission.

Also moved UsbResolverActivity to SystemUI package

BUG: 4069037

Change-Id: I93be769501a8776b49ac26e468af19f8fa2114c9
 2011-03-08 21:22:19 -05:00
Amith Yamasani
f9b9bd538d am 1f111f11: Merge "Searchview layout cleanup. Some more tweaks required for Market." into honeycomb-mr1 
* commit '1f111f11721d5d550f45135ba193c465e59a635b':
  Searchview layout cleanup. Some more tweaks required for Market.
 2011-03-08 16:36:47 -08:00
Amith Yamasani
1f111f1172 Merge "Searchview layout cleanup. Some more tweaks required for Market." into honeycomb-mr1 2011-03-08 16:34:11 -08:00
Amith Yamasani
79f7430bf9 Searchview layout cleanup. Some more tweaks required for Market. 
Bug: 3321263

Submit area should be visible when the field has focus, irrespective of text content.
Make sure that the fields get highlighted when focused.
Also fix an issue with hint not being applied from the SearchableInfo.
Bug: 3470348

Change-Id: If399d9551f89312c19485e249043f5823a862499
 2011-03-08 16:08:49 -08:00
Justin Ho
6f7612094a am 7b27dc12: Merge "Updated text cursor assets" into honeycomb-mr1 
* commit '7b27dc1201b10e40bcd9fbc73482640ccc15a6bf':
  Updated text cursor assets
 2011-03-08 15:35:47 -08:00
Justin Ho
7b27dc1201 Merge "Updated text cursor assets" into honeycomb-mr1 2011-03-08 15:34:15 -08:00
Justin Ho
b0ac8e7986 Updated text cursor assets 
Change-Id: Ib3f7fc4f835957c07b6c3b045cb5b3131034dde3
 2011-03-08 15:24:58 -08:00