Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
76,299 Commits 3 Branches 0 Tags
aa048661742fe337d30f9ef8a024ef22d1a18ff8
Commit Graph

22379 Commits

Author SHA1 Message Date
Pin Ting
aa04866174 am d0c66f6a: Merge "Fix javadoc." into jb-dev 
* commit 'd0c66f6a8f15bb95648b4306d2583575d0bb9935':
  Fix javadoc.
 2012-05-06 07:14:11 -07:00
Pin Ting
d0c66f6a8f Merge "Fix javadoc." into jb-dev 2012-05-06 07:12:02 -07:00
Dianne Hackborn
ce1d03b399 am 3fd4a382: Merge "Implement cropping of windows based on system UI elements." into jb-dev 
* commit '3fd4a3822160e8ad84122641a56c9f92540d02b5':
  Implement cropping of windows based on system UI elements.
 2012-05-05 14:17:57 -07:00
Dianne Hackborn
3fd4a38221 Merge "Implement cropping of windows based on system UI elements." into jb-dev 2012-05-05 14:15:39 -07:00
Dianne Hackborn
3556c9a806 Implement cropping of windows based on system UI elements. 
Start calling Surface.setActiveRect().

Change-Id: I94197059c971c6ab7820e615ea8f285482b86c75
 2012-05-05 14:12:13 -07:00
Romain Guy
f9d5ee556a am 5b972e73: Merge "Don\'t check whether dismiss() is called on the UI thread Bug #6436642" into jb-dev 
* commit '5b972e730f99ea4cf74f8ccf3e2c57289255c4f6':
  Don't check whether dismiss() is called on the UI thread Bug #6436642
 2012-05-04 17:28:51 -07:00
Romain Guy
5b972e730f Merge "Don't check whether dismiss() is called on the UI thread Bug #6436642" into jb-dev 2012-05-04 17:27:11 -07:00
Svetoslav Ganov
81c0f9df0b am 35d79991: Merge "API REVIEW: android.widget.CalendarView" into jb-dev 
* commit '35d79991d5c97270f6c34d0da8879ea4c3984f80':
  API REVIEW: android.widget.CalendarView
 2012-05-04 17:22:20 -07:00
Svetoslav Ganov
35d79991d5 Merge "API REVIEW: android.widget.CalendarView" into jb-dev 2012-05-04 17:18:51 -07:00
Romain Guy
05e1c3a691 Don't check whether dismiss() is called on the UI thread 
Bug #6436642

An app invoking dismiss() during a draw pass could cause crashes.
This change makes the code simpler too.

Change-Id: Iba89a8522e23d02f87697cfeec6cc713a1462669
 2012-05-04 17:18:29 -07:00
Svetoslav Ganov
414efc3b5f API REVIEW: android.widget.CalendarView 
1. Making sure that the comment blocks for methods setting/getting
   resource attributes include links to the related attribute
   documentation.

bug:6442803

Change-Id: If8acedfedf02400eee3f61ca3029325c05a5fb86
 2012-05-04 16:54:06 -07:00
Dianne Hackborn
967b361cd3 am 6ad5b4f6: Merge "Fix issue #6426645: API REVIEW: android.app.ActivityOptions" into jb-dev 
* commit '6ad5b4f637e64cb07a17079424cff66c867c7f27':
  Fix issue #6426645: API REVIEW: android.app.ActivityOptions
 2012-05-04 16:12:37 -07:00
Dianne Hackborn
6ad5b4f637 Merge "Fix issue #6426645: API REVIEW: android.app.ActivityOptions" into jb-dev 2012-05-04 16:10:16 -07:00
Svetoslav Ganov
9878a04b3c am 5fd72a2c: Merge "Finding focus for from rectangle now working." into jb-dev 
* commit '5fd72a2cceae9955af316f32e17a84515c317738':
  Finding focus for from rectangle now working.
 2012-05-04 15:52:45 -07:00
Svetoslav Ganov
5fd72a2cce Merge "Finding focus for from rectangle now working." into jb-dev 2012-05-04 15:49:44 -07:00
Adam Powell
da6f2b54ca am 9c982340: Merge "Fix LinearLayout measureWithLargestChild for wrap_content views" into jb-dev 
* commit '9c98234095a6894621d1c71e1c9e523c70f0f067':
  Fix LinearLayout measureWithLargestChild for wrap_content views
 2012-05-04 15:03:36 -07:00
Adam Powell
9c98234095 Merge "Fix LinearLayout measureWithLargestChild for wrap_content views" into jb-dev 2012-05-04 15:01:14 -07:00
Adam Powell
eabc919844 Fix LinearLayout measureWithLargestChild for wrap_content views 
Bug 6442795

When the measureWithLargestChild setting is enabled, LL used to
measure the full container taking the largest child rule into account,
but the child views were not properly remeasured for AT_MOST
measurespecs. Correct this.

Fix measureWithLargestChild for height

Change-Id: Ieb91114bc2ae65f9104337bd6d16a7d9e559571d
 2012-05-04 14:54:14 -07:00
Andy Stadler
1f1aed5e76 am c4be1b7e: Merge "Add System Tracing capability to Sync Manager" into jb-dev 
* commit 'c4be1b7e963413c110d8a6ee9fdd4fd7443fb2e0':
  Add System Tracing capability to Sync Manager
 2012-05-04 14:49:00 -07:00
Andy Stadler
c4be1b7e96 Merge "Add System Tracing capability to Sync Manager" into jb-dev 2012-05-04 14:46:00 -07:00
Jim Miller
360ca12bf2 am 516c25b3: Merge "Fix 6414061: Add new ACTION_ASSIST intent." into jb-dev 
* commit '516c25b38a03decc8f9cbd41f4d9baa4f52f438f':
  Fix 6414061: Add new ACTION_ASSIST intent.
 2012-05-04 14:16:16 -07:00
Jim Miller
516c25b38a Merge "Fix 6414061: Add new ACTION_ASSIST intent." into jb-dev 2012-05-04 14:12:41 -07:00
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
Jim Miller
0799440ab3 Fix 6414061: Add new ACTION_ASSIST intent. 
Change-Id: I3d334f67723ac89f6001267e0f06ad76190b929f
 2012-05-04 13:52:14 -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
Dianne Hackborn
ddc52a80b5 Fix issue #6426645: API REVIEW: android.app.ActivityOptions 
Change-Id: If2f7b987e1825a8b0ebaf2c499924dfc1527274b
 2012-05-04 12:04:40 -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
Andy Stadler
09b45a3ad9 Add System Tracing capability to Sync Manager 
This tracing code is enabled via "systrace.py --set-tags sync"

Change-Id: Ia8bc01adbba345a568405b0ac8ade96e56b40cc1
 2012-05-04 11:24:33 -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