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

60245 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Scott Main
2c76efc514 Created Android University lesson for Multiple APKs. 
Change-Id: I577f76f7b40069d3d5300cf0d40bedb2ab775821
 2011-12-07 20:21:38 -08:00
Joe Malin
3937e05570 Merge "DOC CHANGE: Add text for android.os.storage" into ics-mr0 2011-12-07 16:07:49 -08:00
Joe Malin
13235db8f7 DOC CHANGE: Add text for android.os.storage 
Change-Id: Ia5785cff3860907af4c53cbe769126496ee338c3
 2011-12-07 15:50:34 -08:00
Dianne Hackborn
b32785c6e8 Merge "More fixing for issue #5366535: Lockscreen has wrong layout..." into ics-mr0 2011-12-07 15:22:21 -08:00
Dianne Hackborn
eee1241938 Merge "DO NOT MERGE. Integrate from MR 1 to fix issue #5366535: Lockscreen..." into ics-mr0 2011-12-07 15:00:05 -08:00
Dianne Hackborn
d9efb95a0e More fixing for issue #5366535: Lockscreen has wrong layout... 
...but corrects itself

Change upgrade window to not allow the device to rotate while it is shown.

Change-Id: I75b126ab8806b84a0351e2706ebea10570bde575
 2011-12-07 14:56:51 -08:00
Dianne Hackborn
04ea2d98af DO NOT MERGE. Integrate from MR 1 to fix issue #5366535: Lockscreen... 
...has wrong layout but corrects itself

Maybe fix issue #5405788: Device continuously opening and closing...

...the "Complete action using" dialog

I have never been able to reproduce this consistently, but here is
another stab in the twilight.  It looks like during boot we have
a potential race where we could reset the config sequence number after
we had gone through a config change, causing ActivityThread to ignore
a following config change.  Maybe this change will help.

Change-Id: I7199b6de370488e8d897d6a78ff6f15624da862c
 2011-12-07 14:18:05 -08:00
Joe Malin
9e2cf49fa3 Merge "DOC CHANGE: Add Content URI ref doc" into ics-mr0 2011-12-07 11:26:20 -08:00
Scott Main
b6322a5bb9 docs: fix broken links 
bug: 5542371

Change-Id: If04b39918a54ccc163d255bf75d566f1875dac0a
 2011-12-06 17:09:37 -08:00
Andreas Huber
babb72006b Merge "DO NOT MERGE: Remove the AVI extractor." into ics-mr0 2011-12-06 12:11:38 -08:00
Irfan Sheriff
7b62313eab Disable wifiwatchdog for now 
Change-Id: I2ac4fa706f3d0a415cb8e86002173b776aba4e02
 2011-12-06 11:21:22 -08:00
Andreas Huber
142a04aed5 DO NOT MERGE: Remove the AVI extractor. 
Change-Id: Ib9cb4a48bd817da703ef53eb14932616d2973ee0
 2011-12-06 11:21:02 -08:00
Joe Malin
1d7d0af9a1 DOC CHANGE: Add Content URI ref doc 
Change-Id: I859b4bdc9d78f1f5e5769fe3fee421af2ad85778
 2011-12-05 10:30:51 -08:00
Chia-chi Yeh
431c3e4c7e Merge "Documentation for the VPN sample for ICS SDK. Staging server: http://fredchung.i:9999/resources/samples/ToyVpn/index.html" into ics-mr0 2011-12-02 12:45:44 -08:00
Roman Nurik
cd0e446dc8 Merge "Reduce file size for ADL presentation shareable." into ics-mr0 2011-12-02 11:57:03 -08:00
Roman Nurik
5c8e690edf Reduce file size for ADL presentation shareable. 
Change-Id: I700959f3c15609c730c63d99953b890a93105cea
 2011-12-02 11:41:04 -08:00
Roman Nurik
c3998ced74 Merge "Update widget design guidelines for padding and 8dp." into ics-mr0 2011-12-01 13:40:38 -08:00
Roman Nurik
061cf70da9 Update widget design guidelines for padding and 8dp. 
Instead of using layout_margin for widget margins, the recommendation is to
now use padding. Additionally, update all docs to mention an example default
padding of 8dp instead of 15 or 16dp.

