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

74336 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
George Mount
d408048641 Remove composing span after setting text. 
Bug 5070241

Change-Id: I8cf7e5f119c7a828df603e91ba4bcf0f571bbc72
 2012-04-09 15:46:55 -07:00
Scott Main
cbcb24cdb8 am 40a081a0: am 5e555df1: am ede62bb6: Merge "docs: fix NDK r7c release data and remove "new" tag" into ics-mr1 
* commit '40a081a0d7c1f88f2614ae6343cd253cd8d50e6f':
 2012-04-09 15:31:24 -07:00
Scott Main
40a081a0d7 am 5e555df1: am ede62bb6: Merge "docs: fix NDK r7c release data and remove "new" tag" into ics-mr1 
* commit '5e555df1b13c030a5b9a720afc59b53be8dc02d5':
  docs: fix NDK r7c release data and remove "new" tag
 2012-04-09 15:27:22 -07:00
Scott Main
3a66ef5ee9 am faef0d0f: am ede62bb6: Merge "docs: fix NDK r7c release data and remove "new" tag" into ics-mr1 
* commit 'faef0d0f648570dae5e919e8cb2d9096861f2491':
  docs: fix NDK r7c release data and remove "new" tag
 2012-04-09 15:27:21 -07:00
Scott Main
faef0d0f64 am ede62bb6: Merge "docs: fix NDK r7c release data and remove "new" tag" into ics-mr1 
* commit 'ede62bb6ee3ac2d98094280cea6343f62936342f':
  docs: fix NDK r7c release data and remove "new" tag
 2012-04-09 15:24:17 -07:00
Scott Main
5e555df1b1 am ede62bb6: Merge "docs: fix NDK r7c release data and remove "new" tag" into ics-mr1 
* commit 'ede62bb6ee3ac2d98094280cea6343f62936342f':
  docs: fix NDK r7c release data and remove "new" tag
 2012-04-09 15:23:57 -07:00
Scott Main
ede62bb6ee Merge "docs: fix NDK r7c release data and remove "new" tag" into ics-mr1 2012-04-09 15:21:53 -07:00
Scott Main
71bd123145 am 8432ab2e: am 372e667c: am ae01af5e: docs: fix a few link titles in tv class 
* commit '8432ab2e3f52a15693a39e5d135dabbca9848ef4':
 2012-04-09 15:16:36 -07:00
Scott Main
b75d4798a8 am ae94f0b3: am 9f6176ee: am ae01af5e: docs: fix a few link titles in tv class 
* commit 'ae94f0b3d80fd076344f86b9500ce671b7bd1c0d':
 2012-04-09 15:16:34 -07:00
Scott Main
4b102249a6 am 99140419: am 7e9fbe11: am 5f257077: Merge "docs: add 101 Training class "Building Your First App"" into ics-mr1 
* commit '99140419010093817f329e2c670557d769507842':
 2012-04-09 15:16:31 -07:00
Scott Main
98956cdd18 am 371704ed: am fd41f154: am 5f257077: Merge "docs: add 101 Training class "Building Your First App"" into ics-mr1 
* commit '371704ed05a4b454a5eafcb13335dbf144181b0f':
 2012-04-09 15:16:28 -07:00
Irfan Sheriff
7405b90df4 Merge "P2p fixes" 2012-04-09 14:29:01 -07:00
Wink Saville
cbc41deaa3 Merge "Telephony: Fix NV ready state" 2012-04-09 14:22:13 -07:00
Eric Fischer
e80203959d Merge "Import translations. DO NOT MERGE" 2012-04-09 14:09:23 -07:00
Eric Fischer
310ee7cf49 Import translations. DO NOT MERGE 
Change-Id: I9299202c20b57a4bbdee61cc1db3cb3d7cefb762
 2012-04-09 13:54:59 -07:00
Wink Saville
283be25869 Merge "Add some additional debug for set operator numeric." 2012-04-09 13:41:49 -07:00
Scott Main
8432ab2e3f am 372e667c: am ae01af5e: docs: fix a few link titles in tv class 
* commit '372e667cbe3503598635387136cf299d5dfffcf9':
 2012-04-09 13:39:46 -07:00
