Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
121,949 Commits 3 Branches 0 Tags
ee779ea446dd1161ba2fc50356edd5722454f141
Commit Graph

4206 Commits

Author SHA1 Message Date
Adam Powell
fe9c354ccd am 9c9975ac: Merge "Fix a bug where OnTouchListeners in action views could be removed" into klp-modular-dev 
* commit '9c9975ac3dc63423751c4783162d4ade11d156c1':
  Fix a bug where OnTouchListeners in action views could be removed
 2014-01-10 18:32:08 +00:00
Adam Powell
fa18d182a3 Move ActionMenuView into android.widget and make it public 
Expose ActionMenuView as a way for applications to present
ActionBar-style menus in other embedded or repeating contexts.

Change-Id: I54b7ccd9b2116ca68bc72956da9262bca9d5085f
 2014-01-08 13:53:30 -08:00
Conley Owens
d8a6c59d3d am 5b44325f: am 849ab14d: am 7f16047b: am 73a6702e: am 4440a824: Merge "CompoundButton: Let text can be changed by config" 
* commit '5b44325fff247558ca36d83930b877dc44e5e219':
  CompoundButton: Let text can be changed by config
 2014-01-06 23:51:24 +00:00
Conley Owens
7f16047b9e am 73a6702e: am 4440a824: Merge "CompoundButton: Let text can be changed by config" 
* commit '73a6702eeaabdeb7b405ec504413d41716ef3508':
  CompoundButton: Let text can be changed by config
 2014-01-06 15:41:50 -08:00
Conley Owens
4440a8244e Merge "CompoundButton: Let text can be changed by config" 2014-01-06 23:36:03 +00:00
Raph Levien
dcd8258e24 am 971003c9: am ece5bc9d: am 7b6b85d2: am d7d07498: am a980c7aa: Merge "Re-initialize error after attach" 
* commit '971003c9ffc854f4b080af902457e7a6447f692a':
  Re-initialize error after attach
 2014-01-06 17:16:02 +00:00
Raph Levien
7b6b85d260 am d7d07498: am a980c7aa: Merge "Re-initialize error after attach" 
* commit 'd7d0749805b6ae8bb345731ac9dd960f6b5aa5dd':
  Re-initialize error after attach
 2014-01-06 09:06:06 -08:00
quddusc
7999170276 am 6208ef25: am c609cb0d: am b889885e: am 34dbf7c3: am ad7b5993: Merge "docs: Fixed duplicate text in onScrollStateChanged() scrollState parameter description. Bug: 6804017" into klp-docs 
* commit '6208ef25fd9b570770065edbfa71bbb2de8aa511':
  docs: Fixed duplicate text in onScrollStateChanged() scrollState parameter description. Bug: 6804017
 2013-12-26 23:54:15 +00:00
quddusc
34dbf7c323 am ad7b5993: Merge "docs: Fixed duplicate text in onScrollStateChanged() scrollState parameter description. Bug: 6804017" into klp-docs 
* commit 'ad7b5993b579994c0b0838783bb8d0a94dffb1ee':
  docs: Fixed duplicate text in onScrollStateChanged() scrollState parameter description. Bug: 6804017
 2013-12-20 23:10:28 +00:00
quddusc
9072110b82 docs: Fixed duplicate text in onScrollStateChanged() scrollState parameter description. 
Bug: 6804017

Change-Id: I1e08fc7a9a5db85341c57f6ec04c434a94183cd0
 2013-12-20 14:55:09 -08:00
