John Reck
db2a68f376
am df35aa45: Merge "Verify attached before showing a dialog" into jb-dev
...
* commit 'df35aa457ec275422b1695f6a3293aae35f99a22':
Verify attached before showing a dialog
2012-05-04 14:06:48 -07:00
John Reck
df35aa457e
Merge "Verify attached before showing a dialog" into jb-dev
2012-05-04 14:04:15 -07:00
Chris Wren
32c513b729
am 3c5f9243: The BigTextStyle should never render mContentText
...
* commit '3c5f92432734e1e3b9bdc515628a4c09d7759cd4':
The BigTextStyle should never render mContentText
2012-05-04 13:39:13 -07:00
Chris Wren
3c5f924327
The BigTextStyle should never render mContentText
...
Change-Id: Ifcbb0868871741bd78c5ebf31408143aaf732b98
2012-05-04 13:32:18 -07:00
Fabrice Di Meglio
fc6ef88a3d
am 8396830d: Merge "Hide RTL related APIs - DO NOT MERGE" into jb-dev
...
* commit '8396830d8fedc08c0a9de36bcce3c8b65691729f':
Hide RTL related APIs - DO NOT MERGE
2012-05-04 13:21:59 -07:00
Fabrice Di Meglio
8396830d8f
Merge "Hide RTL related APIs - DO NOT MERGE" into jb-dev
2012-05-04 13:19:41 -07:00
Fabrice Di Meglio
66388dcb09
Hide RTL related APIs - DO NOT MERGE
...
- fix bug #6441155 API review: @hide RTL layout APIs
Change-Id: I13c5ea5f579cecffed9d517f06180ab0576cd26a
2012-05-04 13:15:12 -07:00
John Reck
d4717b8b6f
Verify attached before showing a dialog
...
Bug: 6372828
Change-Id: I7f3360ab8a0cdcaf20829e6e2c9181c7af73586e
2012-05-04 13:13:38 -07:00
Chris Wren
cdea2a3e65
am d213524d: Merge "Add an alternate title that can be used in the overflow of a InboxStyle. Always hide contentText for BigTextStyle and InboxStyle. Style cannot be used without specialization, it should be abstract." into jb-dev
...
* commit 'd213524d8fad57462a87d5f9bc874e09effdef7d':
Add an alternate title that can be used in the overflow of a InboxStyle. Always hide contentText for BigTextStyle and InboxStyle. Style cannot be used without specialization, it should be abstract.
2012-05-04 12:58:00 -07:00
Chris Wren
d213524d8f
Merge "Add an alternate title that can be used in the overflow of a InboxStyle. Always hide contentText for BigTextStyle and InboxStyle. Style cannot be used without specialization, it should be abstract." into jb-dev
2012-05-04 12:55:55 -07:00
Jeff Sharkey
74f64d78e5
am bb1492f7: Merge "Reduce persist threshold for lower warning/limit." into jb-dev
...
* commit 'bb1492f7fae9fbcdfcb02b6f8475fd98a236c244':
Reduce persist threshold for lower warning/limit.
2012-05-04 12:54:49 -07:00
Jeff Sharkey
3ddb4f80e5
am c065a8af: Merge "Begin collecting xtables iface counters." into jb-dev
...
* commit 'c065a8af1561544f1557e3f5036e45a4be4a6d7e':
Begin collecting xtables iface counters.
2012-05-04 12:54:46 -07:00
Jeff Sharkey
bb1492f7fa
Merge "Reduce persist threshold for lower warning/limit." into jb-dev
2012-05-04 12:53:14 -07:00
Jeff Sharkey
c065a8af15
Merge "Begin collecting xtables iface counters." into jb-dev
2012-05-04 12:53:02 -07:00
Chris Wren
d6297dbfe9
Add an alternate title that can be used in the overflow of a InboxStyle.
...
Always hide contentText for BigTextStyle and InboxStyle.
Style cannot be used without specialization, it should be abstract.
Bug: 6428978
Bug: 6274137
Bug: 6317471
Change-Id: I21531a94494f891a058a477805b177e736b921cf
2012-05-04 12:45:38 -07:00
George Mount
c24c069e2b
am a2c21308: Merge "Limit when auto-complete popups attach to WebView." into jb-dev
...
* commit 'a2c213080d26c08235f11829fb2bbcf07cdfdd46':
Limit when auto-complete popups attach to WebView.
2012-05-04 11:47:07 -07:00
George Mount
a2c213080d
Merge "Limit when auto-complete popups attach to WebView." into jb-dev
2012-05-04 11:44:54 -07:00
Romain Guy
edc773cab7
am 531d164d: Merge "Fix javadoc" into jb-dev
...
* commit '531d164d677b5f924896fd758d8f544ed7a8d07a':
Fix javadoc
2012-05-04 11:40:07 -07:00
Romain Guy
531d164d67
Merge "Fix javadoc" into jb-dev
2012-05-04 11:36:25 -07:00
Romain Guy
3dd4b51fc3
Fix javadoc
...
Change-Id: I1f1262a9a385e981a98876f8396ad375ab74827d
2012-05-04 11:31:01 -07:00
Chet Haase
78c481c182
am 4380f954: Merge "Minor doc fixes for animation- and view-related things" into jb-dev
...
* commit '4380f9542fcb4a452332ecbea6a2036a2b159ab3':
Minor doc fixes for animation- and view-related things
2012-05-04 10:52:10 -07:00
Chet Haase
4380f9542f
Merge "Minor doc fixes for animation- and view-related things" into jb-dev
2012-05-04 10:49:21 -07:00
John Reck
722211ed83
am 90673b9d: Merge "Monkeys are touching my destroyed stuff" into jb-dev
...
* commit '90673b9d0e33de1162a671995796171ba953d35d':
Monkeys are touching my destroyed stuff
2012-05-04 10:31:42 -07:00
John Reck
90673b9d0e
Merge "Monkeys are touching my destroyed stuff" into jb-dev
2012-05-04 10:29:10 -07:00
John Reck
026bb684be
Monkeys are touching my destroyed stuff
...
Bug: 6443402
Change-Id: I4e992d8d0f53958f0cbeb405f30635e0d172009f
2012-05-04 10:25:43 -07:00
George Mount
57bd51713e
Limit when auto-complete popups attach to WebView.
...
Bug 6401222
Only create the anchor view when the popup window
is ready to show and detach it when it is dismissed.
Change-Id: Ic16485e9970b00744c07b470df5420568332c8f0
2012-05-04 10:24:28 -07:00
Teng-Hui Zhu
5a63ec30d6
am 0008f736: Merge "Unify the rect names according to the coordinates" into jb-dev
...
* commit '0008f736471dca879b87028b892172689ff3534c':
Unify the rect names according to the coordinates
2012-05-04 09:30:38 -07:00
Teng-Hui Zhu
0008f73647
Merge "Unify the rect names according to the coordinates" into jb-dev
2012-05-04 09:28:23 -07:00
Makoto Onuki
e8d4d402aa
am d7247c76: Merge "Remove SocialContract, which was never used." into jb-dev
...
* commit 'd7247c7633a1c97db824f1bd6298fbf5f13cd8f4':
Remove SocialContract, which was never used.
2012-05-04 09:24:33 -07:00
Makoto Onuki
d7247c7633
Merge "Remove SocialContract, which was never used." into jb-dev
2012-05-04 09:22:39 -07:00
Craig Mautner
5bdf114327
am 602290a0: Merge "Retain current visibility when copying layoutparam" into jb-dev
...
* commit '602290a01124b2eac045b066a87a6fc4911153c6':
Retain current visibility when copying layoutparam
2012-05-04 08:04:19 -07:00
Craig Mautner
602290a011
Merge "Retain current visibility when copying layoutparam" into jb-dev
2012-05-04 08:01:59 -07:00
Wu-cheng Li
51caa5111d
am b0dcf5eb: Merge "Avoid deadlocks when calling autoFocus from onAutoFocus callback." into jb-dev
...
* commit 'b0dcf5ebb26e33fde3dd8fbdec58499175f51d65':
Avoid deadlocks when calling autoFocus from onAutoFocus callback.
2012-05-03 21:55:16 -07:00
Wu-cheng Li
b0dcf5ebb2
Merge "Avoid deadlocks when calling autoFocus from onAutoFocus callback." into jb-dev
2012-05-03 21:52:44 -07:00
Dianne Hackborn
a112461fdc
am 610f310b: Merge "New permissions UI." into jb-dev
...
* commit '610f310b199ec0d93cb6e78106b029d7269015df':
New permissions UI.
2012-05-03 19:05:24 -07:00
Dianne Hackborn
0e128bb2e0
New permissions UI.
...
Had to keep around a little of the old API for the device
admin settings UI to continue to use.
Change-Id: I84c5666a7f3fec0495eae196a0ffc2223c9e6f82
2012-05-03 19:00:23 -07:00
Craig Mautner
3fe38c0e73
Retain current visibility when copying layoutparam
...
The LayoutParams members, systemUiVisibility and
subtreeSystemUiVisibility are derived values rather than app-generated
values. When copying LayoutParams members make sure these values are
not overwritten.
Overwriting them was causing the STATUS_BAR_DISABLE_XXX flags to be
overwritten exposing elements that should have remained hidden.
Fixes bug b6374541.
Change-Id: Iaae4b4167e1b148bbdba4d05f473844f7fa3bf8d
2012-05-03 17:28:09 -07:00
Makoto Onuki
35c29cfce7
Remove SocialContract, which was never used.
...
Bug 6148750
Change-Id: I3061b427ea20c35de826e6c0c7bb8cbe5fa1f04d
2012-05-03 16:39:40 -07:00
Chet Haase
cb150fe9e6
Minor doc fixes for animation- and view-related things
...
Issue #6016341 Add info about properties and ViewPropertyAnimator to View reference docs
Issue #6441062 Misleading docs in ViewPropertyAnimator
Change-Id: Ica7c026c770fe2e57013fe443ede5428cd6b6604
2012-05-03 16:30:16 -07:00
John Reck
fd84f173a0
am 84fa241f: Fix tap highlight annoyingness
...
* commit '84fa241f6c6f8b9f72371dd540515ba8041dd6b7':
Fix tap highlight annoyingness
2012-05-03 16:18:31 -07:00
John Reck
84fa241f6c
Fix tap highlight annoyingness
...
Bug: 6108346
Highlight now correctly doesn't show up unless it is a click, and
no longer has any weirdness with sticking around unusually long
Change-Id: I06f6eae45d970085232466f17cbbd9ebaefc4d69
2012-05-03 16:08:55 -07:00
Chet Haase
dbad40ac72
am f7ee988e: Merge "Better error logs for faulty ObjectAnimators" into jb-dev
...
* commit 'f7ee988e55c6f6934cbb9e47feea65e62a3a2f21':
Better error logs for faulty ObjectAnimators
2012-05-03 16:00:23 -07:00
Chet Haase
f7ee988e55
Merge "Better error logs for faulty ObjectAnimators" into jb-dev
2012-05-03 15:57:32 -07:00
Teng-Hui Zhu
508d7053ff
Unify the rect names according to the coordinates
...
This is a pure refactor, no functional change.
bug:6338456
Change-Id: Ib40af53f4e2ff8ce5c9f82f3472989b2d3f2007c
2012-05-03 15:55:29 -07:00
Chet Haase
db4101c7d5
Better error logs for faulty ObjectAnimators
...
Previously, if you set up an ObjectAnimator with the name of a property
which could not be resolved to an existing method (e.g., "foo" becomes "getFoo()"
or "setFoo()"), the errors in the log could be a bit obscure and the animation might
just crash sometime later with an unexplained NPE. This change provides a more
detailed log message detailing the actual method/class involved.
Issue #5990756 NullPointerException on no such property
Change-Id: Ic5bf7069c4879623e00ab8a794b799773cce487c
2012-05-03 15:19:24 -07:00
Eino-Ville Talvala
b239d1a974
am 163a3ae7: Merge "Update docs for YV12 format and camera preview callbacks." into jb-dev
...
* commit '163a3ae770c290f87347e5b413ec8ff9f128a311':
Update docs for YV12 format and camera preview callbacks.
2012-05-03 13:51:39 -07:00
Eino-Ville Talvala
163a3ae770
Merge "Update docs for YV12 format and camera preview callbacks." into jb-dev
2012-05-03 13:49:57 -07:00
Jeff Sharkey
ac3fcb1590
Reduce persist threshold for lower warning/limit.
...
Default is 2MB persist threshold, but even that can be substantial
for devices on 100MB/month plans. This change gradually reduces the
persist threshold up to 8x lower (256kb outstanding) based on lowest
active policy.
Bug: 5382676
Change-Id: Ief4e8cdb169bfb151a3d1b45722a8eaa01926508
2012-05-03 12:12:10 -07:00
Jeff Brown
d4daf5212e
am e19dbd9f: Merge "Separate the internal and external display rotations." into jb-dev
...
* commit 'e19dbd9f9d0fea5959d8384d5d9d577d25cc8963':
Separate the internal and external display rotations.
2012-05-03 11:59:05 -07:00
Jeff Brown
e19dbd9f9d
Merge "Separate the internal and external display rotations." into jb-dev
2012-05-03 11:56:25 -07:00