Mark Lu
9c834b1241
docs: update Paint.setTextSize() to indicate pixel units
...
am: 5f05256106
2016-12-19 20:16:15 +00:00
Mark Lu
cbfb58c9d7
Merge "docs: remove implicit intent from bindService and startService" into nyc-mr1-dev
2016-12-19 20:13:20 +00:00
TreeHugger Robot
68b86f19f7
Merge "Fix malformed log statement."
2016-12-19 20:06:18 +00:00
TreeHugger Robot
dd0f83f393
Merge "Fixing NPE when checking locked state."
2016-12-19 20:02:18 +00:00
Brad Ebinger
73dcab62b7
Merge "Add UI prompt for MMI code failure on 3gpp" into nyc-mr2-dev
2016-12-19 19:53:05 +00:00
sergeyv
57eafc6f90
Throw exception if getPixel(s) is called on a hardware bitmap
...
Test: android.graphics.cts.BitmapTest#testHardwareGetPixel
bug:30999911
Change-Id: Ifa5a80d048c44c91122e9e7c79ca3ef9ecab963e
2016-12-19 11:52:06 -08:00
Winson Chung
b6b9950d13
Fixing NPE when checking locked state.
...
- Regression from change 9f4ab32b1c
2016-12-19 19:50:18 +00:00
Android Build Merger (Role)
1ecd836762
Merge "Merge "Merge "Fix OnCancelListener for Dialogs on swipe to dismiss." into cw-f-dev am: a586b546c3 am: 5109de9bd3" into nyc-mr2-dev-plus-aosp am: 09583bdc88"
2016-12-19 19:41:13 +00:00
Android Build Merger (Role)
7b7c520880
Merge "Merge "Fix OnCancelListener for Dialogs on swipe to dismiss." into cw-f-dev am: a586b546c3 am: 5109de9bd3 am: a922beb6ec"
2016-12-19 19:40:48 +00:00
Charles Mendis
db149d44ff
Merge "Merge "Fix OnCancelListener for Dialogs on swipe to dismiss." into cw-f-dev am: a586b546c3 am: 5109de9bd3" into nyc-mr2-dev-plus-aosp
...
am: 09583bdc88
2016-12-19 19:39:46 +00:00
Charles Mendis
eeb97cd1e1
Merge "Fix OnCancelListener for Dialogs on swipe to dismiss." into cw-f-dev am: a586b546c3 am: 5109de9bd3
...
am: a922beb6ec
2016-12-19 19:39:39 +00:00
Android Build Merger (Role)
b329fb195a
Merge "Merge "Merge "Fix OnCancelListener for Dialogs on swipe to dismiss." into cw-f-dev am: a586b546c3 am: 63fb5ccc17" into nyc-mr2-dev-plus-aosp am: e85cf6ef20"
2016-12-19 19:39:15 +00:00
Android Build Merger (Role)
0ece906904
Merge "Merge "Fix OnCancelListener for Dialogs on swipe to dismiss." into cw-f-dev am: a586b546c3 am: 63fb5ccc17 am: 174671b698"
2016-12-19 19:38:48 +00:00
Charles Mendis
219d4e96e5
Merge "Merge "Fix OnCancelListener for Dialogs on swipe to dismiss." into cw-f-dev am: a586b546c3 am: 63fb5ccc17" into nyc-mr2-dev-plus-aosp
...
am: e85cf6ef20
2016-12-19 19:37:58 +00:00
Charles Mendis
7fe4589246
Merge "Fix OnCancelListener for Dialogs on swipe to dismiss." into cw-f-dev am: a586b546c3 am: 63fb5ccc17
...
am: 174671b698
2016-12-19 19:37:54 +00:00
Android Build Merger (Role)
78da505cc7
Merge "Merge "Fix OnCancelListener for Dialogs on swipe to dismiss. am: 67639a5f67 am: a2160c27f9" into nyc-mr2-dev-plus-aosp am: 07ff764573"
2016-12-19 19:37:28 +00:00
Android Build Merger (Role)
10d76e1403
Merge "Fix OnCancelListener for Dialogs on swipe to dismiss. am: 67639a5f67 am: a2160c27f9 am: 34df02eec2"
2016-12-19 19:37:01 +00:00
Michael Kwan
afa00edf30
Merge "Fix OnCancelListener for Dialogs on swipe to dismiss. am: 67639a5f67 am: a2160c27f9" into nyc-mr2-dev-plus-aosp
...
am: 07ff764573
2016-12-19 19:36:10 +00:00
Michael Kwan
182e92c0bb
Fix OnCancelListener for Dialogs on swipe to dismiss. am: 67639a5f67 am: a2160c27f9
...
am: 34df02eec2
2016-12-19 19:36:01 +00:00
Android Build Merger (Role)
c5114da920
Merge "Fix OnCancelListener for Dialogs on swipe to dismiss. am: 67639a5f67 am: 5a0c0ffd03 am: 95ccfb0dcc"
2016-12-19 19:35:32 +00:00
Michael Kwan
cd6be5bdab
Fix OnCancelListener for Dialogs on swipe to dismiss. am: 67639a5f67 am: 5a0c0ffd03
...
am: 95ccfb0dcc
2016-12-19 19:34:41 +00:00
Roozbeh Pournader
2c755f2bef
Merge "Add unit tests for apostrophe for WordIterator"
2016-12-19 19:34:16 +00:00
Roozbeh Pournader
f6952b8331
Expand characters temporarily skipped in spellchecking
...
An earlier patch (I4d09576a31df551c96f820242fd2cbc675506dae)
special-cased apostrophe as a character to defer spellchecking on,
since it could cause a word break which could later get removed.
This patch updates that earlier patch to include all characters that
could cause such a behavior according the Unicode word breaking
algorithm defined in UAX #29 .
Bug: 17641350
Bug: 17673522
Test: manual
Change-Id: I4029e3d91dfcf96665b003f6fdd30d1208b0ac7c
2016-12-19 11:31:07 -08:00
Marie Janssen
ea17d37f3e
Merge changes I546d7abc,I32163278 into nyc-mr2-dev am: df37f1fa74
...
am: 75bb16acc7
2016-12-19 19:28:19 +00:00
Marie Janssen
543ca74e60
Bluetooth: fix issues re-enabling after crash am: fa63068deb
...
am: 6b93f50989
2016-12-19 19:27:25 +00:00
Marie Janssen
cf9da14cda
resolve merge conflicts of ffcf88f to nyc-mr2-dev-plus-aosp
...
am: 5e9774c184
2016-12-19 19:26:13 +00:00
Joe LaPenna
68685240f5
Remove "final" from ResultCallback.
...
Removing final makes providers easier to test using mocks.
Test: Build system image.
Change-Id: Iaaa30f73226e1d0cb0e9e68faa349e86986be72d
Merged-In: Iaaa30f73226e1d0cb0e9e68faa349e86986be72d
2016-12-19 11:25:45 -08:00
Philipp Weiß
fb5affed50
Merge "DO NOT MERGE Add network logging icon to Quicksettings when enabled" into nyc-mr2-dev am: f84f98c4e2
...
am: 5c49897d8c
2016-12-19 19:25:09 +00:00
phweiss
833baff61a
DO NOT MERGE Add network logging icon to Quicksettings when enabled am: c94b637305
...
am: 5edfd11bea
2016-12-19 19:24:03 +00:00
Daniel Sandler
41af2dbfa3
Merge "Avoid NPE in notification inline controls." into nyc-mr2-dev am: be09dd77dc
...
am: 946ae62dba
2016-12-19 19:23:01 +00:00
Dan Sandler
dc1ba72a60
Avoid NPE in notification inline controls. am: 6e54b889d0
...
am: 0f82af28ef
2016-12-19 19:21:57 +00:00
Android Build Merger (Role)
09583bdc88
Merge "Merge "Fix OnCancelListener for Dialogs on swipe to dismiss." into cw-f-dev am: a586b546c3 am: 5109de9bd3" into nyc-mr2-dev-plus-aosp
2016-12-19 19:20:16 +00:00
Android Build Merger (Role)
e85cf6ef20
Merge "Merge "Fix OnCancelListener for Dialogs on swipe to dismiss." into cw-f-dev am: a586b546c3 am: 63fb5ccc17" into nyc-mr2-dev-plus-aosp
2016-12-19 19:19:36 +00:00
Charles Mendis
a922beb6ec
Merge "Fix OnCancelListener for Dialogs on swipe to dismiss." into cw-f-dev am: a586b546c3
...
am: 5109de9bd3
2016-12-19 19:19:19 +00:00
Android Build Merger (Role)
07ff764573
Merge "Fix OnCancelListener for Dialogs on swipe to dismiss. am: 67639a5f67 am: a2160c27f9" into nyc-mr2-dev-plus-aosp
2016-12-19 19:18:57 +00:00
Charles Mendis
174671b698
Merge "Fix OnCancelListener for Dialogs on swipe to dismiss." into cw-f-dev am: a586b546c3
...
am: 63fb5ccc17
2016-12-19 19:18:51 +00:00
Michael Kwan
34df02eec2
Fix OnCancelListener for Dialogs on swipe to dismiss. am: 67639a5f67
...
am: a2160c27f9
2016-12-19 19:17:56 +00:00
Michael Kwan
95ccfb0dcc
Fix OnCancelListener for Dialogs on swipe to dismiss. am: 67639a5f67
...
am: 5a0c0ffd03
2016-12-19 19:17:48 +00:00
Manu Cornet
80fdf0428b
Merge "2D recents: polish the new task view layout algorithm"
2016-12-19 19:15:32 +00:00
Julia Reynolds
d5261e1d0a
Use userid of sender, not notification target.
...
When trying to find a package.
Bug: 33178040
Test: manual, ./vendor/google/tools/fake-ota on
Change-Id: I0b69c37f16e7e1763bff4df1650911fe3435bc77
2016-12-19 14:14:25 -05:00
Charles Mendis
63fb5ccc17
Merge "Fix OnCancelListener for Dialogs on swipe to dismiss." into cw-f-dev
...
am: a586b546c3
2016-12-19 19:11:52 +00:00
Michael Kwan
5a0c0ffd03
Fix OnCancelListener for Dialogs on swipe to dismiss.
...
am: 67639a5f67
2016-12-19 19:11:48 +00:00
Charles Mendis
5109de9bd3
Merge "Fix OnCancelListener for Dialogs on swipe to dismiss." into cw-f-dev
...
am: a586b546c3
2016-12-19 19:11:47 +00:00
Michael Kwan
a2160c27f9
Fix OnCancelListener for Dialogs on swipe to dismiss.
...
am: 67639a5f67
2016-12-19 19:11:45 +00:00
Charles Mendis
a586b546c3
Merge "Fix OnCancelListener for Dialogs on swipe to dismiss." into cw-f-dev
2016-12-19 19:05:53 +00:00
Marie Janssen
75bb16acc7
Merge changes I546d7abc,I32163278 into nyc-mr2-dev
...
am: df37f1fa74
2016-12-19 19:01:03 +00:00
Marie Janssen
6b93f50989
Bluetooth: fix issues re-enabling after crash
...
am: fa63068deb
2016-12-19 19:00:55 +00:00
sergeyv
f161dce70e
Add docs about Config.HARDWARE in Bitmap.writeToParcel method
...
Test: android.graphics.cts.BitmapTest#testWriteHwBitmapToParcel
bug:30999911
Change-Id: I5282df7d881d76f3e78979a2e5d3777f78673a5d
2016-12-19 10:56:27 -08:00
Android Build Merger (Role)
a001abb670
Merge "Merge "Initialize AtomicBoolean for NetworkLogger#mIsLoggingEnabled" into nyc-mr2-dev am: bd510de4e9 am: 5dcf480c0d"
2016-12-19 18:49:39 +00:00
Michal Karpinski
f89e931405
Merge "Initialize AtomicBoolean for NetworkLogger#mIsLoggingEnabled" into nyc-mr2-dev am: bd510de4e9
...
am: 5dcf480c0d
2016-12-19 18:48:28 +00:00