Alan Viverette
217694199f Merge "Correctly report isOpaque() from ImageView" 2013-12-18 02:53:20 +00:00
Alan Viverette
92f33b0754 Merge "Peek the fast scroll thumb when it transitions to enabled state" 2013-12-18 02:44:32 +00:00
Alan Viverette
63567e3829 Merge "Ensure transient state views are consistently temporarily detached" 2013-12-18 02:31:40 +00:00
Alan Viverette
add12e56d0 Merge "Don't cast FastScroller adapter to BaseAdapter" 2013-12-16 23:36:49 +00:00
Robert Shih
8a7af570ac Merge "MediaController does not check for cancelled motions in onTouchEvent, causing nested invocations of WindowManagerGlobal.addView. Sample stack trace below." 2013-12-16 22:35:28 +00:00
Daniel 2 Olofsson
f4ecc55657 Re-initialize error after attach 
If flag for error after attach is not reinitialized, it may cause
NullPointerException on subsequent onAttachedWindow if error text
was reset to null.

Change-Id: I8976c28a6ca71017e5c4b3f29d4eeeb2eda48c38
 2013-12-16 11:05:42 +01:00
Alan Viverette
4f434c7fb4 Don't cast FastScroller adapter to BaseAdapter 
BUG: 12130253
Change-Id: I78864a4603599daf39829d33414202c43ca97aa9
 2013-12-13 11:01:21 -08:00
Alan Viverette
e10dd53894 Correctly report isOpaque() from ImageView 
Includes special handling for attributes that can affect the image's
drawing opacity and bounds, e.g. xfermode, alpha, and matrix transform.

BUG: 12120109
Change-Id: Ieeec11ff35af899c4e6fcf6364633c15ec94241e
 2013-12-12 19:19:51 -08:00
Alan Viverette
8ac22b0ada Peek the fast scroll thumb when it transitions to enabled state 
Change-Id: I0b472c898c5975a74da3af2c8da6e55c3678b850
 2013-12-12 18:35:40 -08:00
Alan Viverette
595115089f Ensure transient state views are consistently temporarily detached 
BUG: 12024471
Change-Id: I02659d65d664b3fd8991a0527bd23801db6f1a9d
 2013-12-09 13:49:25 -08:00
Alan Viverette
517a004603 Fix handling of constraints for unspecified height RelativeLayouts 
BUG: 11897546
Change-Id: If26c4be3763072f53f889574a51af16bbd6532c7
 2013-12-04 17:08:44 -08:00
Alan Viverette
78c66c747b Merge "Defer event interception in FastScroller" 2013-12-04 01:57:12 +00:00
Alan Viverette
4cfeedb6ae Defer event interception in FastScroller 
BUG: 11273369
Change-Id: Ic380069075b6317062697298a1b928cea9f3c484
 2013-12-03 14:03:24 -08:00
Katie McCormick
d786a1900e resolved conflicts for merge of 37e4c405 to master 
Change-Id: I7df89be84384369ef5e89bb3b924ca38c1b5d9bd
 2013-12-02 12:37:58 -08:00
Alan Viverette
26606007be Merge "Fix header and footer dividers to match docs" 2013-11-26 22:40:42 +00:00
Katie McCormick
484b57a565 am 9d0a88bd: Merge "Doc updates: Javadoc fixes" into klp-docs 
* commit '9d0a88bd4e07deac01d7759b70cdf160456be1c0':
  Doc updates: Javadoc fixes
 2013-11-26 21:58:18 +00:00
Katie McCormick
f2ef28d840 Doc updates: Javadoc fixes 
Change-Id: I82381056f9f13e53ab8a0525f5a53bf98674c052
 2013-11-26 13:52:48 -08:00
John Spurlock
6090995951 Remove unused imports from frameworks/base. 
Change-Id: Ia1f99bd2c1105b0b0f70aa614f1f4a67b2840906
 2013-11-20 11:31:47 -05:00
Robert Shih
cfe4b59334 MediaController does not check for cancelled motions in onTouchEvent, causing 
nested invocations of WindowManagerGlobal.addView. Sample stack trace below.

