Chad Brubaker
ff400f3229
Merge "Allow debug-overrides to be specified in an extra resource" into nyc-dev
...
am: 8064b4a687
2016-03-09 20:50:14 +00:00
Chad Brubaker
8064b4a687
Merge "Allow debug-overrides to be specified in an extra resource" into nyc-dev
2016-03-09 20:45:23 +00:00
Alan Viverette
60adb4d264
Merge "Clean up SimpleMonthView formatters" into nyc-dev
...
am: 366e137c0e
2016-03-09 18:48:54 +00:00
Alan Viverette
366e137c0e
Merge "Clean up SimpleMonthView formatters" into nyc-dev
2016-03-09 18:40:47 +00:00
Chris Wren
2be6b136a8
Merge "add a ranking service to the rocket" into nyc-dev
...
am: a82662e3f5
2016-03-09 16:47:46 +00:00
Alan Viverette
669b25d58e
Merge "Set DatePickerListener last during DatePickerDialog construction" into nyc-dev
...
am: 2c18cd0823
2016-03-09 16:28:52 +00:00
Robin Lee
c3152fe087
Merge "Corrections to javadoc for install & removeKeyPair" into nyc-dev
...
am: 9acee934de
2016-03-09 16:28:51 +00:00
Chris Wren
a82662e3f5
Merge "add a ranking service to the rocket" into nyc-dev
2016-03-09 16:26:56 +00:00
Alan Viverette
2c18cd0823
Merge "Set DatePickerListener last during DatePickerDialog construction" into nyc-dev
2016-03-09 15:52:35 +00:00
Robin Lee
9acee934de
Merge "Corrections to javadoc for install & removeKeyPair" into nyc-dev
2016-03-09 15:48:25 +00:00
Robin Lee
a1b290e11a
Corrections to javadoc for install & removeKeyPair
...
Making these more consistent - refer to 'certificate and private key
pair' in titles instead of 'credentials'. It is still used in one place
where 'credentials' makes sense.
Bug: 27533004
Change-Id: Ied80017c6f391646b10921b011be35eea113373f
2016-03-09 14:38:36 +00:00
Paul Lawrence
3cb05abdb2
Merge "Add API to IMountService to get encryption state" into nyc-dev
...
am: d5a3f3df40
2016-03-09 13:48:43 +00:00
Paul Lawrence
d5a3f3df40
Merge "Add API to IMountService to get encryption state" into nyc-dev
2016-03-09 13:42:41 +00:00
Gustav Sennton
e3958be429
Merge "Allow disk reads during more parts of WebView loading." into nyc-dev
...
am: c48b082dbb
2016-03-09 13:05:31 +00:00
Gustav Sennton
c48b082dbb
Merge "Allow disk reads during more parts of WebView loading." into nyc-dev
2016-03-09 12:59:03 +00:00
Martijn Coenen
a249556f80
Merge "API to query which cores are exclusively assigned." into nyc-dev
...
am: 2612bbc0f5
2016-03-09 10:37:45 +00:00
Martijn Coenen
2612bbc0f5
Merge "API to query which cores are exclusively assigned." into nyc-dev
2016-03-09 10:31:03 +00:00
Tony Mak
2997ac4b0a
Merge "Update comment about enterprise contact id and lookup key" into nyc-dev
...
am: 41371b5fe0
2016-03-09 10:10:23 +00:00
Tony Mak
41371b5fe0
Merge "Update comment about enterprise contact id and lookup key" into nyc-dev
2016-03-09 10:05:27 +00:00
Keisuke Kuroyanagi
195c688756
Merge "Make drag&drop be atomic for undo/redo." into nyc-dev
...
am: 12298bb64c
2016-03-09 07:18:13 +00:00
Keisuke Kuroyanagi
fae4578311
Make drag&drop be atomic for undo/redo.
...
For undo/redo, drag&drop is recorded as a 2 operations, paste and
delete. This CL makes drag&drop be atomic operation to be properly
undoed/redoed.
Bug: 27268820
Change-Id: Ia38d663f046c2c65f348985934f5cfa054b0437e
2016-03-09 06:07:01 +00:00
Shuzhen Wang
a9382b068e
Merge "Camera2: Handle binder death on ICameraDeviceUser" into nyc-dev
...
am: f52ebd119e
2016-03-09 03:47:04 +00:00
Shuzhen Wang
f52ebd119e
Merge "Camera2: Handle binder death on ICameraDeviceUser" into nyc-dev
2016-03-09 03:43:01 +00:00
Muyuan Li
26aac3978d
Merge "Partial screenshot" into nyc-dev
...
am: a8446ef782
2016-03-09 02:42:45 +00:00
Muyuan Li
a8446ef782
Merge "Partial screenshot" into nyc-dev
2016-03-09 02:36:52 +00:00
Makoto Onuki
6e6a3ed250
Merge "Implement LauncherApps.startShortcut()." into nyc-dev
...
am: 76cb56bb21
2016-03-09 01:43:46 +00:00
Makoto Onuki
76cb56bb21
Merge "Implement LauncherApps.startShortcut()." into nyc-dev
2016-03-09 01:38:37 +00:00
Abhijith Shastry
3aea500d9b
Merge "Document that emergency numbers will not be blocked by the platform." into nyc-dev
...
am: d1a766e820
2016-03-09 01:26:59 +00:00
Makoto Onuki
43204b8357
Implement LauncherApps.startShortcut().
...
Bug 27548047
Change-Id: I357732e22be0959fb573fd6cdaee7c6b439ef7c4
2016-03-08 17:26:28 -08:00
Abhijith Shastry
d1a766e820
Merge "Document that emergency numbers will not be blocked by the platform." into nyc-dev
2016-03-09 01:22:21 +00:00
Abhijith Shastry
e3e686cff8
Document that emergency numbers will not be blocked by the platform.
...
BUG: 27534486
Change-Id: Idd339ca16e2b754112fc5d0966a7cf76d9990c98
2016-03-08 16:55:01 -08:00
Yohei Yukawa
adf00fb062
Merge "Dump spell checker service info from TSMS." into nyc-dev
...
am: bc234bb9b6
2016-03-09 00:21:21 +00:00
Alan Viverette
4d1ad994d3
Set DatePickerListener last during DatePickerDialog construction
...
Prevents us from calling the listener before we're fully set up.
Bug: 27475444
Change-Id: I0def384b60c09c44d36e60503ddb8434055dfb6f
2016-03-08 18:48:47 -05:00
Shuzhen Wang
783929368b
Camera2: Handle binder death on ICameraDeviceUser
...
Call onError(CAMERA_SERVICE) when binder death happens on ICameraDeviceUser.
Bug: 27206055
Change-Id: Ic720933d057559966556658d478ff6d3536f0e3f
2016-03-08 15:47:32 -08:00
Yohei Yukawa
bc234bb9b6
Merge "Dump spell checker service info from TSMS." into nyc-dev
2016-03-08 23:44:23 +00:00
Yohei Yukawa
85df698df5
Dump spell checker service info from TSMS.
...
This is a preparation CL to make TextServicesManagerService (TSMS)
encryption-aware.
This CL changes nothing except for the output of TSMS#dump().
To diagnose File-Based Encryption (FBE) related issues, it would be
useful if we can see if each spell checker service is encryption-aware
or not. To do that this CL updates TSMS#dump() so that it can include
the result of ResolveInfo#dump() as we have done in
InputMethodManagerService.
This CL also updates TSMS#dump() so that its output can be more
consistent with IMMS#dump().
Bug: 27456430
Change-Id: Ie2321278f1d52533a3cd74d98f1f84c950a8f6d0
2016-03-08 15:16:07 -08:00
Sudheer Shanka
6f0d578ea9
Merge "Update DPM.getWifiMacAddress to take admin component as argument." into nyc-dev
...
am: 97e89c624e
2016-03-08 23:09:23 +00:00
Paul Lawrence
20be5d6247
Add API to IMountService to get encryption state
...
Bug: 18002358
Change-Id: If7d9c9a5ed38ac37849fcf638ec10c76d2f419a1
2016-03-08 15:03:54 -08:00
Sudheer Shanka
97e89c624e
Merge "Update DPM.getWifiMacAddress to take admin component as argument." into nyc-dev
2016-03-08 22:52:11 +00:00
Selim Cinek
47bc04b0b0
Merge "Fixed a bug where the font sizes where not enforced correctly" into nyc-dev
...
am: c5ce69f555
2016-03-08 22:27:42 +00:00
Chris Wren
0efdb88ccc
add a ranking service to the rocket
...
Bug: 22960980
Change-Id: Ic0e911a2f048a4b47171b338c3de13125852be43
2016-03-08 17:23:33 -05:00
Selim Cinek
c5ce69f555
Merge "Fixed a bug where the font sizes where not enforced correctly" into nyc-dev
2016-03-08 22:16:44 +00:00
Muyuan Li
6ca619fe1a
Partial screenshot
...
Added a partial screenshot function in TakeScreenshotService
also added corresponding shortcut keys in PhoneWindowManager
Bug: 26820467
Change-Id: Id67cd3b4b0eed848eb4665056766546500bdac88
(cherry picked from commit 03e45541e9d54a2f285906ac7b5bcb374db14495)
2016-03-08 14:12:18 -08:00
Adrian Roos
336256e1f6
Merge "Fix and optimize stripForDelivery" into nyc-dev
...
am: 37b3a4a544
2016-03-08 21:50:32 +00:00
Adrian Roos
37b3a4a544
Merge "Fix and optimize stripForDelivery" into nyc-dev
2016-03-08 21:47:03 +00:00
mariagpuyol
382caadcd8
Merge "Fix bug in setText" into nyc-dev
...
am: eff0a83a23
2016-03-08 21:19:01 +00:00
George Mount
dd37121f8a
Merge "Fix propagation delay not working with minimum value = 0" into nyc-dev
...
am: 193b821829
2016-03-08 21:11:19 +00:00
Maria Garcia Puyol
eff0a83a23
Merge "Fix bug in setText" into nyc-dev
2016-03-08 21:04:27 +00:00
George Mount
193b821829
Merge "Fix propagation delay not working with minimum value = 0" into nyc-dev
2016-03-08 21:03:16 +00:00
mariagpuyol
3dc88c8f14
Fix bug in setText
...
Bug:27547655
Change-Id: Ia15facda59fab9a8fe9b30f74ddd085bc26871af
2016-03-08 11:45:39 -08:00