Change-Id: I330aedc56986dbb31a70260279ad2f6668c67c92
 2011-12-01 13:21:14 -08:00
Bill Gruber
92ad16d342 Merge "Cherrypick from HCMR2 Change ID: Id849cb25098fef76c96c4935db31ebc1422d74d8 IAB doc update: CSV import feature Also fixed Bug 5221766" into ics-mr0 2011-12-01 11:53:23 -08:00
Scott Main
8f3993b12b Merge "docs: dashboard update for 12/1" into ics-mr0 2011-12-01 11:53:17 -08:00
Bill Gruber
0c2d3c5120 Cherrypick from HCMR2 Change ID: Id849cb25098fef76c96c4935db31ebc1422d74d8 
IAB doc update: CSV import feature
Also fixed Bug 5221766

Change-Id: I40b8057dae10067c8cc9aa7506564c0033efc2fe
 2011-12-01 11:46:59 -08:00
Scott Main
acf1038a26 docs: remove broken link from renderscript docs 
bug: 5696178

Change-Id: I78285ac67749fb3936e359968d28bbeb539ea7dc
 2011-12-01 11:11:08 -08:00
Scott Main
a0fd284e03 docs: dashboard update for 12/1 
Change-Id: If5323832093a90cf151f4103df810281687407d0
 2011-12-01 10:58:14 -08:00
Xia Wang
2d9f462062 Fix build 
Change-Id: I465d85e4783763f311ed6ec0a09c1edde9712405
 2011-11-28 16:49:06 -08:00
Fred Chung
8e076fe774 Documentation for the VPN sample for ICS SDK. 
Staging server: http://fredchung.i:9999/resources/samples/ToyVpn/index.html

Change-Id: I35a17374fc0d9d165cedc9d6e1052eaec0028ace
 2011-11-28 16:44:13 -08:00
Xia Wang
25261f59af Merge "Increase time between wifi stop and wifi start: set to 2 minutes http://b/issue?id=5629901" into ics-mr0 2011-11-28 16:00:49 -08:00
dujin.cha
fe464a76d8 [Prime K] Fix gabage character issue 
Korean characters show up as gabage characters in Music player.
Reason : MTP service does not set the locale for the MediaScanner
Solution : Set locale when MtpDatabase creates MediaScanner.

Bug ID : 5567433
Signed-off-by: dujin.cha <dujin.cha@samsung.com>

Change-Id: I4bfe5f603c113170d45bd57a8709c21c665e260b
 2011-11-22 10:28:21 -08:00
Xia Wang
a4c2caac05 Increase time between wifi stop and wifi start: set to 2 minutes 
http://b/issue?id=5629901

Change on state validation:
  - When network state is broadcast in other network information,
    the test activity will record the state change which cause false
    alarm in the test.

Change-Id: I8bd1e8c04ab97116f3a02ccc5543f34a7e651cda
 2011-11-21 21:22:10 -08:00
satok
e36657e541 Merge "Do not merge. Fix a memory leak of a Binder in SpellCheckerService" into ics-mr0 2011-11-18 16:39:20 -08:00
Marco Nelissen
d4b22ab488 status_t != bool 
b/5567433

Change-Id: I255ab8c3b0b5e0ea6a5cc7c05df757c667f3855e
 2011-11-18 14:21:34 -08:00
satok
e30983e799 Do not merge. Fix a memory leak of a Binder in SpellCheckerService 
Bug: 5499490
Bug: 5620722
Change-Id: Idfc686595ae8459fff009386332821762d03cbc8
 2011-11-19 06:53:31 +09:00
Joe Fernandez
366113fa1b Merge "docs: Camera Features for developers" into ics-mr0 2011-11-17 17:34:33 -08:00
Joe Fernandez
452e41f607 docs: Camera Features for developers 
Change-Id: Ie85f9a5c6808a921b0f80a30749442369740a9c6
 2011-11-17 17:03:37 -08:00
Scott Main
48eaa6c9e5 docs: update caption for action bar figure to match new screenshot 
Change-Id: I233383ca7168ddb96231d3d22a5dcd6342462103
 2011-11-17 16:10:54 -08:00