android.view.WindowManagerGlobal.addView(WindowManagerGlobal.java:228)
android.view.WindowManagerImpl.addView(WindowManagerImpl.java:69)
android.widget.MediaController.show(MediaController.java:346)
android.widget.MediaController.onTouchEvent(MediaController.java:445)
android.view.View.dispatchTouchEvent(View.java:7690)
android.view.ViewGroup.dispatchTransformedTouchEvent(ViewGroup.java:2184)
android.view.ViewGroup.dispatchTouchEvent(ViewGroup.java:1945)
android.view.ViewGroup.dispatchTransformedTouchEvent(ViewGroup.java:2186)
android.view.ViewGroup.dispatchTouchEvent(ViewGroup.java:1959)
android.view.ViewGroup.dispatchTransformedTouchEvent(ViewGroup.java:2186)
android.view.ViewGroup.dispatchTouchEvent(ViewGroup.java:1959)
android.view.ViewGroup.dispatchTransformedTouchEvent(ViewGroup.java:2186)
android.view.ViewGroup.cancelAndClearTouchTargets(ViewGroup.java:2049)
android.view.ViewGroup.dispatchDetachedFromWindow(ViewGroup.java:2567)
android.view.ViewRootImpl.dispatchDetachedFromWindow(ViewRootImpl.java:2836)
android.view.ViewRootImpl.doDie(ViewRootImpl.java:5259)
android.view.WindowManagerGlobal.addView(WindowManagerGlobal.java:233)
android.view.WindowManagerImpl.addView(WindowManagerImpl.java:69)
android.widget.MediaController.show(MediaController.java:346)

Duplicated views are consequently added to WindowManagerGlobal.mViews.
Subsequent calls to WindowManagerGlobal.removeView does not remove the
duplicated entry. Another subsequent call to WindowManagerGlobal.addView
detects the extra entry and fails.

Bug: 11399773
Change-Id: I1e07fcaf341fbae1b0f93bed0f42645801b9df2d
 2013-11-15 17:14:35 -08:00
Alan Viverette
20cc605b69 Fix header and footer dividers to match docs 
BUG: 11712110
Change-Id: I9c62f086b6957e124a392ff5f811427557518590
 2013-11-15 15:56:38 -08:00
Lajos Molnar
bd686a1e1d am 752926c7: am 1197bc37: am 7e11b16b: VideoView: expand documentation on state save/restore limitations 
* commit '752926c752b9516c05a36f3eed6ab6b77d32b2c6':
  VideoView: expand documentation on state save/restore limitations
 2013-11-13 18:48:09 -08:00
Lajos Molnar
1197bc37e5 am 7e11b16b: VideoView: expand documentation on state save/restore limitations 
* commit '7e11b16b9f8896170d492240a5fd50c8bd04105d':
  VideoView: expand documentation on state save/restore limitations
 2013-11-13 16:40:26 -08:00
Lajos Molnar
7e11b16b9f VideoView: expand documentation on state save/restore limitations 
Change-Id: I46f231d314fc4ae8d9d11389aa62a3e2698122ed
Signed-off-by: Lajos Molnar <lajos@google.com>
Bug: 11412889
 2013-11-13 16:27:30 -08:00
Jeff Brown
7117c0c184 am 40c81e4a: am 3105b6d2: am 12c32b4d: Merge "Make quick settings show the standard media router icon." into klp-dev 
* commit '40c81e4a5d96f8a3853045b289f6131c44d3155d':
  Make quick settings show the standard media router icon.
 2013-11-11 15:23:40 -08:00
Jeff Brown
3105b6d2f1 am 12c32b4d: Merge "Make quick settings show the standard media router icon." into klp-dev 
* commit '12c32b4d484cc7cc2278a76c6e0fc2304a74b593':
  Make quick settings show the standard media router icon.
 2013-11-10 22:02:20 -08:00
Jeff Brown
e2126baf72 Make quick settings show the standard media router icon. 
Fixed a bug in ImageView where we failed to inform a newly updated
Drawable about the visibility state.  This caused AnimationDrawables
to not animate when attached to an existing ImageView *unless* that
ImageView happened to be attached to the window *later* or have
its visibility toggled for some other reason.

