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

43475 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Xavier Ducrohet
b052ecaa7e resolved conflicts for merge of 86e43034 to honeycomb-plus-aosp 
Change-Id: Ia9ad4c3b79821fef6ab8493f4c93ca58f877f9ce
 2011-02-24 17:19:38 -08:00
Xavier Ducrohet
db1acf52bb am 1175ef7e: Merge "LayoutLib: Adapt the HC layoutlib to GB. do not merge." into gingerbread 
* commit '1175ef7e2e4f68532d8ade672d7f5502d9946ce4':
  LayoutLib: Adapt the HC layoutlib to GB. do not merge.
 2011-02-24 16:21:41 -08:00
Xavier Ducrohet
86e43034a6 resolved conflicts for merge of a4350fc0 to gingerbread-plus-aosp 
Change-Id: I065af5d555fa2197847ad47c84003dcd11fe26c7
 2011-02-24 16:15:11 -08:00
Xavier Ducrohet
dff6b8e71d Merge "Add --non-constant-id to aapt." 2011-02-24 15:59:26 -08:00
Svetoslav Ganov
ef7ec7a029 Use different version of CLDR data in DatePicker 
The ICU CLDR data doesn't use the month abbreviations that are
appropriate for the DatePicker, so use the framework copy of the CLDR
data.

Bug: 2641810
Note: cherry-picked from Honeycomb

Change-Id: I3c045dbfb751b8b7ce6361b5a67407206fc64db1
 2011-02-24 15:45:04 -08:00
Robert Ly
00e08463cb Doc change: clarifying nfc tech filter usage 
Change-Id: I536e4523fbc172e769ebbe4d7df0ac4422039476
 2011-02-24 15:03:09 -08:00
Xavier Ducrohet
1175ef7e2e Merge "LayoutLib: Adapt the HC layoutlib to GB. do not merge." into gingerbread 2011-02-24 14:44:58 -08:00
Xavier Ducrohet
a4350fc0f3 Merge "LayoutLib: Original import of Honeycomb's layoutlib. do not merge." into gingerbread 2011-02-24 14:44:52 -08:00
Eric Fischer
86409c8cb7 am 1c38872f: Merge "Import revised translations. DO NOT MERGE" into honeycomb 
* commit '1c38872fd30d7b19a01cc309537e911e7f2344e9':
  Import revised translations.  DO NOT MERGE
 2011-02-24 11:18:56 -08:00
Eric Fischer
1c38872fd3 Merge "Import revised translations. DO NOT MERGE" into honeycomb 2011-02-24 11:15:53 -08:00
Wink Saville
ee38808dcc am 0dc8618d: Do not start RILReceiver if wifi-only. 
* commit '0dc8618dc70a6aa23ea030eeda1ea9934b4a04c6':
  Do not start RILReceiver if wifi-only.
 2011-02-24 10:50:31 -08:00
Eric Fischer
f951bbf957 Import revised translations. DO NOT MERGE 
Change-Id: I6a05c3031a451b0d288762f079203a412133dd14
 2011-02-24 10:50:23 -08:00
repo sync
3905bc6ca3 am be2ed6d6: resolved conflicts for merge of c96b6690 to gingerbread-plus-aosp 
* commit 'be2ed6d6e366d3639aecd7ef615c95f0ccf17b9d':
  DO NOT MERGE - Increasing timeout to 60 sec This was already done in HC branch in this CL: https://android-git.corp.google.com/w/?p=platform/frameworks/base.git;a=commit;h=d39fd5a97c6f56794a6ed7ac1dfb0bbf585becf1 This is also related to bug http://b/issue?id=3402863 I first considered increasing the timeout specificaly for our GData client but when I saw we already accepted a CL for HC that did this at a lower level, I decided to do that instead.
 2011-02-24 10:26:49 -08:00
repo sync
be2ed6d6e3 resolved conflicts for merge of c96b6690 to gingerbread-plus-aosp 
Change-Id: I1d8a026d7efe0762865d6e1a6a3fc79cbbcbd9c4
 2011-02-24 09:58:25 -08:00
Alon Albert
c96b669013 Merge "DO NOT MERGE - Increasing timeout to 60 sec This was already done in HC branch in this CL: https://android-git.corp.google.com/w/?p=platform/frameworks/base.git;a=commit;h=d39fd5a97c6f56794a6ed7ac1dfb0bbf585becf1 This is also related to bug http://b/issue?id=3402863 I first considered increasing the timeout specificaly for our GData client but when I saw we already accepted a CL for HC that did this at a lower level, I decided to do that instead." into gingerbread 2011-02-24 09:20:46 -08:00
Xavier Ducrohet
031d2f8b6d LayoutLib: Adapt the HC layoutlib to GB. do not merge. 
Change-Id: I0b2016987a65fabbc0ce7011514543349e9fb929
 2011-02-23 19:47:18 -08:00
