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

24352 Commits

Author SHA1 Message Date
Dianne Hackborn
36cade591a am 7bedac94: am 139e5aa1: Fix issue #6404215: New ActionBar auto-hide can conflict with application 
* commit '7bedac9417d60608003d739c8caed7ca81683825':
  Fix issue #6404215: New ActionBar auto-hide can conflict with application
 2012-05-06 12:51:47 -07:00
Dianne Hackborn
7bedac9417 am 139e5aa1: Fix issue #6404215: New ActionBar auto-hide can conflict with application 
* commit '139e5aa1da51b27231ab36344cf2d0dafab23f1e':
  Fix issue #6404215: New ActionBar auto-hide can conflict with application
 2012-05-06 12:48:45 -07:00
Dianne Hackborn
139e5aa1da Fix issue #6404215: New ActionBar auto-hide can conflict with application 
The action bar now maintains separate states for the things that can
impact its visibility (calls from the app, action mode, system UI) so
that the changes in these won't incorrectly mix together.

Also added a hack to force the status bar to be shown when showing
the action bar for an action mode, when the UI is in a state where
the action bar would be shown with a gap above where the status bar
is.

Change-Id: Ib0950a7f585c5d2c9e77d11b237ba6e150f15ebd
 2012-05-06 11:52:05 -07:00
Pin Ting
1462fe6a38 am aa048661: am d0c66f6a: Merge "Fix javadoc." into jb-dev 
* commit 'aa048661742fe337d30f9ef8a024ef22d1a18ff8':
  Fix javadoc.
 2012-05-06 07:16:41 -07:00
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
4256391861 am ce1d03b3: am 3fd4a382: Merge "Implement cropping of windows based on system UI elements." into jb-dev 
* commit 'ce1d03b39935c42cfa0d11ef782c8c6a2fd823d4':
  Implement cropping of windows based on system UI elements.
 2012-05-05 14:20:44 -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
7e74883ccd am dbd7131c: am e3320e6d: Merge "Fix issue #6444627: New status bar/action bar interaction a bit disjoint" into jb-dev 
* commit 'dbd7131cf4dae6847b6f7aa0f380e103d2b56aaa':
  Fix issue #6444627: New status bar/action bar interaction a bit disjoint
 2012-05-05 14:12:23 -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
Dianne Hackborn
dbd7131cf4 am e3320e6d: Merge "Fix issue #6444627: New status bar/action bar interaction a bit disjoint" into jb-dev 
* commit 'e3320e6d91443450351d49cc2b37477070fb0ce8':
  Fix issue #6444627: New status bar/action bar interaction a bit disjoint
 2012-05-05 14:09:56 -07:00
Dianne Hackborn
e3320e6d91 Merge "Fix issue #6444627: New status bar/action bar interaction a bit disjoint" into jb-dev 2012-05-05 14:07:02 -07:00
Dianne Hackborn
1cc2bcedb5 Fix issue #6444627: New status bar/action bar interaction a bit disjoint 
Make sure action bar animations use same duration as system dock animations.

Change-Id: Ie294d134177207499a05cc93db8f4b859f07ed0c
 2012-05-04 18:59:02 -07:00
Romain Guy
1f5c8a12c5 am f9d5ee55: am 5b972e73: Merge "Don\'t check whether dismiss() is called on the UI thread Bug #6436642" into jb-dev 
* commit 'f9d5ee556a7cc588b19ca3ba92931bd562699f1c':
  Don't check whether dismiss() is called on the UI thread Bug #6436642
 2012-05-04 17:31:09 -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
1c80179039 am 81c0f9df: am 35d79991: Merge "API REVIEW: android.widget.CalendarView" into jb-dev 
* commit '81c0f9df0b45dd083db55afce52fdb001c21e8f4':
  API REVIEW: android.widget.CalendarView
 2012-05-04 17:25:32 -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
8575723dcc am 967b361c: am 6ad5b4f6: Merge "Fix issue #6426645: API REVIEW: android.app.ActivityOptions" into jb-dev 
* commit '967b361cd384761e7f6a2e0a29f1da8f74b6ec9b':
  Fix issue #6426645: API REVIEW: android.app.ActivityOptions
 2012-05-04 16:36:36 -07:00
Svetoslav Ganov
1758ce900d am 9878a04b: am 5fd72a2c: Merge "Finding focus for from rectangle now working." into jb-dev 
* commit '9878a04b3cedf842de29110baa46fb040b5c7887':
  Finding focus for from rectangle now working.
 2012-05-04 16:36:25 -07:00
Adam Powell
235554e845 am da6f2b54: am 9c982340: Merge "Fix LinearLayout measureWithLargestChild for wrap_content views" into jb-dev 
* commit 'da6f2b54caedee4c5e9af86d49e6c95aee054340':
  Fix LinearLayout measureWithLargestChild for wrap_content views
 2012-05-04 16:35:54 -07:00
Andy Stadler
66ff373f5f am 1f1aed5e: am c4be1b7e: Merge "Add System Tracing capability to Sync Manager" into jb-dev 
* commit '1f1aed5e76efd27c69e597fd3eab91fe822bd850':
  Add System Tracing capability to Sync Manager
 2012-05-04 16:35:48 -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
43dad01f5b am 360ca12b: am 516c25b3: Merge "Fix 6414061: Add new ACTION_ASSIST intent." into jb-dev 
* commit '360ca12bf2914c0832da58f9e7963026799bf676':
  Fix 6414061: Add new ACTION_ASSIST intent.
 2012-05-04 14:19:38 -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
27cf66119c am db2a68f3: am df35aa45: Merge "Verify attached before showing a dialog" into jb-dev 
* commit 'db2a68f376ced65ed7338bf5fad1ba3e753d80ea':
  Verify attached before showing a dialog
 2012-05-04 14:09:44 -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
3cb341539b am 32c513b7: am 3c5f9243: The BigTextStyle should never render mContentText 
* commit '32c513b72925c810ac82f96965f7e4d2ede3589a':
  The BigTextStyle should never render mContentText
 2012-05-04 13:41:54 -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
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