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

153012 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Vinit Deshpande
f0f4058c6a am f4b970e5: am 2705b859: Merge "Address API Council feedback for WifiAdapter/WPS APIs" into lmp-dev 
* commit 'f4b970e5fc0204334ff3990ccb47f6323fd68ee7':
  Address API Council feedback for WifiAdapter/WPS APIs
 2014-09-03 14:33:41 +00:00
RoboErik
edaf5a2681 am 42da57f1: am d4c2499c: Merge "Allow empty strings in playFromSearch" into lmp-dev 
* commit '42da57f19dc592bec35e6cc8e14b887fc4158f2f':
  Allow empty strings in playFromSearch
 2014-09-03 06:13:28 +00:00
Alan Viverette
9cca0b4a12 am 0fd03d91: am b975fe87: Merge "Fix accessibility events emitted from TwoStatePreference" into lmp-dev 
* commit '0fd03d91fe4ca61ce62844d59f8c3a3481a1b627':
  Fix accessibility events emitted from TwoStatePreference
 2014-09-03 06:13:24 +00:00
Alan Viverette
5919dcacf8 am a9bcd5c4: am e03c6d1f: Merge "Don\'t clip preference row icons to padding" into lmp-dev 
* commit 'a9bcd5c463a5655bcee075bc018d93ea26634749':
  Don't clip preference row icons to padding
 2014-09-03 06:13:19 +00:00
RoboErik
951ed1c866 am 720c772a: am d5ceabd3: Merge changes Id38bcf7c,I54f156d9 into lmp-dev 
* commit '720c772a481915540a189afc8ba243af5a817f0d':
  Update MediaController comment to mention notification listeners
  Don't play a sound when adjusting volume while telephony is active
 2014-09-03 06:13:11 +00:00
Adam Powell
0c0702da64 am 9f7a5fae: am 1b17f939: Merge "Automatically supply a content description for ToolbarActionBar nav" into lmp-dev 
* commit '9f7a5fae89057644244f0821f75954100ff6deaa':
  Automatically supply a content description for ToolbarActionBar nav
 2014-09-03 06:13:06 +00:00
Alan Viverette
a091ac01ea am b262321a: am abb29881: Merge "Make sure ripple background bounds are used for invalidation" into lmp-dev 
* commit 'b262321a13240445037a585f696d13063ab7ad05':
  Make sure ripple background bounds are used for invalidation
 2014-09-03 06:13:00 +00:00
Yohei Yukawa
ce8244ac71 am 449ee1aa: am 667b31d2: Merge "API Review: CursorAnchorInfo" into lmp-dev 
* commit '449ee1aa7aad49def82bff3c09754a0ad8bc3e2a':
  API Review: CursorAnchorInfo
 2014-09-03 06:12:56 +00:00
Jungshik Jang
b7f9490250 am 4a948322: am befc4c11: Merge "Make stream_music volume configurable." into lmp-dev 
* commit '4a948322563683671bb8b716e8606205cb0fa213':
  Make stream_music volume configurable.
 2014-09-03 05:50:01 +00:00
John Reck
89cff0fde7 am 1c33dc49: am efb75031: Merge "Implement TODO" into lmp-dev 
* commit '1c33dc49d8ab4ecac90794090bba191e42bd6c04':
  Implement TODO
 2014-09-03 05:49:53 +00:00
Dianne Hackborn
6bffbe8618 am 7f68e1ae: am a7260b84: Merge "And yet more logging for slow execution." into lmp-dev 
* commit '7f68e1ae893822b70c2a820dee0b55decaea7c37':
  And yet more logging for slow execution.
 2014-09-03 05:49:31 +00:00
Lorenzo Colitti
b448f7a6ef am a04d244b: am 910113a9: Merge "Use per-Network connection pools for openConnection." into lmp-dev 
* commit 'a04d244bf06dbd5845e5129275c30f631b1d0013':
  Use per-Network connection pools for openConnection.
 2014-09-03 05:49:27 +00:00
Lorenzo Colitti
e7cd2f5515 am 4c172753: am 2c0a5509: Merge "Pass the socket mark for DNS queries to dnsmasq." into lmp-dev 
* commit '4c172753f892557175ecb4c3cf4ed6fd76227049':
  Pass the socket mark for DNS queries to dnsmasq.
 2014-09-03 05:49:22 +00:00
Michael Wright
ec217952da am 57eda61b: am 0d35de74: am 144c21c2: (-s ours) am da3b4363: DO NOT MERGE: Use a linear spline if there\'s a non-monotonic brightness curve 
* commit '57eda61b89d35a6b9a31f0e56a9bed138ec99de9':
  DO NOT MERGE: Use a linear spline if there's a non-monotonic brightness curve
 2014-09-03 05:49:10 +00:00
Alan Viverette
1834ecdef4 am 69a2f2b6: am 489e207d: Merge "Update pointer hotspots to scale for DPI" into lmp-dev 
* commit '69a2f2b6059dc87cbee142d1f710d92521ef4389':
  Update pointer hotspots to scale for DPI
 2014-09-03 05:49:05 +00:00
