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

151160 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Christoph Studer
fe5fe6431b am 342ece75: Merge "NoMan: Drop archive size to 100, strip EXTRA_BIG_TEXT" into lmp-dev 
* commit '342ece751b683d4532e273f196f4f99dfc569067':
  NoMan: Drop archive size to 100, strip EXTRA_BIG_TEXT
 2014-09-03 12:37:52 +00:00
Christoph Studer
1097b15569 Merge "NoMan: Drop archive size to 100, strip EXTRA_BIG_TEXT" into lmp-dev 2014-09-03 12:28:29 +00:00
Sander Alewijnse
7628d171f5 am 727738ad: Merge "Add the provisioning extra admin extras bundle." into lmp-dev 
* commit '727738ada473ae5e905a1c3c38f136b2669f6b5e':
  Add the provisioning extra admin extras bundle.
 2014-09-03 11:55:01 +00:00
Sander Alewijnse
52c0f04cbc Merge "Add the provisioning extra admin extras bundle." into lmp-dev 2014-09-03 11:43:42 +00:00
Sander Alewijnse
90f14bf53e Add the provisioning extra admin extras bundle. 
Enables the MDM app running (as a regular app) in the primary user to pass
through a bundle of data with which to bootstrap the instance of itself
running as profile owner in the managed profile.

Bug:17126717
Change-Id: I28a368d13e33990b16dcd68436902e0a077d5f5d
 2014-09-03 12:26:08 +01:00
Yohei Yukawa
5cde200201 am ebb6b422: Merge "API Review: InputConnection" into lmp-dev 
* commit 'ebb6b4224ee02b2ef7ae5d58c9e7cdf3ab16b090':
  API Review: InputConnection
 2014-09-03 09:50:10 +00:00
Yohei Yukawa
851377f90c Merge "API Review: InputConnection" into lmp-dev 2014-09-03 09:41:48 +00:00
Lorenzo Colitti
dd2f20ef0b am 1ae4e750: Merge "Kill the NetworkInfo(int type) constructor. IT\'S A TRAP!" into lmp-dev 
* commit '1ae4e750dd822edda13ee68c827f977b6e533fc5':
  Kill the NetworkInfo(int type) constructor. IT'S A TRAP!
 2014-09-03 06:36:49 +00:00
Lorenzo Colitti
e21b564168 Merge "Kill the NetworkInfo(int type) constructor. IT'S A TRAP!" into lmp-dev 2014-09-03 06:27:12 +00:00
Yohei Yukawa
d8636ea7ca API Review: InputConnection 
This CL does nothing but rename some L API candidates
in InputConnection class, as per requested.

- requestUpdateCursorAnchorInfo()
  -> requestCursorUpdates()
- REQUEST_UPDATE_CURSOR_ANCHOR_INFO_IMMEDIATE
  -> CURSOR_UPDATE_IMMEDIATE
- REQUEST_UPDATE_CURSOR_ANCHOR_INFO_MONITOR
  -> CURSOR_UPDATE_MONITOR

BUG: 17320996
Change-Id: I772c48ff18918e48a81e807b48ff907614485c09
 2014-09-02 22:39:08 -07:00
Svetoslav
7d19901055 am 551335a3: Merge "Fix AccessibilityNode\'s isVisibleToUser behavior." into lmp-dev 
* commit '551335a38d0214e739571193369d6e476d9ff75b':
  Fix AccessibilityNode's isVisibleToUser behavior.
 2014-09-03 03:23:07 +00:00
Svetoslav
f0e57e10ed Merge "Fix AccessibilityNode's isVisibleToUser behavior." into lmp-dev 2014-09-03 03:14:12 +00:00
Dianne Hackborn
2ca2f38f0a am d136d986: Add more slow execution logs. 
* commit 'd136d98634dc67c7caee4c96695acb47dd298710':
  Add more slow execution logs.
 2014-09-03 01:23:24 +00:00
Dianne Hackborn
f96a2854f2 am 8b88d87e: Merge "Revert "And yet more logging for slow execution."" into lmp-dev 
* commit '8b88d87eb707268fee63ccd5c33816e57cb5c952':
  Revert "And yet more logging for slow execution."
 2014-09-03 01:23:19 +00:00
Dianne Hackborn
a42c0de977 Add more slow execution logs. 
This time *without* mixing in an bunch of unintentional reverts!

Change-Id: Iab4cb9eb6d475d9fe5ebe16e9ea4be24c6f312e8
 2014-09-03 01:18:54 +00:00
Alan Viverette
aa9f10c305 am 37e5b8e4: Merge "Use null instead of transparent for Material alert dialog sections" into lmp-dev 
* commit '37e5b8e458ae00db23799a8963fd075ddb105dd8':
  Use null instead of transparent for Material alert dialog sections
 2014-09-03 01:13:28 +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
Dianne Hackborn
39a59eb1af Merge "Revert "And yet more logging for slow execution."" into lmp-dev 2014-09-03 01:09:39 +00:00
Dianne Hackborn
1257e82b94 Revert "And yet more logging for slow execution." 
This reverts commit 113390ac113083884b6f498424b3f6afa2df4ebc.

Change-Id: I16fdb08f83ad31c10d943862bae639f622542339
 2014-09-03 01:09:21 +00:00
Alan Viverette
660ad761c3 Merge "Use null instead of transparent for Material alert dialog sections" into lmp-dev 2014-09-03 01:02:18 +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
Svetoslav
9ae9ed24aa Fix AccessibilityNode's isVisibleToUser behavior. 
The isVisibleToUser property of an AccessibilityNodeInfo specifies
whether the user can see the source view. It is used by accessibility
services to figure out whether to focus on a view. This property
was giving a wrong value if the view is covered by another window
such as the keyboard. As a result the user hears one thing but when
double taps interacts with the overlaid window which is another thing.

bug:15938254

Change-Id: Ib9feb20ea422a24a512c47ed1234961ae0386a7f
 2014-09-02 16:46:23 -07: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
Dianne Hackborn
526b642290 Merge "And yet more logging for slow execution." into lmp-dev 2014-09-02 22:49:38 +00:00
Alan Viverette
416387763c Don't clip preference row icons to padding 
Need negative margins to align the 48dp icons correctly with Material
layout guidelines and still respect listPreferredItemPaddingStart.

BUG: 17316340
Change-Id: I2d3baa4cd2857fb73a65eba3447de33d7319b6df
 2014-09-02 15:46:18 -07:00