Gilles Debunne
425c726ae0 Merge "More minor refactoring in SpannableStringBuilder" 2012-04-09 13:27:11 -07:00
Brian Colonna
82920edd89 Merge "Separated FUL functionality from LockPatternKeyguardView" 2012-04-09 13:25:37 -07:00
Scott Main
d9b2070f5c am ec73b7c5: am ae01af5e: docs: fix a few link titles in tv class 
* commit 'ec73b7c5e615f0e85af3f1127fc1e5d4cbd41780':
  docs: fix a few link titles in tv class
 2012-04-09 13:18:35 -07:00
Victoria Lease
63b81472a3 Merge "Make WebView.findAllAsync() and WebView.setFindListener() public." 2012-04-09 13:14:28 -07:00
Scott Main
ae94f0b3d8 am 9f6176ee: am ae01af5e: docs: fix a few link titles in tv class 
* commit '9f6176eedcce9c8b6c4f18d8fbf537952727faf3':
  docs: fix a few link titles in tv class
 2012-04-09 13:06:36 -07:00
Scott Main
ec73b7c5e6 am ae01af5e: docs: fix a few link titles in tv class 
* commit 'ae01af5efdf8dfa8bd711bfe045722d00efddf68':
  docs: fix a few link titles in tv class
 2012-04-09 13:03:20 -07:00
Scott Main
9f6176eedc am ae01af5e: docs: fix a few link titles in tv class 
* commit 'ae01af5efdf8dfa8bd711bfe045722d00efddf68':
  docs: fix a few link titles in tv class
 2012-04-09 13:02:54 -07:00
Scott Main
372e667cbe am ae01af5e: docs: fix a few link titles in tv class 
* commit 'ae01af5efdf8dfa8bd711bfe045722d00efddf68':
  docs: fix a few link titles in tv class
 2012-04-09 13:02:35 -07:00
Scott Main
ae01af5efd docs: fix a few link titles in tv class 
Change-Id: I9d87d6a5625c9a95d25354572d35990b37efbba6
 2012-04-09 12:58:26 -07:00
Wink Saville
431a4a3b97 Add some additional debug for set operator numeric. 
Change-Id: I7e22a33f893984c1ad5bd9dd79428ad72d2b4d7c
 2012-04-09 12:19:01 -07:00
Wink Saville
784eb36b88 Telephony: Fix NV ready state 
Don't trigger RuimRecords onReady so that it doesn't overwrite
mccmnc property value set by CdmaPhone in NV case.

Bug: 6153667
Change-Id: I2f25f6a69deecd085f11dbe1dbf752c2fd51cecb
 2012-04-09 12:14:03 -07:00
Daniel Sandler
a379eeca24 Merge "Fix notifications transitioning from small->big." 2012-04-09 12:00:52 -07:00
Victoria Lease
0b8413bbeb Make WebView.findAllAsync() and WebView.setFindListener() public. 
Deprecate WebView.findAll() while we're at it.

Bug: 6052412
Change-Id: I2f7116786109b4d6a01d24ac892c13b5d1f498f4
 2012-04-09 11:48:18 -07:00
Scott Main
c1c2ca0cc6 am 3f23b713: am 5f257077: Merge "docs: add 101 Training class "Building Your First App"" into ics-mr1 
* commit '3f23b71364e7a0960c6a1269ec2467937bc13388':
  docs: add 101 Training class "Building Your First App"
 2012-04-09 11:28:53 -07:00
Jeff Sharkey
eaeee6a55c Merge "Migrate to @Override to remove warnings." 2012-04-09 11:26:34 -07:00
Jeff Brown
fd6ebee93c Merge "Fix lid switch interpretation." 2012-04-09 11:25:02 -07:00
Jeff Brown
3b0ea8dbb6 Merge "Use new EVIOCSCLOCKID ioctl if supported." 2012-04-09 11:24:16 -07:00
Jeff Brown
27fd3420ac Fix lid switch interpretation. 
Also remove unnecessary permission check for method that is
only called internally.

