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

154830 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tom O'Neill
1db0cce028 Merge "Fix a race where NLP consent dialog can be shown unnecessarily" into lmp-mr1-dev 2014-10-10 15:26:30 +00:00
Svetoslav
e78aa53123 am 9ab1b1bb: am c43caf52: Merge "Fix child view ordering for accessibility." into lmp-dev 
* commit '9ab1b1bbe62aa0424214bb5bbcfd707cb8ac8199':
  Fix child view ordering for accessibility.
 2014-10-10 00:32:15 +00:00
Selim Cinek
bedae0dbf1 am 3e056aa0: am f9df9dd8: Merge "Fixed an issue where the notification could become transparent" into lmp-dev 
* commit '3e056aa0e09003679c2b96f6d5c966d299d8b70a':
  Fixed an issue where the notification could become transparent
 2014-10-10 00:31:59 +00:00
Christopher Tate
df9cab2f12 am ad716e42: am 2aa1d18e: Fix bug 17931760 - spurious timeout leads to mayhem 
* commit 'ad716e42e89cc5fe92c3ff86ec2714c416d522aa':
  Fix bug 17931760 - spurious timeout leads to mayhem
 2014-10-10 00:31:53 +00:00
Christoph Studer
a6a6f4b218 am a2830b7d: am 2c2cb29a: Merge "WallpaperCropper: Use white color for action bar" into lmp-dev 
* commit 'a2830b7da7bb27976bd497245e6e1fa4d8a428e9':
  WallpaperCropper: Use white color for action bar
 2014-10-10 00:31:31 +00:00
Justin Koh
d853a90026 am 1840bfee: Merge "Make GlobalKeyManager broadcasts send as foreground" into lmp-sprout-dev 
* commit '1840bfee70ac85026072222cabe77709d849d7c7':
  Make GlobalKeyManager broadcasts send as foreground
 2014-10-10 00:31:24 +00:00
Adam Lesinski
be003a3570 am f23e3ea6: am aeef612f: Merge "Search all packages for a given type string when looking up resources by name" into lmp-dev 
* commit 'f23e3ea629f29060f34ea10a0d89c6ec22766789':
  Search all packages for a given type string when looking up resources by name
 2014-10-10 00:30:39 +00:00
Dianne Hackborn
d190a5ca4c am 0e259ce2: am 6166a824: Merge "Implement issue #17906468: Allow search request to fall back to global search" into lmp-dev 
* commit '0e259ce2d7ed09c58993da5c5b63966e8f467c82':
  Implement issue #17906468: Allow search request to fall back to global search
 2014-10-10 00:30:33 +00:00
Jorim Jaggi
e10e0dbc86 am fc779ccf: am 01f1c5c8: Merge "Fix content description for bluetooth icon" into lmp-dev 
* commit 'fc779ccf865df605310a2da309a3d694b4c0e613':
  Fix content description for bluetooth icon
 2014-10-10 00:30:28 +00:00
Joe Fernandez
daf00ceb3b am 487e15b9: am 401418d5: Merge "Revert "Removed preview license."" into lmp-dev 
* commit '487e15b90140b0a1f343c61eb0ea658db3caa1b7':
  Revert "Removed preview license."
 2014-10-10 00:30:23 +00:00
Sandeep Siddhartha
dbc9aa2c7c am eecf74bc: am ed65c63b: Merge "Add tests for model management [SDK Only]" into lmp-dev 
* commit 'eecf74bcf7746c20f4b8cf69448e4b292357026d':
  Add tests for model management [SDK Only]
 2014-10-10 00:30:18 +00:00
Etan Cohen
c3f8a8b1ec am 4354e604: am 5e5bc4b1: TD_SCDMA is more like GSM than CDMA - re-classifying. 
* commit '4354e6046e4a35b2f35348c6c131fdd600ac26af':
  TD_SCDMA is more like GSM than CDMA - re-classifying.
 2014-10-10 00:30:14 +00:00
Svetoslav
9ab1b1bbe6 am c43caf52: Merge "Fix child view ordering for accessibility." into lmp-dev 
* commit 'c43caf52a61e56d5ed78f947fc8c299ad5273abf':
  Fix child view ordering for accessibility.
 2014-10-10 00:10:38 +00:00
Svetoslav
c43caf52a6 Merge "Fix child view ordering for accessibility." into lmp-dev 2014-10-10 00:03:54 +00:00
Svetoslav
88e447b576 Fix child view ordering for accessibility. 
When reporting views to accessibility services we are ordering the
children in a parent based on their location on the screen. The
initial implementation worked pretty well in practive but violated
the transitivity property leading to rare crashes in apps. The current
implementation does not violate transitivity but does not produce
good ordering.

Given the lack of time and to minumize risk this change uses the
old strategy which works most of the time and if that fails we
fall back to the current strategy. Coming up with a correct strategy
that produces good results requires more time.

bug:17887986

Change-Id: I1c233ecdf318befc315e793696ac48bd6c652ab6
 2014-10-09 16:40:47 -07:00
