Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
160,352 Commits 3 Branches 0 Tags
50e2d6c2ce079c00531ecbcf112593cb0263e47a
Commit Graph

160352 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Junda Liu
50e2d6c2ce am ef6178a9: Merge "Add hasMatchedTetherApnSetting to telmgr API." into lmp-mr1-dev 
* commit 'ef6178a99c57b6de3dc02455e570f932b154b8e1':
  Add hasMatchedTetherApnSetting to telmgr API.
 2014-12-02 18:23:49 +00:00
Junda Liu
ef6178a99c Merge "Add hasMatchedTetherApnSetting to telmgr API." into lmp-mr1-dev 2014-12-02 18:18:24 +00:00
Luan Nguyen
a7ee124305 am dc1baa16: am 2711a539: am 16d0ab86: am 6cd78bb2: Merge "docs: Update getting started creating Wearable apps with proper prereqs and instructions." into lmp-docs 
* commit 'dc1baa16b1c559b07d392f7d899fcfe18fa7036c':
  docs: Update getting started creating Wearable apps with proper prereqs and instructions.
 2014-12-02 17:17:11 +00:00
Jean-Michel Trivi
874e450221 am 57457b98: Merge "AudioMix address and type, rule exclusion API, dynamic source" into lmp-mr1-dev 
* commit '57457b98cfec197283c42585a3bc4abb1b21d05b':
  AudioMix address and type, rule exclusion API, dynamic source
 2014-12-02 17:17:06 +00:00
Luan Nguyen
dc1baa16b1 am 2711a539: am 16d0ab86: am 6cd78bb2: Merge "docs: Update getting started creating Wearable apps with proper prereqs and instructions." into lmp-docs 
* commit '2711a5394950f2c61d2cd2ca7f9cfa141a96df34':
  docs: Update getting started creating Wearable apps with proper prereqs and instructions.
 2014-12-02 17:10:49 +00:00
Jean-Michel Trivi
57457b98cf Merge "AudioMix address and type, rule exclusion API, dynamic source" into lmp-mr1-dev 2014-12-02 17:09:30 +00:00
Chris Craik
363f0d9fd9 am 81defc6a: Merge "Sync ViewOverlay size init with RenderNode" into lmp-mr1-dev 
* commit '81defc6a840367dcf9591d14b827f2d8d756ef00':
  Sync ViewOverlay size init with RenderNode
 2014-12-02 17:04:34 +00:00
Luan Nguyen
2711a53949 am 16d0ab86: am 6cd78bb2: Merge "docs: Update getting started creating Wearable apps with proper prereqs and instructions." into lmp-docs 
* commit '16d0ab86eba2e4f596ac1b96b53391dd0f146b57':
  docs: Update getting started creating Wearable apps with proper prereqs and instructions.
 2014-12-02 17:00:23 +00:00
Chris Craik
81defc6a84 Merge "Sync ViewOverlay size init with RenderNode" into lmp-mr1-dev 2014-12-02 16:59:21 +00:00
Luan Nguyen
16d0ab86eb am 6cd78bb2: Merge "docs: Update getting started creating Wearable apps with proper prereqs and instructions." into lmp-docs 
* commit '6cd78bb2613260b0eb8341748d5cebe4a46f10e5':
  docs: Update getting started creating Wearable apps with proper prereqs and instructions.
 2014-12-02 16:50:36 +00:00
Luan Nguyen
6cd78bb261 Merge "docs: Update getting started creating Wearable apps with proper prereqs and instructions." into lmp-docs 2014-12-02 16:42:56 +00:00
Jason Monk
613c0555ae am e47dc360: Merge "SysUI: Actual MSIM status bar support" into lmp-mr1-dev 
* commit 'e47dc36071884600c2b3c1dfe1ffe031fc9f0fde':
  SysUI: Actual MSIM status bar support
 2014-12-02 15:52:17 +00:00
Jason Monk
e47dc36071 Merge "SysUI: Actual MSIM status bar support" into lmp-mr1-dev 2014-12-02 15:47:36 +00:00
Christoph Studer
ef1073f7b4 am ff02faf8: Merge "NoMan: Optimize grouped notifications" into lmp-mr1-dev 
* commit 'ff02faf8f3db791956a99ff0bb87eafb52f333d4':
  NoMan: Optimize grouped notifications
 2014-12-02 15:45:01 +00:00
Christoph Studer
ff02faf8f3 Merge "NoMan: Optimize grouped notifications" into lmp-mr1-dev 2014-12-02 15:40:10 +00:00
Jason Monk
b574627ebc SysUI: Actual MSIM status bar support 
Expand SignalClusterView and NetworkController to handle multiple
SIMs.  It does this by creating multiple MobileSignalControllers
for each of the active subscriptions on the device.