Change-Id: I32f63fc3e96b06709d18b046ee2d3c8f310de70d
 2012-04-09 11:22:12 -07:00
Daniel Sandler
84920cc56e Fix notifications transitioning from small->big. 
We'll have to go back and tweak this when we add a more
sophisticated switch from contentView to bigContentView, but
for now, this ought to detect that the notification has
gotten bigger (or smaller).

Change-Id: I3816fe8ed321569d1ce07d8a62cb08a434e55c2d
 2012-04-09 14:17:57 -04:00
Scott Main
979c4f5908 docs: fix NDK r7c release data and remove "new" tag 
Change-Id: I37d2dfb46aef66b75cfd93a21005748358d457ec
 2012-04-09 11:15:35 -07:00
Jeff Brown
eca3cf58c0 Use new EVIOCSCLOCKID ioctl if supported. 
Bug: 6292993
Change-Id: I718f167c2cd41298ed54847dbc5de872cd4c7e4a
 2012-04-09 11:00:37 -07:00
Jeff Sharkey
bfdd680ab4 Migrate to @Override to remove warnings. 
Bug: 6303344
Change-Id: I0d33b2ed448467379d576ccd71fb5ae20c878852
 2012-04-09 10:57:21 -07:00
Adam Powell
081cc9a1f5 Merge "Tweaks to Activity up navigation" 2012-04-09 10:52:26 -07:00
Jeff Sharkey
4b3c523210 Merge "Splice operations before collapsing ifaces." 2012-04-09 10:31:20 -07:00
Adam Powell
04d5811500 Tweaks to Activity up navigation 
Be more explicit in docs about getParentActivityIntent and guard against
calls when a parent has not been declared in the manifest.

Move automatic up navigation to happen after dispatch of the menu
selection event of id android.R.id.home to fragments. (Last.)

Fixes bug 6305357

Change-Id: I944e5c40774121f9a28250d8d98da6aa646f9357
 2012-04-09 10:31:15 -07:00
Jeff Sharkey
21a547823d Splice operations before collapsing ifaces. 
Bug: 6241038
Change-Id: Ide9058703f7305df8fb070af149ddce0653a0abf
 2012-04-09 10:27:55 -07:00
Scott Main
9914041901 am 7e9fbe11: am 5f257077: Merge "docs: add 101 Training class "Building Your First App"" into ics-mr1 
* commit '7e9fbe11c2c8dc875a24ec51e9405ab266385c39':
 2012-04-09 10:21:05 -07:00
Scott Main
371704ed05 am fd41f154: am 5f257077: Merge "docs: add 101 Training class "Building Your First App"" into ics-mr1 
* commit 'fd41f15440eadcc5dd0b1f0d549efad293192154':
  docs: add 101 Training class "Building Your First App"
 2012-04-09 10:18:59 -07:00
Scott Main
7e9fbe11c2 am 5f257077: Merge "docs: add 101 Training class "Building Your First App"" into ics-mr1 
* commit '5f2570773d9b4d7d55b9bac5c9fafb56e1dcce88':
  docs: add 101 Training class "Building Your First App"
 2012-04-09 10:16:17 -07:00
Scott Main
3f23b71364 am 5f257077: Merge "docs: add 101 Training class "Building Your First App"" into ics-mr1 
* commit '5f2570773d9b4d7d55b9bac5c9fafb56e1dcce88':
  docs: add 101 Training class "Building Your First App"
 2012-04-09 10:15:59 -07:00
Scott Main
fd41f15440 am 5f257077: Merge "docs: add 101 Training class "Building Your First App"" into ics-mr1 
* commit '5f2570773d9b4d7d55b9bac5c9fafb56e1dcce88':
  docs: add 101 Training class "Building Your First App"
 2012-04-09 10:15:46 -07:00
Scott Main
5f2570773d Merge "docs: add 101 Training class "Building Your First App"" into ics-mr1 2012-04-09 10:13:58 -07:00
Scott Main
2d6faf9538 docs: add 101 Training class "Building Your First App" 
Change-Id: I9a1f27dc2b44fac8b0e9fbeb9326b5c62a93bc41
 2012-04-09 10:03:35 -07:00