Selim Cinek
3e056aa0e0 am f9df9dd8: Merge "Fixed an issue where the notification could become transparent" into lmp-dev 
* commit 'f9df9dd845ba1d1b14b450bd9df654243921381f':
  Fixed an issue where the notification could become transparent
 2014-10-09 23:06:32 +00:00
Christopher Tate
ad716e42e8 am 2aa1d18e: Fix bug 17931760 - spurious timeout leads to mayhem 
* commit '2aa1d18e3acd269ed7a5f5a4843d447735f0676c':
  Fix bug 17931760 - spurious timeout leads to mayhem
 2014-10-09 23:06:27 +00:00
Selim Cinek
f9df9dd845 Merge "Fixed an issue where the notification could become transparent" into lmp-dev 2014-10-09 23:05:04 +00:00
Selim Cinek
59d9723dd7 Fixed an issue where the notification could become transparent 
Bug: 17668881
Change-Id: If8389084c7696bb8d3c0155f1262ec1fe7973c44
 2014-10-09 15:54:40 -07:00
Christopher Tate
2aa1d18e3a Fix bug 17931760 - spurious timeout leads to mayhem 
We know a priori that the PMBA metadata package's backup pass
doesn't need to be tracked for timeout, because it's run inline
rather than as an asynchronous separate-process operation.

Change-Id: Ifd21ab3a016917f5e557a38c1c88f8d8ac1337d2
 2014-10-09 15:20:24 -07:00
Jorim Jaggi
51650235c1 Merge "Apply color to progress bar for notifications" into lmp-mr1-dev 2014-10-09 22:01:56 +00:00
Christoph Studer
a2830b7da7 am 2c2cb29a: Merge "WallpaperCropper: Use white color for action bar" into lmp-dev 
* commit '2c2cb29a3d7f0a90d753b0fa9c32c1fc5cdbff32':
  WallpaperCropper: Use white color for action bar
 2014-10-09 21:01:07 +00:00
Christoph Studer
2c2cb29a3d Merge "WallpaperCropper: Use white color for action bar" into lmp-dev 2014-10-09 20:56:45 +00:00
Christoph Studer
9e8482062d WallpaperCropper: Use white color for action bar 
Bug: 17343815
Change-Id: I5802f04204d081b97fbc2e2cb203fa03f16fea6a
 2014-10-09 13:50:21 -07:00
Justin Koh
1840bfee70 Merge "Make GlobalKeyManager broadcasts send as foreground" into lmp-sprout-dev 2014-10-09 20:49:03 +00:00
Justin Koh
b0b823f71b Make GlobalKeyManager broadcasts send as foreground 
Should prioritize these since they are due to user interaction.

Change-Id: If36d5502dbd53de6102b05fd54caed56e22685da
 2014-10-09 13:33:19 -07:00
Elliott Hughes
011c96b556 Merge "Remove some unused %% strings from frameworks/base." into lmp-mr1-dev 2014-10-09 20:31:40 +00:00
Elliott Hughes
7d32838d78 Merge "Track change to private libcore data structure." into lmp-mr1-dev 2014-10-09 20:15:52 +00:00
Adam Powell
7cb761fe8c Merge "Document that MarginLayoutParams margins should be positive." into lmp-mr1-dev 2014-10-09 20:08:41 +00:00
Adam Powell
19a9e6c23b Merge "Throw a more descriptive exception when adding null to a ViewGroup" into lmp-mr1-dev 2014-10-09 19:57:00 +00:00
Adam Powell
a7a735fb2a Document that MarginLayoutParams margins should be positive. 
Negative margins can cause all sorts of other problematic assumptions,
subtle errors and unexpected behavior. While they technically work
developers should steer clear of them.

Change-Id: Ia1f7d9a33e25444ebdc3c32679ae1179210558e1
 2014-10-09 12:54:52 -07:00
Adam Lesinski
f23e3ea629 am aeef612f: Merge "Search all packages for a given type string when looking up resources by name" into lmp-dev 
* commit 'aeef612f200b6b5cee214230271e1c3d718151ee':
  Search all packages for a given type string when looking up resources by name
 2014-10-09 19:30:31 +00:00
Dianne Hackborn
0e259ce2d7 am 6166a824: Merge "Implement issue #17906468: Allow search request to fall back to global search" into lmp-dev 
* commit '6166a824b2ea7b7918f54769005ab691e15f77f7':
  Implement issue #17906468: Allow search request to fall back to global search
 2014-10-09 19:30:26 +00:00
Jorim Jaggi
fc779ccf86 am 01f1c5c8: Merge "Fix content description for bluetooth icon" into lmp-dev 
* commit '01f1c5c85476b7eee3155ac1a1f6b570582ecd6c':
  Fix content description for bluetooth icon
 2014-10-09 19:30:16 +00:00
Joe Fernandez
487e15b901 am 401418d5: Merge "Revert "Removed preview license."" into lmp-dev 
* commit '401418d53b699e6cde53e45fba066c933868b6c1':
  Revert "Removed preview license."
 2014-10-09 19:30:00 +00:00