Xavier Ducrohet
4b52ec49fe LayoutLib: Original import of Honeycomb's layoutlib. do not merge. 
frameworks/base.git @ f0a53435f14d23d9555fc46014352ee6a7baa647

Change-Id: Ibc215751693dc7650683b61bb458f7c8beaf8060
 2011-02-23 19:47:02 -08:00
Wink Saville
0dc8618dc7 Do not start RILReceiver if wifi-only. 
By not starting RILReceiver we don't waste any cycles
trying to communicate with a vendor ril which may
not exist. This allows a wifi-only device to operate
as expected and the system to gracefully handle the
missing radio as ril requests will report RADIO_NOT_AVAILABLE.

Change-Id: I6c6f60830486c5f0447b3b9eb44c8b1f2d70c517
 2011-02-23 18:11:45 -08:00
Jason Chen
36b0b85abd am 22577b8d: (-s ours) am 5ff79c3b: Merge "DO NOT MERGE Cherry-pick of Ie4026a7c back to GB" into gingerbread 
* commit '22577b8d3a39c1373594ba3e4427212eee4cd6d4':
  DO NOT MERGE Cherry-pick of Ie4026a7c back to GB
 2011-02-23 18:08:23 -08:00
Jason Chen
22577b8d3a am 5ff79c3b: Merge "DO NOT MERGE Cherry-pick of Ie4026a7c back to GB" into gingerbread 
* commit '5ff79c3b06d7087153617dc973491fc890700af5':
  DO NOT MERGE Cherry-pick of Ie4026a7c back to GB
 2011-02-23 18:03:34 -08:00
Irfan Sheriff
6588c7cf73 am 5107eea6: Merge "DO NOT MERGE Add support for background scanning" into honeycomb 
* commit '5107eea64e46b0fffbbbcefa469a88044f309de6':
  DO NOT MERGE Add support for background scanning
 2011-02-23 18:02:45 -08:00
Wink Saville
bf87c11590 Merge "WAPPushManager, WAP Push over SMS message handler" 2011-02-23 17:40:43 -08:00
Jason Chen
5ff79c3b06 Merge "DO NOT MERGE Cherry-pick of Ie4026a7c back to GB" into gingerbread 2011-02-23 17:23:53 -08:00
Dianne Hackborn
9248e95a2f DO NOT MERGE Cherry-pick of Ie4026a7c back to GB 
Original change description follows:
-----------------------------------

Implement issue #3326435: Battery stats improvements

Keep track of discharge while screen is on vs. off.

Checkin looks like:

5,0,u,dc,1,1,1,0

The last four numbers are, from left:

- Maximum battery drain over time period.
- Minimum battery drain over time period.
- Battery drain while screen was on.
- Battery drain while screen was off.

Change-Id: Ie3cfe52df29b3f28ba8dc3350abe6cc967c76324
 2011-02-23 17:21:09 -08:00
Irfan Sheriff
5107eea64e Merge "DO NOT MERGE Add support for background scanning" into honeycomb 2011-02-23 16:59:55 -08:00
Mike Lockwood
e2567f2200 Merge "GpsLocationProvider: Clean up HAL initialization/cleanup sequence" 2011-02-23 16:27:27 -08:00
Scott Main
b1eea45a71 am 201959af: Merge "docs: fix sensorevent code snippets bug: 3480932" into honeycomb 
* commit '201959af6e61c148576c77de6cf772456d664251':
  docs: fix sensorevent code snippets bug: 3480932
 2011-02-23 16:00:08 -08:00
Scott Main
201959af6e Merge "docs: fix sensorevent code snippets bug: 3480932" into honeycomb 2011-02-23 15:58:13 -08:00
Eric Fischer
bb0c1a366d am 32751e31: Merge "Import revised translations. DO NOT MERGE" into honeycomb 
* commit '32751e3175d8dca96d75b6c93a32557c259c13a7':
  Import revised translations.  DO NOT MERGE
 2011-02-23 15:36:08 -08:00
Eric Fischer
32751e3175 Merge "Import revised translations. DO NOT MERGE" into honeycomb 2011-02-23 15:33:12 -08:00
Eric Fischer
fc1c800b2e Import revised translations. DO NOT MERGE 
Change-Id: I5089e17bd14de7b4e217c1b91e393ae4799c4263
 2011-02-23 14:49:04 -08:00
Irfan Sheriff
b0e5326d8c am a46a5cba: Merge "DO NOT MERGE No backup of country and sleep policy" into honeycomb 
* commit 'a46a5cba276ee269d227a5e4d69f3891c4349edf':
  DO NOT MERGE No backup of country and sleep policy
 2011-02-23 14:38:10 -08:00
