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

178098 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rich Slogar
0564cee3c7 am b490f297: am 5c853c26: am d35216ad: Merge "docs: studio bundle update" into lmp-docs 
* commit 'b490f297101bcf31f56278d21d5f56a5e5998a58':
  docs: studio bundle update
 2014-12-11 20:55:45 +00:00
Joe Fernandez
07877955be am 5c518b7f: am b32987ec: am c3daed96: Merge "docs: platform updates for api 21" into lmp-docs 
* commit '5c518b7f01345a414cd260db7762bdb0aa73b55b':
  docs: platform updates for api 21
 2014-12-11 20:55:35 +00:00
Joe Fernandez
e3bac3bc8f am b64545c8: am 378c71a3: am 235e4be4: Merge "docs: sdk tools 24.0.1 revisions" into lmp-docs 
* commit 'b64545c83a526d17ccbce2d110a06f3789dd4ad8':
  docs: sdk tools 24.0.1 revisions
 2014-12-11 20:55:29 +00:00
Andrew Solovay
13e0a6505f am a97053fd: am f43c057c: am c7ad6e91: docs: Added info about managed profiles to "Android 5.0 Changes" 
* commit 'a97053fd0ba37feb7382fd30498a6a5e93c52a9e':
  docs: Added info about managed profiles to "Android 5.0 Changes"
 2014-12-11 20:55:23 +00:00
Chih-hung Hsieh
b0dd6d3a8a am 4c23a0ec: Merge "Adjust format strings to work on both 32-bit and 64-bit builds" 
* commit '4c23a0ec161891a1248b7aea67fbfd1d00bbd199':
  Adjust format strings to work on both 32-bit and 64-bit builds
 2014-12-11 20:54:56 +00:00
Jorim Jaggi
0ed01deb2f Limit item count in QS detail 
- Introduce a maximum number of items to be shown in QS detail view
  depending on the device configuration.
- For Wifi and Cast, make the panel exactly that height as we would
  show the maximum count of items, in order to prevent that the
  buttons jump around.

Bug: 18665311
Change-Id: I7c0c383a902d295f1b486b8a074e15b990fbe562
 2014-12-11 21:51:30 +01:00
Chih-hung Hsieh
4c23a0ec16 Merge "Adjust format strings to work on both 32-bit and 64-bit builds" 2014-12-11 20:49:30 +00:00
Winson Chung
0eae5573b5 Fixing issue with old thumbnails on first launch of app. (Bug 18718114) 
Ensure that we always update the thumbnail for the running task, in addition, we
need to be ignoring the running task when doing background preloading since it
will be invalidated anyways.

Change-Id: Ie4f9862dddc29aa71a44e94bbd036c7712487eed
 2014-12-11 12:24:41 -08:00
Joe Fernandez
c9014b6d59 am ea500a3a: am 0aa23445: Merge "docs: studio basics haxm updates" into lmp-docs 
* commit 'ea500a3adf6bcf17ad22f05acd8c3220358f72ce':
  docs: studio basics haxm updates
 2014-12-11 19:59:00 +00:00
Ruben Brunk
81b381b82e am f6ed526b: Merge "camera2: Fix LEGACY YUV production and orientation." into lmp-mr1-dev 
* commit 'f6ed526b3a02bac9c5912a9655e5890f332cefc6':
  camera2: Fix LEGACY YUV production and orientation.
 2014-12-11 19:55:02 +00:00
Joe Fernandez
ea500a3adf am 0aa23445: Merge "docs: studio basics haxm updates" into lmp-docs 
* commit '0aa234457737cdb31538711251920aef3a70bb56':
  docs: studio basics haxm updates
 2014-12-11 19:50:39 +00:00
Ruben Brunk
f6ed526b3a Merge "camera2: Fix LEGACY YUV production and orientation." into lmp-mr1-dev 2014-12-11 19:48:37 +00:00
Ricardo Cervera
64d97cb2ad am 6621a4f6: am 9fe34d90: Merge "docs: Fixes to watch faces docs." into lmp-docs 
* commit '6621a4f6f9c63ff952c5e64a5ae1e41ef5ac5960':
  docs: Fixes to watch faces docs.
 2014-12-11 19:43:25 +00:00
Joe Fernandez
0aa2344577 Merge "docs: studio basics haxm updates" into lmp-docs 2014-12-11 19:43:18 +00:00
Ruben Brunk
433e715cc0 camera2: Fix LEGACY YUV production and orientation. 
Bug: 18486140
Change-Id: I119e57315b67d1f485bea7f1682bfc261ae0f934
 2014-12-11 11:35:46 -08:00
Ricardo Cervera
6621a4f6f9 am 9fe34d90: Merge "docs: Fixes to watch faces docs." into lmp-docs 
* commit '9fe34d9037dc27abb89c64ff75b87fdf9a4eaa8b':
  docs: Fixes to watch faces docs.
 2014-12-11 19:35:41 +00:00
