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

150213 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jorim Jaggi
ed713ee58d Use simpler layout for auto-redacted notifications 
Saves us some views.

Bug: 17346296
Change-Id: I024f566354db2b6b93d50fcfb15f8434a1c2976b
 2014-09-09 23:57:34 +02:00
Nicolas Prevot
f8a52c0667 Merge "Allowing a ContentProvider to have a null authority." into lmp-dev 2014-09-09 09:07:02 +00:00
Yohei Yukawa
699a49b9f1 Follow up API signature changes of CursorAnchorInfo part 2 
This is another follow up CL for Ic8c6fab58c01206872a34e7e.

Ib2371849d32bb44da9ef59f05e648a476e03699a didn't cover
following renamings.  This CL fixes them.

- #getCharacterRect -> #getCharacterBounds
- #getCharacterRectFlags -> #getCharacterBoundsFlags

BUG: 17365414
Change-Id: I120795da3f25f1e2fa71f455f92e3cd1c036c1d5
 2014-09-09 14:33:07 +09:00
Michael Wright
e04c75eb38 Merge "Use new device identifier to check if a layout has been set." into lmp-dev 2014-09-09 03:27:10 +00:00
Adam Powell
1893d9b3a9 Merge "New new design for ResolverActivity" into lmp-dev 2014-09-09 02:31:37 +00:00
Adam Powell
fd1e93d128 New new design for ResolverActivity 
Switch back to using a list as the grid and differently positioned
activity icons were confusing to users. Keep the distinct "last used"
presentation but align icons and titles with the further choices
below. Adjust this to make the fold more apparent. Remember
open/closed slider state across config changes.

Fix some bugs in nested scrolling and flinging.

Bug 17301272

Change-Id: I175937d5821df27b6ac7ffad7f01cd9a6ed3e3e3
 2014-09-08 19:25:37 -07:00
Michael Wright
86aaca6824 Use new device identifier to check if a layout has been set. 
Bug: 16486654
Change-Id: If55eacfc6878109b5bcb36ca338eb2cd75a40309
 2014-09-08 19:25:10 -07:00
Deepanshu Gupta
b86d5b57aa Merge "Build layoutlib create tests as part of sdk build." into lmp-dev 2014-09-09 02:07:36 +00:00
Eric Laurent
7c36c86342 Merge "unhide AudioAttributes flag FLAG_HW_AV_SYNC" into lmp-dev 2014-09-09 01:59:00 +00:00
Eric Laurent
56340fc2e8 unhide AudioAttributes flag FLAG_HW_AV_SYNC 
Bug: 17112525.
Change-Id: Ia817d8e4b6e517da04f948bcb138fc38faea6caf
 2014-09-08 18:51:35 -07:00
Deepanshu Gupta
8f92d92a09 Build layoutlib create tests as part of sdk build. 
LayoutLib Create tests are now built whenever LayoutLib create is built.

Change-Id: Id215e8690e435019579dba1734090a0d585f37e1
 2014-09-08 18:38:57 -07:00
Jean-Luc Brouillet
36f32f1b97 Merge "Fix rsMatrix documentation." into lmp-dev 2014-09-09 01:34:28 +00:00
Vinit Deshpande
592b95901e Merge "Implement getAvailableChannels" into lmp-dev 2014-09-09 01:28:45 +00:00
Jean-Luc Brouillet
8cf948404e Fix rsMatrix documentation. 
A previous CL changed the source file.  As the build system does not build
this doc file automatically, this CL updates it.

b/17310590

Change-Id: I9536237d0b2cc449f1cf4a35159588f91bcdcad1
 2014-09-08 18:27:43 -07:00
Andreas Gampe
f43f04ed6f Merge "Frameworks/base: Add native bridge post-fork initialization" into lmp-dev 2014-09-09 00:41:35 +00:00
Deepanshu Gupta
8d29a06ad7 Merge "Update IntelliJ project file for IntelliJ 14" into lmp-dev 2014-09-09 00:31:03 +00:00
Deepanshu Gupta
93b828de58 Merge "Add layoutlib tests to DIST_DIR" into lmp-dev 2014-09-09 00:30:24 +00:00
Deepanshu Gupta
fa4e214814 Merge "Remove warning for null entries in resource array." into lmp-dev 2014-09-09 00:30:08 +00:00
Dirk Dougherty
4a965545ae am d87e0484: am 604ae4c7: am 552e5ce6: Merge "Doc change: Add note to use explicit intent when binding to billing service." into klp-modular-docs 
* commit 'd87e04843ee6dfdba45f133cde423ba30be60e7a':
  Doc change: Add note to use explicit intent when binding to billing service.
 2014-09-09 00:12:32 +00:00