Bug: 11257292
Change-Id: Iba9e0db5ba0db2b022950aec0c6f60a435da8ad2
 2013-11-09 18:59:46 -08:00
Newton Allen
badb59cd5d am 47feee53: Merge "Fix some documentation typos." into klp-docs 
* commit '47feee535f9e4e77165b93b6b9f10379e7aa4bbd':
  Fix some documentation typos.
 2013-11-07 05:19:12 +00:00
John Reck
339f901ba6 Cleanups 
Simplify DisplayList creation
 Remove unnecessary debug code

Change-Id: I310c9196485c6bf65a6793669bd2dc2b9a8a0a15
 2013-11-06 14:53:21 -08:00
Victoria Lease
8f86d3d28e am c403afb6: am 79007026: am 3dbea35f: Merge "use SpannedStringBuilder to build a SpannedString" into klp-dev 
* commit 'c403afb6421f0ab840303ac7f5a207067e976e77':
  use SpannedStringBuilder to build a SpannedString
 2013-11-04 21:59:42 -08:00
Victoria Lease
c403afb642 am 79007026: am 3dbea35f: Merge "use SpannedStringBuilder to build a SpannedString" into klp-dev 
* commit '79007026935acf84baba183aad0ef654d9ed91aa':
  use SpannedStringBuilder to build a SpannedString
 2013-11-04 21:54:02 -08:00
Newton Allen
04b7821496 am 47feee53: Merge "Fix some documentation typos." into klp-docs 
* commit '47feee535f9e4e77165b93b6b9f10379e7aa4bbd':
  Fix some documentation typos.
 2013-11-04 19:25:58 -08:00
Victoria Lease
3dbea35f7e Merge "use SpannedStringBuilder to build a SpannedString" into klp-dev 2013-11-04 16:23:15 +00:00
Marco Nelissen
88e82ed2fe Merge "Use audio focus instead of legacy music command" 2013-11-01 16:54:03 +00:00
Marco Nelissen
71068f6948 Use audio focus instead of legacy music command 
Bug 8612500

Change-Id: Id443b754d683b9f2d2010ee3a03e54590cda0b48
 2013-11-01 16:48:55 +00:00
Newton Allen
ff236f5fc1 Fix some documentation typos. 
Change-Id: I0360d468d54d970c87f313e24e50965245206f28
(cherry picked from commit c502744f2d)
 2013-11-01 02:38:01 +00:00
Newton Allen
52e3393afd Merge "Fix some documentation typos." 2013-11-01 02:37:22 +00:00
Svetoslav
2a7de4eb8d am c896147c: am 9eae380b: am a9f28eea: Merge "Temporary detached views not properly reported to accessibility layer." into klp-dev 
* commit 'c896147c96c020a923711b8a667baf2c881786c0':
  Temporary detached views not properly reported to accessibility layer.
 2013-10-31 17:55:20 -07:00
Svetoslav
d4bdd6befa Temporary detached views not properly reported to accessibility layer. 
A view may be temporary detached. While in this state the view
state may change for which we fire accessibility events. Clients
use them to know when the view changed and what the change is.
However, detached views do not fire accessibility events.
Hence, a client may hold a stale AccessibilityNodeInfo since
the changes to its source view happened in a temporary detached
state.

bug:11388752

Change-Id: I9052700ca9195841cc2881b65c17f5615e6f71fb
 2013-10-31 17:25:06 -07:00
Alan Viverette
2ea312c1bf Merge "Allow styling of fast scroll decorations, add default styles" 2013-10-31 23:16:56 +00:00
Alan Viverette
8636ace696 Allow styling of fast scroll decorations, add default styles 
Also fixes bad old-style thumb 9-patches.

BUG: 11030706
Change-Id: I51abba952acf87586449fbda329212b435d1d6df
 2013-10-31 15:41:31 -07:00