Irfan Sheriff
a46a5cba27 Merge "DO NOT MERGE No backup of country and sleep policy" into honeycomb 2011-02-23 14:35:20 -08:00
Scott Main
63a4f9f5e6 am c516c771: docs: fix md5 sums 
* commit 'c516c7714d9cdc996053fd2a130015cbde978242':
  docs: fix md5 sums
 2011-02-23 14:17:30 -08:00
Scott Main
c516c7714d docs: fix md5 sums 
Change-Id: Ie1cb77cf54bd17d2aa8228f73158e7589a7aebaa
 2011-02-23 14:13:50 -08:00
Mike Lockwood
0a5098106c GpsLocationProvider: Clean up HAL initialization/cleanup sequence 
Change-Id: Id5467000f3f3da5cbe1f112dad97a032688d2eac
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-02-23 14:01:44 -08:00
Alon Albert
9add122296 DO NOT MERGE - Increasing timeout to 60 sec 
This was already done in HC branch in this CL:
https://android-git.corp.google.com/w/?p=platform/frameworks/base.git;a=commit;h=d39fd5a97c6f56794a6ed7ac1dfb0bbf585becf1
This is also related to bug http://b/issue?id=3402863
I first considered increasing the timeout specificaly for our GData client
but when I saw we already accepted a CL for HC that did this at a lower level, I decided
to do that instead.

Bug: 3402863
Change-Id: I7ef2968ecbab3cc0d698a408f2c643c83d333e2f
 2011-02-23 13:55:11 -08:00
Irfan Sheriff
ae388dac6d DO NOT MERGE No backup of country and sleep policy 
Remove country code and sleep policy setting back up as it
is a device specific setting

Bug: 3481068
Change-Id: Ifc824c1cd3c3706f8cdaf09b06a05a0c94243acb
 2011-02-23 13:51:52 -08:00
Jamie Gennis
20bfbd9544 am 76d0c763: (-s ours) am fa238f03: Merge "egl: fixes for object refcounts" into gingerbread 
* commit '76d0c763f008d19791e13ebabe9ec83958354bc5':
  egl: fixes for object refcounts
 2011-02-23 13:31:12 -08:00
Jamie Gennis
76d0c763f0 am fa238f03: Merge "egl: fixes for object refcounts" into gingerbread 
* commit 'fa238f033203f8e722b060af3f0095762b134f37':
  egl: fixes for object refcounts
 2011-02-23 12:46:57 -08:00
Jamie Gennis
fa238f0332 Merge "egl: fixes for object refcounts" into gingerbread 2011-02-23 12:30:55 -08:00
Scott Main
02be2f1d87 am 2788e4f9: docs: fix some typos 
* commit '2788e4f96a3f210192145a340a1d072c70c7bc4f':
  docs: fix some typos
 2011-02-23 11:24:42 -08:00
Scott Main
d11ee90b6e docs: fix sensorevent code snippets 
bug: 3480932

Change-Id: Id97ca4e0edfb92eaac0f2996bc5e91d757644afb
 2011-02-23 10:57:23 -08:00
Scott Main
2788e4f96a docs: fix some typos 
Change-Id: I2dc9855f8fe87234d4337351e8bac6c382fb74d2
 2011-02-23 10:54:31 -08:00
Irfan Sheriff
74ff3d23f9 DO NOT MERGE Add support for background scanning 
Background scanning (preferred network offload) allows us the
host to sleep while the dongle monitors the presence of any
preferred networks. This allows us for significant power savings
since the system does not have to wake up often to initiate
a scan

Bug: 3453021
Change-Id: I73dcf4e1c9ab4de280c40b6df6147a74ac003123
 2011-02-23 10:49:36 -08:00
Brad Fitzpatrick
0ca6bf18af Merge "Fixed GSM encoded network initiated position request" 2011-02-23 08:17:31 -08:00
Justin Ho
57b920bd61 am da34ab21: am 9208875e: Updated iconography for network status and adding 4G assets 
* commit 'da34ab214886531e5e9c0d975d0dc70cfe8a26a4':
  Updated iconography for network status and adding 4G assets
 2011-02-22 21:23:54 -08:00
Alon Albert
a0946d6399 am 1aba843d: am ccc802e1: Merge "Support quoted parameters" into gingerbread 
* commit '1aba843dc327490a749059bcddff90e8048ed75c':
  Support quoted parameters
 2011-02-22 21:23:50 -08:00
Justin Ho
da34ab2148 am 9208875e: Updated iconography for network status and adding 4G assets 
* commit '9208875e92ec190d49864b92823dd7011b9b443a':
  Updated iconography for network status and adding 4G assets
 2011-02-22 21:19:05 -08:00
Alon Albert
1aba843dc3 am ccc802e1: Merge "Support quoted parameters" into gingerbread 
* commit 'ccc802e12be64248c2c6822eb36a957435a06ef2':
  Support quoted parameters
 2011-02-22 21:18:52 -08:00