Dianne Hackborn
c7535364b6 am 1f9c4f45: am 8070053f: Merge "Add public constant for usage stats app op." into lmp-dev 
* commit '1f9c4f452d976ad54538ef4ff6484d354ba18212':
  Add public constant for usage stats app op.
 2014-09-03 05:48:53 +00:00
Raph Levien
82ea4ee7f4 am 83f28d57: am 2e97ac0c: Merge "Ensure layout in getExtendedPadding calls" into lmp-dev 
* commit '83f28d5710b9ffca5ab8876e12458a515e694645':
  Ensure layout in getExtendedPadding calls
 2014-09-03 05:48:48 +00:00
Craig Mautner
55ec668ec3 am 183de81a: am 2d94c706: Merge "Account for scaling effects when cropping" into lmp-dev 
* commit '183de81a6cf0c4e45f1fb576cd0da06636ea8336':
  Account for scaling effects when cropping
 2014-09-03 05:48:43 +00:00
Svet Ganov
2f405f1f4e am 87ca3b16: am 668b4765: Merge "Move print rendering in an isolated process." into lmp-dev 
* commit '87ca3b16be5933eb2cd5fdd250389d233ec924bc':
  Move print rendering in an isolated process.
 2014-09-03 05:48:36 +00:00
Adrian Roos
52a76bdcbf am 42bbbeb2: am be31021b: Merge "Disable touch dispatch while adjusting brightness" into lmp-dev 
* commit '42bbbeb2d9e85bc67235e6006cc1f1c7a27ac9b8':
  Disable touch dispatch while adjusting brightness
 2014-09-03 05:48:30 +00:00
Shri Borde
55100d0ad7 am be2ea906: am fb909790: Merge "Bug 17243357: Remove MessagingConfigurationManager" into lmp-dev 
* commit 'be2ea906d9ccb51bb9c188e868ae0297c1f25923':
  Bug 17243357: Remove MessagingConfigurationManager
 2014-09-03 05:48:25 +00:00
Adrian Roos
696e958de5 am 0e15297c: am c51688f7: Merge "Don\'t drop up or cancel touch events" into lmp-dev 
* commit '0e15297c65ee29c4f257e0a7a87f64592c3d01fd':
  Don't drop up or cancel touch events
 2014-09-03 05:07:36 +00:00
Vinit Deshpande
c400ae685f am 2705b859: Merge "Address API Council feedback for WifiAdapter/WPS APIs" into lmp-dev 
* commit '2705b859f86b9fdac374a55d24bcb47695b53e94':
  Address API Council feedback for WifiAdapter/WPS APIs
 2014-09-03 01:13:22 +00:00
Vinit Deshpande
565f847038 Merge "Address API Council feedback for WifiAdapter/WPS APIs" into lmp-dev 2014-09-03 00:59:28 +00:00
RoboErik
6225074d7c am d4c2499c: Merge "Allow empty strings in playFromSearch" into lmp-dev 
* commit 'd4c2499c4154b89e60f09947378e96d513a30a28':
  Allow empty strings in playFromSearch
 2014-09-03 00:49:59 +00:00
Alan Viverette
33ca60d4be am b975fe87: Merge "Fix accessibility events emitted from TwoStatePreference" into lmp-dev 
* commit 'b975fe8793329ad3543b4d2462bf42db524ed161':
  Fix accessibility events emitted from TwoStatePreference
 2014-09-03 00:49:55 +00:00
Alan Viverette
c340b23b48 am e03c6d1f: Merge "Don\'t clip preference row icons to padding" into lmp-dev 
* commit 'e03c6d1f32c3a45a83e4042dd70b73116e0d5301':
  Don't clip preference row icons to padding
 2014-09-03 00:49:49 +00:00
RoboErik
2bd7c2c569 am d5ceabd3: Merge changes Id38bcf7c,I54f156d9 into lmp-dev 
* commit 'd5ceabd316bcd668f2b35f351f91ca8f242b32a6':
  Update MediaController comment to mention notification listeners
  Don't play a sound when adjusting volume while telephony is active
 2014-09-03 00:49:45 +00:00
Adam Powell
d62874d8da am 1b17f939: Merge "Automatically supply a content description for ToolbarActionBar nav" into lmp-dev 
* commit '1b17f9390020b2801c9b4bea0a5ada5fe7bc37df':
  Automatically supply a content description for ToolbarActionBar nav
 2014-09-03 00:49:38 +00:00
Alan Viverette
e1ccc5f747 am abb29881: Merge "Make sure ripple background bounds are used for invalidation" into lmp-dev 
* commit 'abb29881685c46a1dc0b068dfad3450a4b18fdbb':
  Make sure ripple background bounds are used for invalidation
 2014-09-03 00:49:33 +00:00
Yohei Yukawa
f6ac8eb82d am 667b31d2: Merge "API Review: CursorAnchorInfo" into lmp-dev 
* commit '667b31d200c5a919909a7c8d677033607d7d33cb':
  API Review: CursorAnchorInfo
 2014-09-03 00:49:28 +00:00