Scott Main
08d40d7180 Merge "docs: Big update to action bar guide for ICS. Added section for action provider, new APIs for handsets such as split action bar, more information and diagrams for up navigation, guidelines for picking action items, revised sample code and discussion for tabs, add expandible action view info, and expanded discussion for customizing action bar styles bug:4726917" into ics-mr0 2011-11-17 12:32:11 -08:00
Scott Main
258a51e3e6 docs: Big update to action bar guide for ICS. 
Added section for action provider, new APIs for handsets such as
split action bar, more information and diagrams for up navigation,
guidelines for picking action items, revised sample code and discussion
for tabs, add expandible action view info,
and expanded discussion for customizing action bar styles
bug:4726917

Change-Id: If61a5f2aad5ed21b0b23b3fc14309a50617f86ce
 2011-11-17 12:24:31 -08:00
Bill Gruber
69e24843fc Merge "Licensing docs: clarifies server response for draft apps Bug 2900690" into ics-mr0 2011-11-17 11:35:16 -08:00
Bill Gruber
ef20eb2595 Merge "Filters docs: removes references to forward-locking Bug 3055286" into ics-mr0 2011-11-17 11:34:46 -08:00
Scott Main
7d4c4721c6 docs: add sums/sizes for adt 15.0.1 
Change-Id: I9dc5e429c09cb31a86d1e867f76f4d3a3997dd87
 2011-11-17 09:59:50 -08:00
Fred Chung
4750cbd931 Merge "DO NOT MERGE: Bluetooth HDP sample. Cherry pick from ics-mr1 Change ID I7035cb13da6f6cd64e63df8a5ccf2391fe41f18e" into ics-mr0 2011-11-17 09:38:10 -08:00
Robert Ly
4f36174118 Merge "docs: adt 15.0.1 rel notes" into ics-mr0 2011-11-17 07:17:04 -08:00
Matthew Xie
6da97a24e3 Merge "Check the bluetooth state for getUuid call" into ics-mr0 2011-11-16 15:31:03 -08:00
Fred Chung
2d410df1c7 DO NOT MERGE: Bluetooth HDP sample. 
Cherry pick from ics-mr1 Change ID I7035cb13da6f6cd64e63df8a5ccf2391fe41f18e

Change-Id: I6f9bd5fec6e841395b9fc85d419510c81bfb620c
 2011-11-16 15:24:08 -08:00
Matthew Xie
44b58ab89e Check the bluetooth state for getUuid call 
Donnot make the bluetoothservice.getUuids call if the bluetooth
is not on. Also get rid of all the necessary locks on BluetoothService
for get property call. It had a lock on BluetoothAdapterProperty.
bug5472114

Change-Id: I383472ae6006fc1f0129c960c8a44ed0df027a43
 2011-11-16 12:27:57 -08:00
Bill Gruber
89d6c9d689 Filters docs: removes references to forward-locking 
Bug 3055286

Change-Id: Idb64984a1f3437749d9a865885bf4e0b258e60d3
 2011-11-16 10:05:04 -08:00
Bill Gruber
80ef329341 Licensing docs: clarifies server response for draft apps 
Bug 2900690

Change-Id: Ibd1f14739e553bdc237fdb67322e43bef30dfd17
 2011-11-16 09:44:43 -08:00
The Android Open Source Project
d28bb28e08 Reconcile with ics-factoryrom-2-release 
Change-Id: Idf18e15df810885a373fb4057f0db064771afc8e
 2011-11-16 08:55:43 -08:00
Jake Hamby
7d4046e9b7 Merge "Fix 3GPP SMS send failure for 7-bit national language tables." into ics-mr0 2011-11-15 13:34:58 -08:00
Bill Gruber
c3cf16d2b4 Merge "IAB Doc Fix: Error in code snippet Bug 5221766" into ics-mr0 2011-11-15 10:57:32 -08:00
Adrian Ludwig
0fd69ff4b9 Merge "Adding new "Security Best Practices" to the html docs." into ics-mr0 2011-11-15 10:37:28 -08:00