Ricardo Cervera
9fe34d9037 Merge "docs: Fixes to watch faces docs." into lmp-docs 2014-12-11 19:28:41 +00:00
Jason Monk
70cf2f72f2 am 7d8ccb41: Merge "Fix crash in BluetoothControllerImpl" into lmp-mr1-dev 
* commit '7d8ccb41fa3756839597cd28cd5710c1b690e17f':
  Fix crash in BluetoothControllerImpl
 2014-12-11 19:28:28 +00:00
Craig Mautner
cb17f18952 Don't apply animations to windows that are showing 
If a window is showing and not obscured by the keyguard, for
example windows on other displays, don't apply the enter animation.
This prevents jank on secondary displays when the keyguard is
unlocked.

Fixes bug 18689396

Change-Id: I2deb3030e6e887f57af9a5f1d42b1c71f06f7eeb
 2014-12-11 11:24:32 -08:00
Jason Monk
7d8ccb41fa Merge "Fix crash in BluetoothControllerImpl" into lmp-mr1-dev 2014-12-11 19:22:20 +00:00
Rich Slogar
b490f29710 am 5c853c26: am d35216ad: Merge "docs: studio bundle update" into lmp-docs 
* commit '5c853c26a879c411a98e1530247a41a856f7784c':
  docs: studio bundle update
 2014-12-11 19:17:05 +00:00
Rich Slogar
5c853c26a8 am d35216ad: Merge "docs: studio bundle update" into lmp-docs 
* commit 'd35216ad36aefb121167ad781b25f7a37d5c1e52':
  docs: studio bundle update
 2014-12-11 19:09:39 +00:00
Rich Slogar
d35216ad36 Merge "docs: studio bundle update" into lmp-docs 2014-12-11 19:04:03 +00:00
Rich Slogar
2f8f42f897 docs: studio bundle update 
Change-Id: I232a61ae6747b879e8a36f8e4942d6a3406c4162
 2014-12-11 10:51:41 -08:00
Amit Mahajan
cac8662943 am c5da1d3d: Merge "Adding new config variable that is used to determine if ERI should be used when voice RAT is LTE on CDMA network." into lmp-mr1-dev 
* commit 'c5da1d3ddfb4e0a8c17ee827765ba5ab7293c500':
  Adding new config variable that is used to determine if ERI should be used when voice RAT is LTE on CDMA network.
 2014-12-11 18:43:38 +00:00
Amit Mahajan
c5da1d3ddf Merge "Adding new config variable that is used to determine if ERI should be used when voice RAT is LTE on CDMA network." into lmp-mr1-dev 2014-12-11 18:39:23 +00:00
John Spurlock
6f9a71729f am 0537caa1: Merge "Zen: Leave zen=none on manual ringer mode stream volume changes." into lmp-mr1-dev 
* commit '0537caa1e05a2f60e747559e5251f5771737c54f':
  Zen: Leave zen=none on manual ringer mode stream volume changes.
 2014-12-11 18:34:14 +00:00
John Spurlock
0537caa1e0 Merge "Zen: Leave zen=none on manual ringer mode stream volume changes." into lmp-mr1-dev 2014-12-11 18:27:11 +00:00
Jason Monk
1206321f38 Fix crash in BluetoothControllerImpl 
Bug: 18717777
Change-Id: I396aa8b517054b1fd4c8fea7f0343f138cb261a7
 2014-12-11 13:26:01 -05:00
Jorim Jaggi
43f4372c0a Fix low FPS when entering wifi/BT detail panel 
Bug: 18665311
Change-Id: If50db68ef3442fceb923ac0466878846c4071981
 2014-12-11 19:17:21 +01:00
Jorim Jaggi
8bc983efc4 Improve transition when going to Wifi/BT detail panel 
Animate the height change of the lower QS panel when going into
Wifi/BT or any other panel which is higher than the default size.

Bug: 18665311
Change-Id: Ic1d1f19183cf6b502d6b623388b315ed6e0a3c9f
 2014-12-11 19:16:50 +01:00
Robert Greenwalt
6b58bc2ba2 am bde00a2b: Merge "Add toString in NetworkFactory." into lmp-mr1-dev automerge: 911bcea 
automerge: 46765a0

* commit '46765a0fbc015ae07be5a8e18afd66f048883462':
  Add toString in NetworkFactory.
 2014-12-11 18:15:07 +00:00
Selim Cinek
b5c990e912 Merge "Fixed a bug where the pattern may become invisible" into lmp-mr1-dev automerge: f8dc9d7 automerge: efa38cd 
automerge: a34913f

* commit 'a34913f572a422732a553ae957d1795d3adff0b1':
  Fixed a bug where the pattern may become invisible
 2014-12-11 18:13:40 +00:00
Robert Greenwalt
46765a0fbc am bde00a2b: Merge "Add toString in NetworkFactory." into lmp-mr1-dev 
automerge: 911bcea