Michael Wright
b62bb77931 Merge "Add FEATURE_GAMEPAD to current.txt" into lmp-dev 2014-09-09 00:07:29 +00:00
Wink Saville
40e9f393df Merge "Change getCurrentPhoneType to SystemApi" into lmp-dev 2014-09-09 00:00:49 +00:00
Dirk Dougherty
d87e04843e am 604ae4c7: am 552e5ce6: Merge "Doc change: Add note to use explicit intent when binding to billing service." into klp-modular-docs 
* commit '604ae4c79e67be6be19724e03f35b9e6cc3fd617':
  Doc change: Add note to use explicit intent when binding to billing service.
 2014-09-08 23:59:34 +00:00
Michael Wright
3afd6e3fc6 Add FEATURE_GAMEPAD to current.txt 
Change-Id: I5c5a7910983ac3bc5850fba2dfc4d96b11fbd2f0
 2014-09-08 16:57:38 -07:00
Amit Mahajan
4009b98f73 Merge "Assisted dialing support of MO SMS" into lmp-dev 2014-09-08 23:56:31 +00:00
Dirk Dougherty
604ae4c79e am 552e5ce6: Merge "Doc change: Add note to use explicit intent when binding to billing service." into klp-modular-docs 
* commit '552e5ce6bb418b9a8b3b1ba9c102c562d0a4019e':
  Doc change: Add note to use explicit intent when binding to billing service.
 2014-09-08 23:53:32 +00:00
Amit Mahajan
8a4537ba23 Merge "change the property name about IDP from 'telephony.' to 'gsm.'" into lmp-dev 2014-09-08 23:52:36 +00:00
Wink Saville
96b3e61ff6 Change getCurrentPhoneType to SystemApi 
Bug: 17394367
Change-Id: I293faa26884e8d63a833e624e6c9a201c7652683
 2014-09-08 16:52:03 -07:00
Chris Craik
2286f819ac Merge "Don't track TextureLayer lifecycles in RenderState" into lmp-dev 2014-09-08 23:47:31 +00:00
Steven Liu
db960ad188 change the property name about IDP from 'telephony.' to 'gsm.' 
'telphony.' couldn't be set successfully.

Change-Id: I8a9ee29461bf764f2b269bb81fafe83d8d5e48d9
 2014-09-08 16:47:15 -07:00
Dirk Dougherty
552e5ce6bb Merge "Doc change: Add note to use explicit intent when binding to billing service." into klp-modular-docs 2014-09-08 23:46:56 +00:00
Chris Craik
8a226d24b8 Don't track TextureLayer lifecycles in RenderState 
bug:17208461

They are destroyed via finalizer-enqueued destroy method, so it's not
valid to check that they've been destroyed at gl context destruction
time.

Change-Id: I670f69825547facd5f31d44acb406418881fee00
 2014-09-08 16:44:47 -07:00
Sreeram Ramachandran
e7df34e01d Merge "Reserve NetIds 1..50 for OEM use." into lmp-dev 2014-09-08 23:28:48 +00:00
Michael Wright
f615926494 Merge "Map KEY_VOICECOMMAND to KEYCODE_VOICE_ASSIST" into lmp-dev 2014-09-08 23:22:28 +00:00
Michael Wright
8e3b4d41e3 Merge "Add FEATURE_GAMEPAD." into lmp-dev 2014-09-08 23:21:49 +00:00
Michael Wright
68f92691d0 Merge "Allow wake keys to wake dozing device." into lmp-dev 2014-09-08 23:14:13 +00:00
Michael Wright
58d90c18ec Merge "Remove unused variables from UsbHostManager." into lmp-dev 2014-09-08 23:13:43 +00:00
Michael Wright
6faa6759cd Add FEATURE_GAMEPAD. 
This allows micro-consoles or other devices to signify that there's a
game controller in the box, even if the user hasn't connected it.

Change-Id: Ie5e2cf69f777ebe84abb83f34c9ed63d9555deff
 2014-09-08 16:08:18 -07:00
Ihab Awad
9802f0d025 Merge "Enable (@hidden) video connection support for RemoteConnections" into lmp-dev 2014-09-08 23:05:46 +00:00
Robert Ly
73f41d9127 am 718803f5: am aa19f1fc: am b5a21ad3: Revert "Revert "NDKr10b changes to be published to DAC NDK page. Staged at: http://boku.mtv.corp.google.com:9190/tools/sdk/ndk/index.html"" 
* commit '718803f52e7311af2500c0e4ee9aacc2c43882e2':
  Revert "Revert "NDKr10b changes to be published to DAC NDK page. Staged at: http://boku.mtv.corp.google.com:9190/tools/sdk/ndk/index.html""
 2014-09-08 22:57:17 +00:00