Sandeep Siddhartha
eecf74bcf7 am ed65c63b: Merge "Add tests for model management [SDK Only]" into lmp-dev 
* commit 'ed65c63bdc4a4413da5195f7e5fa392ce72f6135':
  Add tests for model management [SDK Only]
 2014-10-09 19:29:55 +00:00
Etan Cohen
4354e6046e am 5e5bc4b1: TD_SCDMA is more like GSM than CDMA - re-classifying. 
* commit '5e5bc4b13cd1fc657da940c14e2333d8d3b18080':
  TD_SCDMA is more like GSM than CDMA - re-classifying.
 2014-10-09 19:29:43 +00:00
Robin Lee
499a36294b am 4a718f2a: am a300025d: Merge "DevicePolicy: One cert tracker warning per profile" into lmp-dev 
* commit '4a718f2af33159e58f4ad639d9d0e633a6ca8a8f':
  DevicePolicy: One cert tracker warning per profile
 2014-10-09 19:17:39 +00:00
Joe Fernandez
b455eb7b32 am 5b349c4c: am e2f757d9: am a63f81ec: am e15773be: Merge "docs: Android TV publishing requirements" into klp-modular-docs 
* commit '5b349c4ce9be68efe3b6d0bc09a3cfa22d837f25':
  docs: Android TV publishing requirements
 2014-10-09 19:17:34 +00:00
Chong Zhang
d4410a19bc am d25b996a: am a6ae8ba4: MediaHTTPConnection: do not use proxy for localhost 
* commit 'd25b996a7ab2589f258d0006dda6589f53d98366':
  MediaHTTPConnection: do not use proxy for localhost
 2014-10-09 19:17:29 +00:00
Christopher Tate
97cb995e99 am f857b272: am 2e0f6682: Merge "Also monitor MOVED_TO events for wallpaper updates" into lmp-dev 
* commit 'f857b272c27ca6836b5cec51a9f3714603aa2ad0':
  Also monitor MOVED_TO events for wallpaper updates
 2014-10-09 19:17:23 +00:00
Fred Fettinger
1114b3b8d7 am 708206c3: am 6c858c25: am b4093c12: (-s ours) hwui: Caches: use mBoundTextures only for GL_TEXTURE_2D - DO NOT MERGE 
* commit '708206c35ed8da1e0c3f0624a9221ecb84d3504f':
  hwui: Caches: use mBoundTextures only for GL_TEXTURE_2D - DO NOT MERGE
 2014-10-09 19:17:18 +00:00
mike dooley
6e24a156cd am 3175824a: am 879142bf: Fix hangouts conference calling regression. 
* commit '3175824a783c5d45df91ccf84fab8304f4d353c4':
  Fix hangouts conference calling regression.
 2014-10-09 19:17:14 +00:00
Tim Kilbourn
bb76d5cd88 am 5d7f58be: am 37bd0776: Merge "Don\'t start SearchDialog on television." into lmp-dev 
* commit '5d7f58be2c034823d6e5cfab847ad50b2a463dfc':
  Don't start SearchDialog on television.
 2014-10-09 19:17:10 +00:00
Jeff Brown
8aa2e3f168 am ab46eda8: am 704998ab: Merge "Ensure we correctly unblank displays when added." into lmp-dev 
* commit 'ab46eda872b4c9a4e16c57c00e5c85bb1f7143ce':
  Ensure we correctly unblank displays when added.
 2014-10-09 19:17:05 +00:00
smain@google.com
8aa0e54703 am 8433b63c: am b880707c: am 63cd4977: am 770c3c5e: fix unclickable link due to overlay from offset dev below 
* commit '8433b63c0248b4c2650ee3d8db77aaba4748ae47':
  fix unclickable link due to overlay from offset dev below
 2014-10-09 19:17:01 +00:00
smain@google.com
fc696fb6f3 am 3ae2a715: am 9f928944: Merge "update droiddoc option to include api level 21 for javadoc tagging" into lmp-dev 
* commit '3ae2a71539aeef868ec6b6c5b755a2b3f0c1b4e0':
  update droiddoc option to include api level 21 for javadoc tagging
 2014-10-09 19:16:55 +00:00
Christopher Tate
c09f6e6906 am b03b6a6c: am 6dea8de7: Merge "Actually tell the widget service that restore is starting" into lmp-dev 
* commit 'b03b6a6c5a88e4c55d936ec028dd55a699ae787f':
  Actually tell the widget service that restore is starting
 2014-10-09 19:16:50 +00:00
Robin Lee
4a718f2af3 am a300025d: Merge "DevicePolicy: One cert tracker warning per profile" into lmp-dev 
* commit 'a300025d23fac899c2294a8281b12b52d4e830b6':
  DevicePolicy: One cert tracker warning per profile
 2014-10-09 19:11:29 +00:00
Joe Fernandez
5b349c4ce9 am e2f757d9: am a63f81ec: am e15773be: Merge "docs: Android TV publishing requirements" into klp-modular-docs 
* commit 'e2f757d9f3341b66d75d335cd9dd29848a4b8969':
  docs: Android TV publishing requirements
 2014-10-09 19:11:22 +00:00