* commit '911bceab1ead02fde9ccb6fe2651fee13aca817e':
  Add toString in NetworkFactory.
 2014-12-11 18:07:53 +00:00
Selim Cinek
4572664ddc am 58fc8db6: Merge "Fixed a bug where the empty shade and dismiss views would animate" into lmp-mr1-dev automerge: 372eb38 automerge: 7988ef9 
* commit '58fc8db68e73e853f74c281cf4ea048dfdd1e745':
  Fixed a bug where the empty shade and dismiss views would animate
 2014-12-11 18:07:49 +00:00
Selim Cinek
fa9773d641 am 7a5409fe: Merge "Fixed a bug where the background could become transparent" into lmp-mr1-dev automerge: 8f51c4c automerge: 2e34adc 
* commit '7a5409fe634cea7a6340cb0beaf8b122b7f426cb':
  Fixed a bug where the background could become transparent
 2014-12-11 18:07:45 +00:00
Narayan Kamath
51584a7ffa am 0b0b13b9: am 15cd6302: Merge "Avoid tearing down process groups twice." into lmp-mr1-dev automerge: 6fe0fd6 
* commit '0b0b13b93feae31db6ea24e5a4ba151fce2eb1d4':
  Avoid tearing down process groups twice.
 2014-12-11 18:07:40 +00:00
Selim Cinek
a34913f572 Merge "Fixed a bug where the pattern may become invisible" into lmp-mr1-dev automerge: f8dc9d7 
automerge: efa38cd

* commit 'efa38cd36101d7469e8ed4db03cdebe818bbcfd2':
  Fixed a bug where the pattern may become invisible
 2014-12-11 18:05:37 +00:00
Selim Cinek
58fc8db68e Merge "Fixed a bug where the empty shade and dismiss views would animate" into lmp-mr1-dev automerge: 372eb38 
automerge: 7988ef9

* commit '7988ef9c4da50f007fde71a121f89e6b9796c69e':
  Fixed a bug where the empty shade and dismiss views would animate
 2014-12-11 18:04:17 +00:00
Rich Slogar
d282ba778b docs: studio basics haxm updates 
Change-Id: I2c3ef0dae3a091be27f1cfef13fe385f97781492
 2014-12-11 10:03:19 -08:00
Selim Cinek
7a5409fe63 Merge "Fixed a bug where the background could become transparent" into lmp-mr1-dev automerge: 8f51c4c 
automerge: 2e34adc

* commit '2e34adc24c9609426d08530b1c5bbec723bd4a19':
  Fixed a bug where the background could become transparent
 2014-12-11 18:02:39 +00:00
Narayan Kamath
0b0b13b93f am 15cd6302: Merge "Avoid tearing down process groups twice." into lmp-mr1-dev 
automerge: 6fe0fd6

* commit '6fe0fd69a1da7c0f548bcda91827d2a9e493c555':
  Avoid tearing down process groups twice.
 2014-12-11 18:00:47 +00:00
John Spurlock
29b7872bf4 Zen: Leave zen=none on manual ringer mode stream volume changes. 
If the stream volume is changed from the api, leave zen=none
so as not to leave the system in an unexpected state.

Bug: 18084981
Change-Id: I857b3ff87ad4e2aa9aab479529caf13b819f854c
 2014-12-11 12:54:41 -05:00
Mike Lockwood
43bbe4a1e7 Merge "MidiManager: Improve Javadoc" 2014-12-11 17:26:40 +00:00
Glenn Kasten
65357bd956 Merge "Remove constructor" 2014-12-11 17:21:23 +00:00
Ricardo Cervera
ad69082b50 docs: Fixes to watch faces docs. 
Bug: 18705470
Bug: 18702859
Bug: 18713266

Change-Id: I67f159f3b54a03f08aa1cd4bf3aa40eec4a34631
 2014-12-11 09:17:45 -08:00
Mike Lockwood
78beecffc3 MidiManager: Improve Javadoc 
Change-Id: Ia1c457de96152029676676464f1ebb896e58bea8
 2014-12-11 09:15:23 -08:00
Robert Greenwalt
911bceab1e am bde00a2b: Merge "Add toString in NetworkFactory." into lmp-mr1-dev 
* commit 'bde00a2b5c8c506b79e0724021a0711bde207c25':
  Add toString in NetworkFactory.
 2014-12-11 17:03:57 +00:00
Robert Greenwalt
bde00a2b5c Merge "Add toString in NetworkFactory." into lmp-mr1-dev 2014-12-11 16:59:13 +00:00
Selim Cinek
efa38cd361 Merge "Fixed a bug where the pattern may become invisible" into lmp-mr1-dev 
automerge: f8dc9d7

* commit 'f8dc9d7b3d496593c6c6dddcd42cae13ac508876':
  Fixed a bug where the pattern may become invisible
 2014-12-11 15:12:37 +00:00