Alan Viverette
4b7f724fb2
am ff441883: Merge "Improve time picker accessibility" into lmp-mr1-dev
...
* commit 'ff44188309fca037892d0ded64cfee04a3a71c42':
Improve time picker accessibility
2014-12-11 22:19:07 +00:00
Alan Viverette
ff44188309
Merge "Improve time picker accessibility" into lmp-mr1-dev
2014-12-11 22:11:56 +00:00
David Friedman
d0d76540ae
am c82392df: am 1ab615b3: Merge "Adds link to related video." into lmp-docs
...
* commit 'c82392df7caa12836d97650c7528f216d3c2b76f':
Adds link to related video.
2014-12-11 22:10:48 +00:00
David Friedman
c82392df7c
am 1ab615b3: Merge "Adds link to related video." into lmp-docs
...
* commit '1ab615b3e6a7ae820fde4ba067f76dff635f3639':
Adds link to related video.
2014-12-11 22:03:42 +00:00
David Friedman
1ab615b3e6
Merge "Adds link to related video." into lmp-docs
2014-12-11 21:55:25 +00:00
Wink Saville
a54bf65833
Change tests against INVALID_SUBSCRIPTION_ID to use isValidSubscriptionId.
...
Rename isValidSubId to isValidSubscriptionId.
Bug: 18668873
Change-Id: Ie709a62bbb74e0a767daeb9e3fb3aecd4c45df44
2014-12-11 13:37:50 -08:00
Winson Chung
8c8c99cf08
am 47d9a58c: Merge "Fixing issue with old thumbnails on first launch of app. (Bug 18718114)" into lmp-mr1-dev
...
* commit '47d9a58ce15007f79bc094d9b1599e41d51670a3':
Fixing issue with old thumbnails on first launch of app. (Bug 18718114)
2014-12-11 21:27:54 +00:00
Winson Chung
47d9a58ce1
Merge "Fixing issue with old thumbnails on first launch of app. (Bug 18718114)" into lmp-mr1-dev
2014-12-11 21:20:42 +00:00
Joe Fernandez
a878256b59
am 81779694: am c9014b6d: am ea500a3a: am 0aa23445: Merge "docs: studio basics haxm updates" into lmp-docs
...
* commit '817796940bf79942ccd950cec47815039a2aa15e':
docs: studio basics haxm updates
2014-12-11 21:03:11 +00:00
Ricardo Cervera
575c8c9fcd
am af7070e6: am 64d97cb2: am 6621a4f6: am 9fe34d90: Merge "docs: Fixes to watch faces docs." into lmp-docs
...
* commit 'af7070e6f0bb2b035b1d2565fdd50b6bde210864':
docs: Fixes to watch faces docs.
2014-12-11 21:03:06 +00:00
Rich Slogar
51f1c26b5b
am 0564cee3: am b490f297: am 5c853c26: am d35216ad: Merge "docs: studio bundle update" into lmp-docs
...
* commit '0564cee3c7537c916c74e560e2160b0f0657a9eb':
docs: studio bundle update
2014-12-11 21:02:44 +00:00
Joe Fernandez
cc08e619d6
am 07877955: am 5c518b7f: am b32987ec: am c3daed96: Merge "docs: platform updates for api 21" into lmp-docs
...
* commit '07877955bef2132ea5e8d02662a7f0ca1aad5f7d':
docs: platform updates for api 21
2014-12-11 21:02:37 +00:00
Joe Fernandez
11bccb1ebe
am e3bac3bc: am b64545c8: am 378c71a3: am 235e4be4: Merge "docs: sdk tools 24.0.1 revisions" into lmp-docs
...
* commit 'e3bac3bc8f015a1ee8238fef7ca155fb432beb51':
docs: sdk tools 24.0.1 revisions
2014-12-11 21:02:32 +00:00
Andrew Solovay
fe967912fa
am 13e0a650: am a97053fd: am f43c057c: am c7ad6e91: docs: Added info about managed profiles to "Android 5.0 Changes"
...
* commit '13e0a6505fd049a8df47aa8fa01b7c8c3120dea1':
docs: Added info about managed profiles to "Android 5.0 Changes"
2014-12-11 21:02:26 +00:00
Chih-hung Hsieh
d1aa67b8e1
am b0dd6d3a: am 4c23a0ec: Merge "Adjust format strings to work on both 32-bit and 64-bit builds"
...
* commit 'b0dd6d3a8a7f11454239facf0ee9b2dd2390945e':
Adjust format strings to work on both 32-bit and 64-bit builds
2014-12-11 21:02:08 +00:00
Joe Fernandez
817796940b
am c9014b6d: am ea500a3a: am 0aa23445: Merge "docs: studio basics haxm updates" into lmp-docs
...
* commit 'c9014b6d59cae3602027a5ea373d436a7e78b71c':
docs: studio basics haxm updates
2014-12-11 20:55:53 +00:00
Ricardo Cervera
af7070e6f0
am 64d97cb2: am 6621a4f6: am 9fe34d90: Merge "docs: Fixes to watch faces docs." into lmp-docs
...
* commit '64d97cb2ad6bfd10511067f178ba8a1ccf9ba452':
docs: Fixes to watch faces docs.
2014-12-11 20:55:49 +00:00
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
Jason Monk
e69e5f87b3
Add config to handle periodic check of tether provision
...
While here also update QS to handle the changes made for this
new check.
Bug: 18453076
Change-Id: I1f6e2d954562c5a16a0de60dac625005ec3e5c50
2014-12-11 15:14:51 -05: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
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