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

30635 Commits

Author SHA1 Message Date
Chris Wren
bd41275441 am cdea2a3e: 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 'cdea2a3e654543ecdf27528d505787770c1b5feb':
  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 13:02:05 -07:00
Jeff Sharkey
c04edc4abf am 74f64d78: am bb1492f7: Merge "Reduce persist threshold for lower warning/limit." into jb-dev 
* commit '74f64d78e5536a3b47d68636bad438d94426e275':
  Reduce persist threshold for lower warning/limit.
 2012-05-04 12:59:14 -07:00
Jeff Sharkey
353f8c7d33 am 3ddb4f80: am c065a8af: Merge "Begin collecting xtables iface counters." into jb-dev 
* commit '3ddb4f80e5cb47173b78430399076c4c3d1bb178':
  Begin collecting xtables iface counters.
 2012-05-04 12:59:11 -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
977b97b1c9 am c24c069e: am a2c21308: Merge "Limit when auto-complete popups attach to WebView." into jb-dev 
* commit 'c24c069e2bd925d1644e8dd5ffeff5242cbb2d4f':
  Limit when auto-complete popups attach to WebView.
 2012-05-04 11:49:43 -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
de4368687e am edc773ca: am 531d164d: Merge "Fix javadoc" into jb-dev 
* commit 'edc773cab7a3e89752747419cd67a18e12c44901':
  Fix javadoc
 2012-05-04 11:42:55 -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
c0400e9f26 am 78c481c1: am 4380f954: Merge "Minor doc fixes for animation- and view-related things" into jb-dev 
* commit '78c481c18254bb4b45329fd4e4cb4da381593a80':
  Minor doc fixes for animation- and view-related things
 2012-05-04 10:56:20 -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
c52f0d3d80 am 722211ed: am 90673b9d: Merge "Monkeys are touching my destroyed stuff" into jb-dev 
* commit '722211ed8384122e85c45c0490a6fa411d255130':
  Monkeys are touching my destroyed stuff
 2012-05-04 10:34:15 -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
826bcf0d9b am 5a63ec30: am 0008f736: Merge "Unify the rect names according to the coordinates" into jb-dev 
* commit '5a63ec30d670ac8ed384525cd8cd3067d39ad742':
  Unify the rect names according to the coordinates
 2012-05-04 09:34:56 -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
Makoto Onuki
de70e49457 am e8d4d402: am d7247c76: Merge "Remove SocialContract, which was never used." into jb-dev 
* commit 'e8d4d402aa23f39df238fc30ab281001120e6a2e':
  Remove SocialContract, which was never used.
 2012-05-04 09:28:46 -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
e819926a14 am 5bdf1143: am 602290a0: Merge "Retain current visibility when copying layoutparam" into jb-dev 
* commit '5bdf114327fa219ed5a5243883713c09c020aa3a':
  Retain current visibility when copying layoutparam
 2012-05-04 08:07:16 -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
Jean-Baptiste Queru
bfad7d6396 Fix build 
Change-Id: I7309cb3ca67f8c17545bdfa40fd9370464856942
 2012-05-04 07:13:43 -07:00
Wu-cheng Li
a2f492f521 am 51caa511: am b0dcf5eb: Merge "Avoid deadlocks when calling autoFocus from onAutoFocus callback." into jb-dev 
* commit '51caa5111ddf16de677c7021b78eb0298b807f7b':
  Avoid deadlocks when calling autoFocus from onAutoFocus callback.
 2012-05-03 21:58:01 -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
eabcde2d92 am a112461f: am 610f310b: Merge "New permissions UI." into jb-dev 
* commit 'a112461fdc7ab36912dce27256ce8289be94471b':
  New permissions UI.
 2012-05-03 19:22:51 -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
610f310b19 Merge "New permissions UI." into jb-dev 2012-05-03 19:03:11 -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
Jeff Sharkey
615778fb79 am c4ef06b1: am 1c873609: Merge "Make fixed-width dialogs larger on sw600dp." into jb-dev 
* commit 'c4ef06b1937142c857987f88fb6eced9ad0fc82f':
  Make fixed-width dialogs larger on sw600dp.
 2012-05-03 18:53:35 -07:00
Christopher Tate
f131611d03 resolved conflicts for merge of b89ce434 to master 
Change-Id: Ida7ef25adc2f4b9f22d8662c9f0e8a1ec9df0d55
 2012-05-03 18:18:34 -07:00
Jeff Sharkey
c4ef06b193 am 1c873609: Merge "Make fixed-width dialogs larger on sw600dp." into jb-dev 
* commit '1c87360918c81f1cabc7be0760d7e059f2cfa178':
  Make fixed-width dialogs larger on sw600dp.
 2012-05-03 17:38:35 -07:00
Jeff Sharkey
1c87360918 Merge "Make fixed-width dialogs larger on sw600dp." into jb-dev 2012-05-03 17:36:43 -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
Jeff Sharkey
cc152567d5 Make fixed-width dialogs larger on sw600dp. 
Leaves at existing size for sw720dp devices.

Bug: 6378944
Change-Id: I8be079869c724eb05949cb56e137626e32140afb
 2012-05-03 16:55:16 -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