Also some minor changes for followup on the NetworkController
refactor that went in before this.

Bug: 18222975
Change-Id: Ic7a857cfc5cadb46d51bb9ded0df8187eea799f7
 2014-12-02 10:35:09 -05:00
Paul Crowley
f57d9dcbc7 am fbeeac82: Merge "Add a tag to separate paragraphs in Javadoc" into lmp-mr1-dev 
* commit 'fbeeac8266c190afba084cfc1164385ff5020fce':
  Add a tag to separate paragraphs in Javadoc
 2014-12-02 14:48:57 +00:00
Paul Crowley
fbeeac8266 Merge "Add a tag to separate paragraphs in Javadoc" into lmp-mr1-dev 2014-12-02 14:44:27 +00:00
Adrian Roos
3590a45ed2 am c3056190: Prevent LIGHTS_OUT_TRANSPARENT in vertical nav bar 
* commit 'c3056190ae1a6d29ce5943d45ab4711e1e49620c':
  Prevent LIGHTS_OUT_TRANSPARENT in vertical nav bar
 2014-12-02 12:58:47 +00:00
Adrian Roos
c3056190ae Prevent LIGHTS_OUT_TRANSPARENT in vertical nav bar 
Bug: 18518939
Bug: 17691219
Change-Id: I90b9afbbb1a550b5328a581b4fb6aadfa3ff2559
 2014-12-02 12:52:07 +00:00
Paul Crowley
2934b266e5 Add a tag to separate paragraphs in Javadoc 
Bug: 18571794
Change-Id: Icb9bdb87415d85cdbf790224e40abbf99a441456
 2014-12-02 11:21:13 +00:00
Kenny Guy
c4f32bb743 am 8f52135f: Merge "Allow apps from managed profles to close notification shade." into lmp-mr1-dev 
* commit '8f52135f2c555ae0a13393b60ed0552ee9e149da':
  Allow apps from managed profles to close notification shade.
 2014-12-02 10:21:53 +00:00
Kenny Guy
8f52135f2c Merge "Allow apps from managed profles to close notification shade." into lmp-mr1-dev 2014-12-02 10:17:21 +00:00
Andre Eisenbach
fcb948526f am a1a6c300: Merge "Add server-side callback for change in MTU (4/4)" into lmp-mr1-dev 
* commit 'a1a6c300afffebfb46e84dc1941f6bddca145a8f':
  Add server-side callback for change in MTU (4/4)
 2014-12-02 08:07:48 +00:00
Andre Eisenbach
a1a6c300af Merge "Add server-side callback for change in MTU (4/4)" into lmp-mr1-dev 2014-12-02 08:02:02 +00:00
Jinsuk Kim
bfe763d1c9 am b4355ec3: Merge "audioservice: system audio control in master volume mode" into lmp-mr1-dev 
* commit 'b4355ec3d0f7ab0aa44a746df7df250466cd701e':
  audioservice: system audio control in master volume mode
 2014-12-02 07:29:16 +00:00
Dongwon Kang
3599af39e4 am 7cfe00f6: Merge "TIF: fix a race condition when TvInputManager is initialized" into lmp-mr1-dev 
* commit '7cfe00f69380573e9c989bbbc614930c279f2291':
  TIF: fix a race condition when TvInputManager is initialized
 2014-12-02 07:29:10 +00:00
Erik Kline
d125266b3c am f27b52aa: Merge "Revert some verbose logging from ag/489226" into lmp-mr1-dev 
* commit 'f27b52aaa75884a41ea687116ff3758125b94e39':
  Revert some verbose logging from ag/489226
 2014-12-02 07:29:05 +00:00
Jinsuk Kim
b4355ec3d0 Merge "audioservice: system audio control in master volume mode" into lmp-mr1-dev 2014-12-02 07:26:41 +00:00
Dongwon Kang
7cfe00f693 Merge "TIF: fix a race condition when TvInputManager is initialized" into lmp-mr1-dev 2014-12-02 07:26:07 +00:00
Erik Kline
f27b52aaa7 Merge "Revert some verbose logging from ag/489226" into lmp-mr1-dev 2014-12-02 07:22:33 +00:00
Lorenzo Colitti
28ca40ff78 am 32f3518d: Merge "Only use mDefaultDns if the network claims to offer Internet" into lmp-mr1-dev 
* commit '32f3518dccf5c599c21b54095abe561f48277898':
  Only use mDefaultDns if the network claims to offer Internet
 2014-12-02 06:53:53 +00:00
