Jason Monk
e127b56463
am 71793e71: Merge "Fixes to lock task API from API review" into lmp-dev
...
* commit '71793e71d67472a7d42f072cbd6266d4302fefde':
Fixes to lock task API from API review
2014-08-18 13:43:33 +00:00
John Spurlock
fb20636811
am 4fd20a99: Merge "QS: Add scanning progress state indication." into lmp-dev
...
* commit '4fd20a99733856ab3ec9920a48e2860187ad4473':
QS: Add scanning progress state indication.
2014-08-18 13:06:07 +00:00
Terry Heo
dbbbb8d401
am f9ed92a3: Merge "CEC: Handle Remote Control command" into lmp-dev
...
* commit 'f9ed92a3bd38aad3106ca31cb368e3d52fcb5400':
CEC: Handle Remote Control command
2014-08-18 07:30:04 +00:00
Chulwoo Lee
e33564ab9c
am 6cc20192: Merge "Fix ConcurrentModificationException in PersistentDataStore" into lmp-dev
...
* commit '6cc201929764089c49d777ed983ee776b38054e6':
Fix ConcurrentModificationException in PersistentDataStore
2014-08-18 05:49:26 +00:00
Jungshik Jang
730095c1d8
am 94a31604: Implement MHL send key action.
...
* commit '94a31604833f069f1b059aa803299f19543fb5d5':
Implement MHL send key action.
2014-08-18 05:35:12 +00:00
Jungshik Jang
4612a6e111
Implement MHL send key action.
...
This class introduces two classes, MhlSendKeyAction and
HdmiMhlKeycode.
- MhlSendKeyAction is a feature action that manages MHL message
for RCP, Remote Control Pass Through.
- HdmiMhlKeycode is a collection of MHL keycode including keycode
mapping between MHL and Android keycode.
Bug: 16966459
Change-Id: Ib3f7229c71b66837cd0d239e5af1940dfccee7df
2014-08-18 11:16:47 +09:00
Jinsuk Kim
20961652cf
am 47a91229: Merge "CEC: Replace the usage of logical address with id for HdmiDeviceInfo" into lmp-dev
...
* commit '47a912291f57766dd0e924eee50bee8d653d297a':
CEC: Replace the usage of logical address with id for HdmiDeviceInfo
2014-08-18 01:32:08 +00:00
Michael Wright
90db970c5c
am 4d568b1c: Merge "Remove MediaProjection#createAudioRecord API" into lmp-dev
...
* commit '4d568b1c24a171b6de988133bb892d1f4ca56d1a':
Remove MediaProjection#createAudioRecord API
2014-08-18 01:32:02 +00:00
Michael Wright
2b82365000
am ab1b372c: Merge "Change \'disable hardware keyboard\' to \'show input method\'" into lmp-dev
...
* commit 'ab1b372cfcb5b0607fdf7acf84d2400e4837dff7':
Change 'disable hardware keyboard' to 'show input method'
2014-08-18 01:08:54 +00:00
Michael Wright
7b69e056fd
Update MenuItem#setShortcut docs
...
Change-Id: I6b73992b0c8d590e8c9884bec377c7c0c1e35720
2014-08-17 17:58:53 -07:00
Michael Wright
7b5a96ba83
Persist Show IME option.
...
Add a new setting to persist whether to show the IME when a hard
keyboard is connected.
Bug: 14066881
Change-Id: I2237ded850a0d4ab43ca441d0b7df13e0958e630
2014-08-17 17:51:19 -07:00
Michael Wright
665366a305
Change 'disable hardware keyboard' to 'show input method'
...
Previously it implied that the hardware keyboard would be disabled,
but really the toggle would just enable showing the IME even if a
hardware keyboard was present. Changed the string and swapped the
semantics to be more clear about the behavior.
Bug: 14066881
Change-Id: I9c8a7eb98b5277f1d09cc19fa7402e9b4cf51d92
2014-08-17 17:51:19 -07:00
Robert Greenwalt
06bd97650d
am c993be52: Add tcp buffer size conduit to NetworkAgent.
...
* commit 'c993be52b3e9a45a882ddc305a133c1859f9d50d':
Add tcp buffer size conduit to NetworkAgent.
2014-08-17 23:14:42 +00:00
Michael Wright
d86ecd26d7
Add callbacks for MediaProjection start / stop.
...
Also, enforce that there is only one valid MediaProjection at a time.
Bug: 16488053
Change-Id: Id05445d798c98cb208bc4dab186296392e15d30b
2014-08-17 16:06:56 -07:00
Robert Greenwalt
3f05bf4d78
Add tcp buffer size conduit to NetworkAgent.
...
bug: 16549611
Change-Id: I7d97dedea2c7c1aed2eccb185645889424508591
2014-08-17 15:14:29 -07:00
Robert Greenwalt
f086299c0d
am 75258ebb: Merge "Fix a logic error so mtu works." into lmp-dev
...
* commit '75258ebbaa15c999b7a9832a3a90b3bf4acb944b':
Fix a logic error so mtu works.
2014-08-17 18:55:37 +00:00
Baligh Uddin
689f06f895
am 006f4664: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
...
* commit '006f4664abd04c079db2ad793f79feb820ccade5':
Import translations. DO NOT MERGE
2014-08-17 13:58:46 +00:00
Baligh Uddin
05bccec1fb
am 9c1a2e53: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
...
* commit '9c1a2e53047dd85eafdb70702ce4446da75ee89a':
Import translations. DO NOT MERGE
2014-08-17 13:58:41 +00:00
Baligh Uddin
4974f4b594
am 3b215ba6: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
...
* commit '3b215ba67d0671bcb4669c2b63baecfb7f1513d8':
Import translations. DO NOT MERGE
2014-08-17 13:58:37 +00:00
Baligh Uddin
99f0a8021e
am eba806cb: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
...
* commit 'eba806cb460f2152de9200591cc5a72fcd039f21':
Import translations. DO NOT MERGE
2014-08-17 13:58:33 +00:00
Baligh Uddin
f5ef611a32
am 5b02800b: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
...
* commit '5b02800baf65517b9e0deff116b261b00a599735':
Import translations. DO NOT MERGE
2014-08-17 13:57:33 +00:00
Baligh Uddin
47555d2b1a
am 1805b1a1: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
...
* commit '1805b1a16fbb178cee3f575fafa967df0d288dd1':
Import translations. DO NOT MERGE
2014-08-17 13:56:01 +00:00
Baligh Uddin
6efa1e43db
am ca8f9977: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
...
* commit 'ca8f99773a6cd92a612a7b41beddb014ddc9ac66':
Import translations. DO NOT MERGE
2014-08-17 13:55:56 +00:00
Baligh Uddin
8fd135feb9
am 5bbc0df4: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
...
* commit '5bbc0df40f91911d0a2e18eae60b8f1d8c5048fb':
Import translations. DO NOT MERGE
2014-08-17 13:55:52 +00:00
Dianne Hackborn
2cc450e8e7
am 83249fc9: Merge "Make sure we initialize to enable the default voice interaction service." into lmp-dev
...
* commit '83249fc9204fba3698fdf436a7559fc40b569fe7':
Make sure we initialize to enable the default voice interaction service.
2014-08-16 19:00:14 +00:00
Adam Lesinski
5b98967dc1
am 068f8521: Merge "AAPT: Output only 64-bit arch when multiArch is true" into lmp-dev
...
* commit '068f85214d32cfd07d032416221006bf8eebc193':
AAPT: Output only 64-bit arch when multiArch is true
2014-08-16 06:49:45 +00:00
Deepanshu Gupta
da9baa15bf
am d519f742: am b6c923a2: am 59eedf52: Layoutlib: Update wifi and battery icon for KK
...
* commit 'd519f7424fd2faad371e7678b3dc11114fa5222f':
Layoutlib: Update wifi and battery icon for KK
2014-08-16 06:04:07 +00:00
Deepanshu Gupta
d519f7424f
am b6c923a2: am 59eedf52: Layoutlib: Update wifi and battery icon for KK
...
* commit 'b6c923a2dfd86eb56a8f83d5a27f21996331e436':
Layoutlib: Update wifi and battery icon for KK
2014-08-16 05:53:49 +00:00
Deepanshu Gupta
b6c923a2df
am 59eedf52: Layoutlib: Update wifi and battery icon for KK
...
* commit '59eedf528ca29a32b6d7f358f5076929f8fbb164':
Layoutlib: Update wifi and battery icon for KK
2014-08-16 05:45:42 +00:00
Jae Seo
c1e623d594
am d250789a: TIF: Make passthrough related method names consistent
...
* commit 'd250789a59c967cdefa3b3e0746f2d3d44b812fe':
TIF: Make passthrough related method names consistent
2014-08-16 05:00:27 +00:00
Jae Seo
c22d0c0941
TIF: Make passthrough related method names consistent
...
Bug: 17063792
Change-Id: Id76b37ae1507db5d78319b8786b395353ded70e1
2014-08-16 04:52:56 +00:00
Selim Cinek
f86d4055fb
Merge "Removed bugreport tile code from Quick settings" into lmp-dev
2014-08-16 04:36:39 +00:00
Selim Cinek
3f11dede31
Removed bugreport tile code from Quick settings
...
And also the corresponding string / drawable
Bug: 15385554
Change-Id: If1482a20274439891e6dda1f9f2f8b6a26ed2b51
2014-08-19 13:09:36 +02:00
Esteban Talavera
12450c72eb
Merge "Add cross profile intent in order after intent filter resolution" into lmp-dev
2014-08-16 04:36:39 +00:00
Esteban Talavera
54edd1cdc4
Add cross profile intent in order after intent filter resolution
...
The elements returned by queryIntentActivities must be in order, as specified in the Javadoc. Otherwise the ResolverActivity will incorrectly filter out intents if they follow another intent with lower priority than the ones that will be shown to the user.
Bug: 15906680
Change-Id: I755e05d3017ee124cbae468f51fa86cfdf42b483
2014-08-18 14:11:47 +01:00
Selim Cinek
29e3080a6f
Merge "Fixed accessibility issues with quick settings" into lmp-dev
2014-08-16 04:36:37 +00:00
Selim Cinek
e5557a972c
Fixed accessibility issues with quick settings
...
The dual mode tiles now have better accessibility descriptions,
where the label is now seperate from the clickable button.
Also fixed an anouncment problem with the battery indicators.
Finally fixed an issue where GPRS null was anounced when no signal
was available.
Bug: 15682124
Bug: 15696954
Change-Id: Ica2b70173e64d51747b100d0b686875fc8076e6f
2014-08-18 22:32:34 +02:00
John Spurlock
73f84480af
Merge "Zen: Remove "allow disable" filter from noman." into lmp-dev
2014-08-16 04:32:18 +00:00
John Spurlock
dd753c00d5
Zen: Remove "allow disable" filter from noman.
...
No longer used by dialer.
Bug:15344099
Change-Id: Ib2d00804f671fae520303531e8ccde9e44f817ec
2014-08-19 16:16:58 -04:00
Lorenzo Colitti
35f39b6660
Merge "Stop using LinkProperties for static configuration." into lmp-dev
2014-08-16 04:32:18 +00:00
Lorenzo Colitti
0a82e80073
Stop using LinkProperties for static configuration.
...
LinkProperties can represent way more complicated configurations
than what we can actually apply to interfaces. This makes it
error-prone to use it to represent static configuration, both
when trying to apply configuration coming from LinkProperties
and when trying to save configuration from current
LinkProperties.
Instead, move static configuration (IPv4 only, since we don't
support static IPv6 configuration) into a separate
StaticIpConfiguration class.
Bug: 16114392
Bug: 16893413
Change-Id: Ib33f35c004e30b6067bb20235ffa43c247d174df
2014-08-19 11:59:43 -07:00
John Spurlock
fc12e6f1da
Merge "Revert workaround for network limit dialog." into lmp-dev
2014-08-16 04:32:18 +00:00
John Spurlock
169126bf4d
Revert workaround for network limit dialog.
...
Restore the window type now that it no longer crashes.
This reverts https://googleplex-android-review.git.corp.google.com/#/c/527371/
Bug:17102499
Change-Id: Ifb93a959a693b5925712ae82192c80790b6aefb1
2014-08-19 12:40:02 -04:00
Dianne Hackborn
ccc8c29af1
Merge "Fix issue #17114392 : android.com.phone crashes - PackageManager code" into lmp-dev
2014-08-16 04:32:18 +00:00
Dianne Hackborn
4a88bf9985
Fix issue #17114392 : android.com.phone crashes - PackageManager code
...
Change-Id: Ib02119c6f313384a73fa7cb7b2b62dbd716fa6ca
2014-08-18 18:07:23 -07:00
Dianne Hackborn
249a7fdf44
Merge "Temporary: raise overflow limit, print all wake locks." into lmp-dev
2014-08-16 04:32:18 +00:00
Dianne Hackborn
acc4a12074
Temporary: raise overflow limit, print all wake locks.
...
Change-Id: I02baa775b8e0659bd9cd4547b8671730f056cb86
2014-08-18 16:33:44 -07:00
Svetoslav
33903c839c
Merge "Update the print spooler icon." into lmp-dev
2014-08-16 04:32:18 +00:00
Svetoslav
309f6a0e1b
Update the print spooler icon.
...
Removed a duplicate resource also defined in the platform
resources. Added a tint to the print spooler icon.
bug:16568027
Change-Id: I1c0b9a7bd75bc59d1d86653c05d8fc2bb77056c1
2014-08-18 23:37:56 +00:00
Andy Hung
2aaed141fa
Merge "Fix 48kHz limitation on AudioTrack" into lmp-dev
2014-08-16 04:32:18 +00:00