RoboErik
bcd20f850c Merge "Allow empty strings in playFromSearch" into lmp-dev 2014-09-03 00:40:21 +00:00
RoboErik
4b253d2bcd Allow empty strings in playFromSearch 
This allows empty strings to be passed to playFromSearch to indicate
something should be chosen for the user and played. This makes it
consistent with INTENT_ACTION_MEDIA_PLAY_FROM_SEARCH.

bug:17316566
Change-Id: I00ce8d252efa940e05568629e35198450c224a92
 2014-09-02 17:39:46 -07:00
Alan Viverette
f6f7b0c569 Merge "Fix accessibility events emitted from TwoStatePreference" into lmp-dev 2014-09-03 00:38:59 +00:00
Alan Viverette
a83a6d9d12 Merge "Don't clip preference row icons to padding" into lmp-dev 2014-09-03 00:30:14 +00:00
RoboErik
42f0a36ece Merge changes Id38bcf7c,I54f156d9 into lmp-dev 
* changes:
  Update MediaController comment to mention notification listeners
  Don't play a sound when adjusting volume while telephony is active
 2014-09-03 00:26:10 +00:00
RoboErik
f2133474af Update MediaController comment to mention notification listeners 
Forgot to update the comment to specify that notification listeners
may also get a MediaController from the manager.

Change-Id: Id38bcf7cb38185bfe4f99bcf8889a6415320dd36
 2014-09-02 17:22:08 -07:00
RoboErik
7a18cb5672 Don't play a sound when adjusting volume while telephony is active 
bug:17106215
Change-Id: I54f156d91440ce777e5a4d473cdd47927479d084
 2014-09-02 17:22:08 -07:00
Adam Powell
d400ca2f8d Merge "Automatically supply a content description for ToolbarActionBar nav" into lmp-dev 2014-09-03 00:11:00 +00:00
Alan Viverette
36bdc9fe9a Merge "Make sure ripple background bounds are used for invalidation" into lmp-dev 2014-09-02 23:56:15 +00:00
Yohei Yukawa
d780ce1920 Merge "API Review: CursorAnchorInfo" into lmp-dev 2014-09-02 23:45:36 +00:00
Alan Viverette
996a63859f Fix accessibility events emitted from TwoStatePreference 
Removes redundant and conflicting events emitted from check and switch
preferences. Sends VIEW_CLICKED accessibility events from AdapterView
rows after calling their on click listeners, which ensures data is
consistent.

BUG: 16961152
Change-Id: I4b57bceec6830d775c2da57226b8ee482242caf7
 2014-09-02 16:35:45 -07:00
Jungshik Jang
b68cd98e50 am befc4c11: Merge "Make stream_music volume configurable." into lmp-dev 
* commit 'befc4c112e83bbec47f1755a4900473d2af8c856':
  Make stream_music volume configurable.
 2014-09-02 23:29:38 +00:00
Jungshik Jang
e8f8bc0ad6 Merge "Make stream_music volume configurable." into lmp-dev 2014-09-02 23:20:32 +00:00
Adam Powell
12b0321c0b Automatically supply a content description for ToolbarActionBar nav 
If the developer hasn't set a navigation content description on the
Toolbar assigned to be an action bar or a home-action content
description via the ActionBar interface, use the framework default
"navigate up" string.

Also make sure that the default Up description is supplied in the
screen_toolbar window decor layout and that it is parsed properly in
all toolbars, even if we don't have an icon set during construction.

Bug 17298370

Change-Id: Ie2f9e34f92046d4d4ffb9a07e38fa89581891f7b
 2014-09-02 16:20:08 -07:00
John Reck
84b8d1ae8e am efb75031: Merge "Implement TODO" into lmp-dev 
* commit 'efb75031e7eac8ee84ca6202dcddd39149d78980':
  Implement TODO
 2014-09-02 23:09:59 +00:00
John Reck
3d3f5f8c68 Merge "Implement TODO" into lmp-dev 2014-09-02 22:58:51 +00:00
Dianne Hackborn
7e40b9519b am a7260b84: Merge "And yet more logging for slow execution." into lmp-dev 
* commit 'a7260b847f4bf285d7e56b6728f867845f2fc788':
  And yet more logging for slow execution.
 2014-09-02 22:57:27 +00:00
Lorenzo Colitti
7498871821 am 910113a9: Merge "Use per-Network connection pools for openConnection." into lmp-dev 
* commit '910113a91cc62b5840f107f9b41e4a6445d2a155':
  Use per-Network connection pools for openConnection.
 2014-09-02 22:53:03 +00:00
Lorenzo Colitti
91396a3577 am 2c0a5509: Merge "Pass the socket mark for DNS queries to dnsmasq." into lmp-dev 
* commit '2c0a5509a7d74c013e63b7056679394811b5e984':
  Pass the socket mark for DNS queries to dnsmasq.
 2014-09-02 22:52:58 +00:00