Lorenzo Colitti
32f3518dcc Merge "Only use mDefaultDns if the network claims to offer Internet" into lmp-mr1-dev 2014-12-02 06:47:52 +00:00
Sungsoo Lim
1f35568d07 am 5a7445b0: Merge "Missing Javadoc update while API review" into lmp-mr1-dev 
* commit '5a7445b00d267db966cc72cd905aaf2379e64b6b':
  Missing Javadoc update while API review
 2014-12-02 03:33:22 +00:00
Sungsoo Lim
5a7445b00d Merge "Missing Javadoc update while API review" into lmp-mr1-dev 2014-12-02 03:29:10 +00:00
Yigit Boyar
d11e2b7cdd am 498c84e7: Merge "Don\'t wipe out explicit Toolbar nav icon when calling setSupportActionBar" into lmp-mr1-dev 
* commit '498c84e7366cc0b4355f034bd03534a14beaf166':
  Don't wipe out explicit Toolbar nav icon when calling setSupportActionBar
 2014-12-02 02:12:06 +00:00
Yigit Boyar
498c84e736 Merge "Don't wipe out explicit Toolbar nav icon when calling setSupportActionBar" into lmp-mr1-dev 2014-12-02 02:07:26 +00:00
Alan Viverette
cc636f0824 am 4515f785: Merge "Only send haptic events from time picker when time changes" into lmp-mr1-dev 
* commit '4515f785878cb150bef467d40abc9d5b172570fe':
  Only send haptic events from time picker when time changes
 2014-12-02 02:03:49 +00:00
Alan Viverette
4515f78587 Merge "Only send haptic events from time picker when time changes" into lmp-mr1-dev 2014-12-02 01:58:31 +00:00
Chris Craik
2180ba7abd Sync ViewOverlay size init with RenderNode 
bug:18381202

Setting mRight/mBottom must be accompanied by updating the RenderNode.

Change-Id: I4dae06a5ca43247b0b3642d85808e2724e486692
 2014-12-01 17:55:37 -08:00
Zhijun He
c8d1b107b0 am 217814bf: Merge "ImageReader: free direct byte buffers once Image is returned" into lmp-mr1-dev 
* commit '217814bf2bef703be8b24cd4f1ea454ca6638111':
  ImageReader: free direct byte buffers once Image is returned
 2014-12-02 01:48:45 +00:00
Zhijun He
217814bf2b Merge "ImageReader: free direct byte buffers once Image is returned" into lmp-mr1-dev 2014-12-02 01:44:44 +00:00
Pavel Zhamaitsiak
75371fd7ee am 73f10473: Merge "MSIM IMS: convert to phone ID based selection." into lmp-mr1-dev 
* commit '73f1047318fdbfddce7edaa387725563890b5c73':
  MSIM IMS: convert to phone ID based selection.
 2014-12-02 01:33:34 +00:00
Chris Craik
9a04480e36 am ef124887: Merge "Clip outline to View clip bounds for shadow computation" into lmp-mr1-dev 
* commit 'ef124887c616d03cf0a689d2b7d5b1894405d12e':
  Clip outline to View clip bounds for shadow computation
 2014-12-02 01:33:28 +00:00
Pavel Zhamaitsiak
73f1047318 Merge "MSIM IMS: convert to phone ID based selection." into lmp-mr1-dev 2014-12-02 01:27:56 +00:00
Chris Craik
ef124887c6 Merge "Clip outline to View clip bounds for shadow computation" into lmp-mr1-dev 2014-12-02 01:27:26 +00:00
Ihab Awad
8ea0d19fe2 am 93b42924: Merge "Fix immutability bug in http://ag/587241" into lmp-mr1-dev 
* commit '93b429247673bb8e019fe9d39b46700fc86c3313':
  Fix immutability bug in http://ag/587241
 2014-12-02 01:11:32 +00:00
Ihab Awad
93b4292476 Merge "Fix immutability bug in http://ag/587241" into lmp-mr1-dev 2014-12-02 01:00:09 +00:00
Ihab Awad
90e34e324c Fix immutability bug in http://ag/587241 
Bug: 18292176
Change-Id: Icf1f717d76f042d9950a1d8cca9def061de1c1b8
 2014-12-02 00:59:09 +00:00
Adam Powell
920c27b24a am 4cd577f0: Merge "Make work profile apps easier to pick in ResolverActivity" into lmp-mr1-dev 
* commit '4cd577f0ac1df92ffbf196d1fb31a7124bbe2f51':
  Make work profile apps easier to pick in ResolverActivity
 2014-12-02 00:50:39 +00:00