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

153047 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jorim Jaggi
4eba7aa211 am f44e6d17: am 947de838: Merge "Status bar iconography updates" into lmp-dev 
* commit 'f44e6d1768b7aa2f173658f8979c35870d256621':
  Status bar iconography updates
 2014-09-03 14:56:45 +00:00
Christoph Studer
8f4b3a9119 am 5df1917f: am 342ece75: Merge "NoMan: Drop archive size to 100, strip EXTRA_BIG_TEXT" into lmp-dev 
* commit '5df1917f8349b842812a5af430862d167a5b0ed6':
  NoMan: Drop archive size to 100, strip EXTRA_BIG_TEXT
 2014-09-03 14:56:39 +00:00
Sander Alewijnse
75dd22c135 am a0e6069c: am 727738ad: Merge "Add the provisioning extra admin extras bundle." into lmp-dev 
* commit 'a0e6069c54b3e505199df50108bf0a38bee17170':
  Add the provisioning extra admin extras bundle.
 2014-09-03 14:35:45 +00:00
Yohei Yukawa
8bb3b4331c am d88a1f97: am ebb6b422: Merge "API Review: InputConnection" into lmp-dev 
* commit 'd88a1f9790bfaaa6540f65d76827274d716a2539':
  API Review: InputConnection
 2014-09-03 14:35:32 +00:00
Lorenzo Colitti
0c2c72295c am 703c2eb9: am 1ae4e750: Merge "Kill the NetworkInfo(int type) constructor. IT\'S A TRAP!" into lmp-dev 
* commit '703c2eb9924220110d37a386f4783208c7da90bf':
  Kill the NetworkInfo(int type) constructor. IT'S A TRAP!
 2014-09-03 14:35:20 +00:00
Svetoslav
e09626e454 am a7a98dc6: am 551335a3: Merge "Fix AccessibilityNode\'s isVisibleToUser behavior." into lmp-dev 
* commit 'a7a98dc6b88aa757f48f626d6a49ffad22626058':
  Fix AccessibilityNode's isVisibleToUser behavior.
 2014-09-03 14:34:47 +00:00
Dianne Hackborn
d52184d170 am 3364a9f9: am d136d986: Add more slow execution logs. 
* commit '3364a9f92e7acbf3cc43c036d51056ac51e4226e':
  Add more slow execution logs.
 2014-09-03 14:34:10 +00:00
Dianne Hackborn
49aa4b60e0 am fd4fcdb7: am 8b88d87e: Merge "Revert "And yet more logging for slow execution."" into lmp-dev 
* commit 'fd4fcdb7e1b6579559cb15db4204ac704c2c7773':
  Revert "And yet more logging for slow execution."
 2014-09-03 14:34:05 +00:00
Alan Viverette
f832d268e3 am 8ebb56ee: am 37e5b8e4: Merge "Use null instead of transparent for Material alert dialog sections" into lmp-dev 
* commit '8ebb56ee53629e2acafe28f08c3869f911dc8e18':
  Use null instead of transparent for Material alert dialog sections
 2014-09-03 14:33:46 +00:00
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
Jorim Jaggi
db13a60f6e am 947de838: Merge "Status bar iconography updates" into lmp-dev 
* commit '947de838385f3d0c271ff82d238ac58ba609acde':
  Status bar iconography updates
 2014-09-03 13:08:06 +00:00
Jorim Jaggi
0c06d6bff1 Merge "Status bar iconography updates" into lmp-dev 2014-09-03 12:56:16 +00:00
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
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
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
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
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