Robert Ly
718803f52e am aa19f1fc: am b5a21ad3: Revert "Revert "NDKr10b changes to be published to DAC NDK page. Staged at: http://boku.mtv.corp.google.com:9190/tools/sdk/ndk/index.html"" 
* commit 'aa19f1fccb12eb141af92837aded0478006ab935':
  Revert "Revert "NDKr10b changes to be published to DAC NDK page. Staged at: http://boku.mtv.corp.google.com:9190/tools/sdk/ndk/index.html""
 2014-09-08 22:51:20 +00:00
David Friedman
cf0a6c1a5c am 7eabd92a: am 32079484: am 4186379a: Revert "NDKr10b changes to be published to DAC NDK page. Staged at: http://boku.mtv.corp.google.com:9190/tools/sdk/ndk/index.html" 
* commit '7eabd92a14d8804092ffdef8235ecfdae72abef9':
  Revert "NDKr10b changes to be published to DAC NDK page. Staged at: http://boku.mtv.corp.google.com:9190/tools/sdk/ndk/index.html"
 2014-09-08 22:50:16 +00:00
David Friedman
52fd418902 am a4c038a7: am 7e8786d9: am c6142d97: NDKr10b changes to be published to DAC NDK page. Staged at: http://boku.mtv.corp.google.com:9190/tools/sdk/ndk/index.html 
* commit 'a4c038a72ad28511f359667cb4ffab31fc0375b2':
  NDKr10b changes to be published to DAC NDK page. Staged at: http://boku.mtv.corp.google.com:9190/tools/sdk/ndk/index.html
 2014-09-08 22:49:58 +00:00
Robert Ly
aa19f1fccb am b5a21ad3: Revert "Revert "NDKr10b changes to be published to DAC NDK page. Staged at: http://boku.mtv.corp.google.com:9190/tools/sdk/ndk/index.html"" 
* commit 'b5a21ad3fba1d8d3b096a0d685d71c148fefa11b':
  Revert "Revert "NDKr10b changes to be published to DAC NDK page. Staged at: http://boku.mtv.corp.google.com:9190/tools/sdk/ndk/index.html""
 2014-09-08 22:43:42 +00:00
RoboErik
4f60f81b71 Merge "Possible fix for dead handler in Music button event sending" into lmp-dev 2014-09-08 22:35:32 +00:00
Robert Ly
b5a21ad3fb Revert "Revert "NDKr10b changes to be published to DAC NDK page. Staged at: http://boku.mtv.corp.google.com:9190/tools/sdk/ndk/index.html"" 
This reverts commit 4186379a2a37123d31ce5d1aff1facc8e7dfbfd3.

Change-Id: I34a7b8689362053c0ad8124eaa3f40a5c282bc80
 2014-09-08 22:30:09 +00:00
Michael Wright
f5e56d41a2 Remove unused variables from UsbHostManager. 
Change-Id: I68067b69de077667482633cc6ecd97ee94ecb699
 2014-09-08 15:27:42 -07:00
David Friedman
7eabd92a14 am 32079484: am 4186379a: Revert "NDKr10b changes to be published to DAC NDK page. Staged at: http://boku.mtv.corp.google.com:9190/tools/sdk/ndk/index.html" 
* commit '3207948444ed39b867c14cfc314b8caaf60fe571':
  Revert "NDKr10b changes to be published to DAC NDK page. Staged at: http://boku.mtv.corp.google.com:9190/tools/sdk/ndk/index.html"
 2014-09-08 22:26:59 +00:00
David Friedman
a4c038a72a am 7e8786d9: am c6142d97: NDKr10b changes to be published to DAC NDK page. Staged at: http://boku.mtv.corp.google.com:9190/tools/sdk/ndk/index.html 
* commit '7e8786d9755526a2d29c10c60759eb1c290afa38':
  NDKr10b changes to be published to DAC NDK page. Staged at: http://boku.mtv.corp.google.com:9190/tools/sdk/ndk/index.html
 2014-09-08 22:26:53 +00:00
Tsuwei Chen
ff4f6c8859 Merge "Manually merge QC's change for SUPL_ES." into lmp-dev 2014-09-08 22:15:32 +00:00
David Friedman
3207948444 am 4186379a: Revert "NDKr10b changes to be published to DAC NDK page. Staged at: http://boku.mtv.corp.google.com:9190/tools/sdk/ndk/index.html" 
* commit '4186379a2a37123d31ce5d1aff1facc8e7dfbfd3':
  Revert "NDKr10b changes to be published to DAC NDK page. Staged at: http://boku.mtv.corp.google.com:9190/tools/sdk/ndk/index.html"
 2014-09-08 22:13:09 +00:00