OSDN Git Service
Chong Zhang [Thu, 5 Nov 2015 21:18:33 +0000 (13:18 -0800)]
Exclude system decor area from tap detection.
If we have system decor (status bar/ navigation bar), we want to
exclude that from the tap detection. Otherwise, if the app is partially
placed under some system button (eg. Recents, Home), pressing that
button would cause a full series of unwanted transfer focus/resume/pause,
before we could go home.
Change-Id: Idd408bd69f5064f906bb9f8e2b2385c26a6a6929
Chong Zhang [Wed, 4 Nov 2015 18:56:34 +0000 (18:56 +0000)]
Merge "Construct ActivityOptions near top level"
Filip Gruszczynski [Wed, 4 Nov 2015 18:55:06 +0000 (18:55 +0000)]
Merge "Remove blink during the freeform -> recents transition."
Adam Lesinski [Wed, 4 Nov 2015 18:50:27 +0000 (18:50 +0000)]
Merge "Use wakeup reason when FingerPrint sensor wakes up the device"
Geoff Mendal [Wed, 4 Nov 2015 18:44:31 +0000 (18:44 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev am:
8e7ab07ce7 -s ours am:
cbe037b01a -s ours am:
c5b905f500 -s ours
am:
6df893939e -s ours
* commit '
6df893939e765d910748cfd8a42473793919e9f3':
Import translations. DO NOT MERGE
John Reck [Wed, 4 Nov 2015 18:43:11 +0000 (18:43 +0000)]
Merge branch \'mnc-ub-dev\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into mnc-ub-dev am:
e22d81debd
am:
891e52ba29
* commit '
891e52ba296a33d0e51befa209c1ce14a2746991':
John Reck [Wed, 4 Nov 2015 18:41:49 +0000 (18:41 +0000)]
Merge "Revert "Use clang for libhwui"" into mnc-dr-dev am:
1e1fbd804b am:
f8635c2e04 am:
26f50df754
am:
392b0926aa -s ours
* commit '
392b0926aa19ae3856bfddbbeeeb7639f051a86b':
Revert "Use clang for libhwui"
Chong Zhang [Wed, 4 Nov 2015 01:27:26 +0000 (17:27 -0800)]
Construct ActivityOptions near top level
This saves some duplicate constructions of the ActivityOptions
object from Bundle.
Bug:
23755120
Change-Id: Ie8be54a2e4e84a6a1f3c51e4f2966f7fb0bf1c28
Geoff Mendal [Wed, 4 Nov 2015 18:28:47 +0000 (18:28 +0000)]
Import translations. DO NOT MERGE am:
4c9cdbc7ba -s ours am:
d4d6fdefdf -s ours am:
7c941cd30c -s ours
am:
68b7d59f3e -s ours
* commit '
68b7d59f3e278fb18ec6f2631f60341df40b0abc':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 4 Nov 2015 18:24:14 +0000 (18:24 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev am:
8e7ab07ce7 -s ours am:
cbe037b01a -s ours
am:
c5b905f500 -s ours
* commit '
c5b905f50069233c2769352a0614605b3ad348f8':
Import translations. DO NOT MERGE
John Reck [Wed, 4 Nov 2015 18:22:58 +0000 (18:22 +0000)]
Merge branch \'mnc-ub-dev\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into mnc-ub-dev
am:
e22d81debd
* commit '
e22d81debd8f2ac9432f42e4c1908da4400a1a29':
John Reck [Wed, 4 Nov 2015 18:21:35 +0000 (18:21 +0000)]
Merge "Revert "Use clang for libhwui"" into mnc-dr-dev am:
1e1fbd804b am:
f8635c2e04
am:
26f50df754
* commit '
26f50df75477a18e40c6da59a15cc2bd4b441239':
Revert "Use clang for libhwui"
Geoff Mendal [Wed, 4 Nov 2015 18:19:40 +0000 (18:19 +0000)]
Import translations. DO NOT MERGE am:
4c9cdbc7ba -s ours am:
d4d6fdefdf -s ours
am:
7c941cd30c -s ours
* commit '
7c941cd30c9c958c4776126f9f16b343f1f10ff3':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 4 Nov 2015 18:12:19 +0000 (18:12 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev am:
8e7ab07ce7 -s ours
am:
cbe037b01a -s ours
* commit '
cbe037b01ab25dfbab1cb6ea0fa137787e747ab7':
Import translations. DO NOT MERGE
John Reck [Wed, 4 Nov 2015 18:11:21 +0000 (18:11 +0000)]
Merge branch 'mnc-ub-dev' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into mnc-ub-dev
John Reck [Wed, 4 Nov 2015 18:10:52 +0000 (18:10 +0000)]
Merge "Revert "Use clang for libhwui"" into mnc-dr-dev am:
1e1fbd804b
am:
f8635c2e04
* commit '
f8635c2e043b6466f65cc0159a8f4021701d2165':
Revert "Use clang for libhwui"
John Reck [Wed, 4 Nov 2015 18:09:49 +0000 (18:09 +0000)]
Merge "Revert "Use clang for libhwui"" into mnc-dr-dev am:
1e1fbd804b
am:
f8635c2e04
* commit '
f8635c2e043b6466f65cc0159a8f4021701d2165':
Revert "Use clang for libhwui"
Geoff Mendal [Wed, 4 Nov 2015 18:08:13 +0000 (18:08 +0000)]
Import translations. DO NOT MERGE am:
4c9cdbc7ba -s ours
am:
d4d6fdefdf -s ours
* commit '
d4d6fdefdf83018e46e8de56f0e1679954bb398a':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 4 Nov 2015 18:00:48 +0000 (18:00 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
am:
8e7ab07ce7 -s ours
* commit '
8e7ab07ce76c20da653e098adfe38da867753305':
Import translations. DO NOT MERGE
John Reck [Wed, 4 Nov 2015 17:59:15 +0000 (17:59 +0000)]
Merge "Revert "Use clang for libhwui"" into mnc-dr-dev
am:
1e1fbd804b
* commit '
1e1fbd804b71419736eac4bf537f0a454687b209':
Revert "Use clang for libhwui"
Geoff Mendal [Wed, 4 Nov 2015 17:57:51 +0000 (17:57 +0000)]
Import translations. DO NOT MERGE
am:
4c9cdbc7ba -s ours
* commit '
4c9cdbc7ba72d6dc09e0f2bacbf8641c764045ca':
Import translations. DO NOT MERGE
Filip Gruszczynski [Tue, 3 Nov 2015 23:53:55 +0000 (15:53 -0800)]
Remove blink during the freeform -> recents transition.
We achieve the desired result by prolonging the last frame of the
animation until recents tells that it drew its content. The CL also
includes cleanup that moves code that depends heavily on WindowState
fields into that class.
Bug:
24913782
Change-Id: I5ee5b18504dd4a86c24033d17eca21cd31936bca
Geoff Mendal [Wed, 4 Nov 2015 17:47:45 +0000 (17:47 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
Geoff Mendal [Wed, 4 Nov 2015 17:47:04 +0000 (17:47 +0000)]
Merge "Import translations. DO NOT MERGE"
Geoff Mendal [Wed, 4 Nov 2015 17:40:21 +0000 (11:40 -0600)]
Import translations. DO NOT MERGE
Change-Id: Icad182fa5b410d93f43fcba49a0d07cefed7970c
Auto-generated-cl: translation import
John Reck [Wed, 4 Nov 2015 17:24:07 +0000 (17:24 +0000)]
Merge "Fix GCC build"
Geoff Mendal [Wed, 4 Nov 2015 17:16:22 +0000 (11:16 -0600)]
Import translations. DO NOT MERGE
Change-Id: I84475a6361421bfbe49288943a14f1c8996a7801
Auto-generated-cl: translation import
Clara Bayarri [Thu, 22 Oct 2015 15:09:52 +0000 (16:09 +0100)]
Intercept activity start with ConfirmCredentials
When the calling user is a work profile and the device has
file based encryption enabled, show the work challenge via the
Confirm Credentials APIs before launching the requested activity.
A companion CL in Settings will add support to the Confirm
Credentials flow to read the given intent extra and fire it when
the authorization succeeds.
This is part of the Separate Work Challenge feature.
Note nobody will see this yet as the feature is conditioned by
file based encryption.
Change-Id: I303890095936b1fd1f6a99d645724dffba144345
Clara Bayarri [Wed, 4 Nov 2015 16:35:51 +0000 (16:35 +0000)]
Merge "Create a File Based Encryption check API"
Glenn Kasten [Wed, 4 Nov 2015 16:27:58 +0000 (16:27 +0000)]
Merge "Built-in mic is not used when USB mic is disconnected" am:
ebbdabdb82 am:
1104180301
am:
d1323e9b70
* commit '
d1323e9b70f94796491cad4132982fd4664395b0':
Built-in mic is not used when USB mic is disconnected
John Reck [Wed, 4 Nov 2015 16:24:02 +0000 (16:24 +0000)]
Merge "Revert "Use clang for libhwui"" into mnc-dr-dev
Glenn Kasten [Wed, 4 Nov 2015 16:19:36 +0000 (16:19 +0000)]
Merge "Built-in mic is not used when USB mic is disconnected" am:
ebbdabdb82
am:
1104180301
* commit '
110418030167702f29fa686616d68fc62f9c0995':
Built-in mic is not used when USB mic is disconnected
Glenn Kasten [Wed, 4 Nov 2015 16:10:44 +0000 (16:10 +0000)]
Merge "Built-in mic is not used when USB mic is disconnected"
am:
ebbdabdb82
* commit '
ebbdabdb826c083769e7d7bc102a59a04c9e0329':
Built-in mic is not used when USB mic is disconnected
Glenn Kasten [Wed, 4 Nov 2015 16:03:41 +0000 (16:03 +0000)]
Merge "Built-in mic is not used when USB mic is disconnected"
Alejandro Ochoa [Sat, 31 Oct 2015 02:05:00 +0000 (20:05 -0600)]
Built-in mic is not used when USB mic is disconnected
In some cases when the USB microphone is disconnected,
audio stack does not switch to the built-in microphone.
It gets stuck in a state where it still recognizes the
USB mic is still connected. Current device removal
implementation only considers USB output devices such
as headset. The same process should be used for input
USB devices (microphone).
Bug:
24932354
Change-Id: Ic2089ef5a9a318cb47336ade405f79eccd7129f8
Signed-off-by: Alejandro Ochoa <alejandro.ochoa@intel.com>
John Reck [Wed, 4 Nov 2015 15:39:44 +0000 (07:39 -0800)]
Fix GCC build
Change-Id: I990993b8b751bdaf41ce4db1aa7e28823f296777
Alan Viverette [Wed, 4 Nov 2015 15:22:58 +0000 (15:22 +0000)]
Merge "Reduce CascadingMenuPopup's reliance on internal ListView state"
John Reck [Wed, 4 Nov 2015 15:21:35 +0000 (15:21 +0000)]
Revert "Use clang for libhwui"
Bug
25462107
This reverts commit
d354fd2c66855d116440eb4c936317f124241225.
Change-Id: Ib7c50b5becf247f837f3cc20f9128d9411d22563
Alan Viverette [Wed, 4 Nov 2015 15:09:27 +0000 (15:09 +0000)]
Merge "Always call legacy performLongClick()"
Geoff Mendal [Wed, 4 Nov 2015 15:03:47 +0000 (15:03 +0000)]
Merge "Import translations. DO NOT MERGE"
Geoff Mendal [Wed, 4 Nov 2015 14:59:32 +0000 (06:59 -0800)]
Import translations. DO NOT MERGE
Change-Id: I4d14bf278e491e46eeaabd4bb97641d06c48920c
Auto-generated-cl: translation import
Geoff Mendal [Wed, 4 Nov 2015 14:56:32 +0000 (06:56 -0800)]
Import translations. DO NOT MERGE
Change-Id: I8adfd4484cde6c32adab9b939cb7698370e2ec6f
Auto-generated-cl: translation import
Diego Perez [Wed, 4 Nov 2015 14:44:20 +0000 (14:44 +0000)]
Merge "Remove auto-boxing during the inflate" into mnc-ub-dev am:
1c442aca0a
am:
7cdbfaf459
* commit '
7cdbfaf459ede7ede430188ed4b1a990ba762144':
Remove auto-boxing during the inflate
Diego Perez [Wed, 4 Nov 2015 14:42:58 +0000 (14:42 +0000)]
Merge "Update StaticLayout_Delegate to use new nLoadHyphenator" into mnc-ub-dev am:
7dda46e740
am:
724af9ce6f
* commit '
724af9ce6fceb9ddf2ef4536d0da41a520928d5e':
Update StaticLayout_Delegate to use new nLoadHyphenator
Diego Perez [Wed, 4 Nov 2015 14:35:39 +0000 (14:35 +0000)]
Merge "Remove auto-boxing during the inflate" into mnc-ub-dev
am:
1c442aca0a
* commit '
1c442aca0a1b054e3aa0a40ba89c08b39099be2f':
Remove auto-boxing during the inflate
Geoff Mendal [Wed, 4 Nov 2015 14:35:29 +0000 (14:35 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev am:
931082b728 -s ours am:
b67481b336 -s ours
am:
9a4b6b9094 -s ours
* commit '
9a4b6b909487b61120fb085864533b70a9dabeb8':
Import translations. DO NOT MERGE
Diego Perez [Wed, 4 Nov 2015 14:34:19 +0000 (14:34 +0000)]
Merge "Update StaticLayout_Delegate to use new nLoadHyphenator" into mnc-ub-dev
am:
7dda46e740
* commit '
7dda46e740250d753bb9d01e129e91695ab8cfe2':
Update StaticLayout_Delegate to use new nLoadHyphenator
Geoff Mendal [Wed, 4 Nov 2015 14:34:12 +0000 (14:34 +0000)]
Import translations. DO NOT MERGE am:
f44adbba69 -s ours am:
5bf5deb84c -s ours
am:
f587cfec79 -s ours
* commit '
f587cfec79cd6eaab2b83b902ab5663b6adbfb86':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 4 Nov 2015 14:27:19 +0000 (14:27 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev am:
931082b728 -s ours
am:
b67481b336 -s ours
* commit '
b67481b336d211c6d96e2110e865b55f615fd9df':
Import translations. DO NOT MERGE
Diego Perez [Wed, 4 Nov 2015 14:26:15 +0000 (14:26 +0000)]
Merge "Remove auto-boxing during the inflate" into mnc-ub-dev
Diego Perez [Wed, 4 Nov 2015 14:25:58 +0000 (14:25 +0000)]
Merge "Update StaticLayout_Delegate to use new nLoadHyphenator" into mnc-ub-dev
Geoff Mendal [Wed, 4 Nov 2015 14:25:55 +0000 (14:25 +0000)]
Import translations. DO NOT MERGE am:
f44adbba69 -s ours
am:
5bf5deb84c -s ours
* commit '
5bf5deb84cdc61aa27ea12695ee20cc308e45184':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 4 Nov 2015 14:14:25 +0000 (14:14 +0000)]
Merge "Import translations. DO NOT MERGE"
Geoff Mendal [Wed, 4 Nov 2015 14:09:51 +0000 (14:09 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev
am:
931082b728 -s ours
* commit '
931082b728a42e0b22b163721d7d48faf23d45a4':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 4 Nov 2015 14:08:19 +0000 (14:08 +0000)]
Import translations. DO NOT MERGE
am:
f44adbba69 -s ours
* commit '
f44adbba69c22e4c9cd681bbb3cab70097eae118':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 4 Nov 2015 14:03:56 +0000 (14:03 +0000)]
Merge "Import translations. DO NOT MERGE"
Geoff Mendal [Wed, 4 Nov 2015 13:57:12 +0000 (05:57 -0800)]
Import translations. DO NOT MERGE
Change-Id: Id927a7b437f398a9e468e1fa105bce3c7bb4b356
Auto-generated-cl: translation import
Geoff Mendal [Wed, 4 Nov 2015 13:40:02 +0000 (05:40 -0800)]
Import translations. DO NOT MERGE
Change-Id: I8b90890aff385da901c6a66ac485ddb2560f1cbc
Auto-generated-cl: translation import
Geoff Mendal [Wed, 4 Nov 2015 13:38:21 +0000 (13:38 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev
Geoff Mendal [Wed, 4 Nov 2015 13:23:43 +0000 (05:23 -0800)]
Import translations. DO NOT MERGE
Change-Id: I06b7fdd459fbb74d91376bc93ae8d035145d2234
Auto-generated-cl: translation import
Geoff Mendal [Wed, 4 Nov 2015 13:20:46 +0000 (07:20 -0600)]
Import translations. DO NOT MERGE
Change-Id: I7c47fb535cfa65f435efe21fd59118039b6359f5
Auto-generated-cl: translation import
Geoff Mendal [Wed, 4 Nov 2015 13:09:10 +0000 (05:09 -0800)]
Import translations. DO NOT MERGE
Change-Id: I52024255e1324f3757497603d692def1fec6e75f
Auto-generated-cl: translation import
Clara Bayarri [Wed, 28 Oct 2015 17:53:53 +0000 (17:53 +0000)]
Create a File Based Encryption check API
Change-Id: Ibf41f98818ea801b9f690200c340be80c3b9bf31
Diego Perez [Wed, 4 Nov 2015 11:35:34 +0000 (11:35 +0000)]
Update StaticLayout_Delegate to use new nLoadHyphenator
Small fix to update call parameters
Change-Id: I4322aa212493ec2970ae17ec1918b9b7e2f8e93a
Daichi Hirono [Wed, 4 Nov 2015 05:45:24 +0000 (05:45 +0000)]
Merge "Extends MtpDatabase so that it can handle child documents."
Daichi Hirono [Mon, 26 Oct 2015 07:39:54 +0000 (16:39 +0900)]
Extends MtpDatabase so that it can handle child documents.
The CL extracts common routines for root documents and child documents,
adds new methods for child documents, and let the common routines from
the new methods.
BUG=
25162822
Change-Id: Ie6f0092e584ae12c89d43593701debeb76f6f3cb
Chong Zhang [Wed, 4 Nov 2015 02:35:33 +0000 (02:35 +0000)]
Merge "Save window when an app died while it's visible"
Chong Zhang [Mon, 2 Nov 2015 19:17:00 +0000 (11:17 -0800)]
Save window when an app died while it's visible
- If an app died visible, keep the dead window and leave it on screen.
- Apply 50% dim over the dead window to indicate it's no longer active.
- Monitor touch inputs on the dead window and restart the app on tap.
bug:
24913379
Change-Id: I911da4e6135f2bffaf3b1bbe6f911ff689a278ff
Adrian Roos [Wed, 4 Nov 2015 01:45:26 +0000 (01:45 +0000)]
Merge "Ok Droid, enable inline reply"
Adrian Roos [Wed, 4 Nov 2015 01:43:01 +0000 (17:43 -0800)]
Ok Droid, enable inline reply
Bug:
22452379
Change-Id: I74a875495abe010a2f00d1ac598ad95eaa87479d
Mitchell Wills [Wed, 4 Nov 2015 00:58:16 +0000 (00:58 +0000)]
Merge "Don't cache ScanResults in WifiTracker if there is no SSID"
Rob Carr [Wed, 4 Nov 2015 00:51:26 +0000 (00:51 +0000)]
Merge "Deliver exceptions to sources of PALs."
Daniel Koulomzin [Wed, 4 Nov 2015 00:36:11 +0000 (00:36 +0000)]
ActivityView gets its own thread pool. DO NOT MERGE am:
7e19e286cc -s ours am:
6e0a83bcd9 am:
d90c2da23c
am:
6393887063 -s ours
* commit '
6393887063aabecd1eaefc95db09087bc142658d':
ActivityView gets its own thread pool. DO NOT MERGE
Adam Lesinski [Wed, 4 Nov 2015 00:31:25 +0000 (16:31 -0800)]
Use wakeup reason when FingerPrint sensor wakes up the device
PowerManager can log into BatteryStats the reason for the device being
woken up. This change has the Fingerprint controller report the reason
instead of a default non-descriptive 'wakeUp' reason.
Change-Id: I12d80682dad888add139cca586d4b948e9d546e5
Adam Lesinski [Wed, 4 Nov 2015 00:17:30 +0000 (00:17 +0000)]
Merge "AAPT2: Add round qualifer support"
Adam Lesinski [Wed, 4 Nov 2015 00:17:08 +0000 (00:17 +0000)]
Merge "AAPT2: Verify positional Java String format arguments in strings"
Adam Lesinski [Wed, 4 Nov 2015 00:16:17 +0000 (16:16 -0800)]
AAPT2: Add round qualifer support
Change-Id: Id5a1331198e01be7ca4d87b8833900e51f82ece5
Daniel Koulomzin [Wed, 4 Nov 2015 00:11:13 +0000 (00:11 +0000)]
ActivityView gets its own thread pool. DO NOT MERGE am:
7e19e286cc -s ours am:
6e0a83bcd9
am:
d90c2da23c
* commit '
d90c2da23c8ad22819d400d4803ed63c7f856d63':
ActivityView gets its own thread pool. DO NOT MERGE
Daniel Koulomzin [Wed, 4 Nov 2015 00:02:32 +0000 (00:02 +0000)]
ActivityView gets its own thread pool. DO NOT MERGE am:
7e19e286cc -s ours
am:
6e0a83bcd9
* commit '
6e0a83bcd97574451e83d58ac646af9daf3216be':
ActivityView gets its own thread pool. DO NOT MERGE
Daniel Koulomzin [Tue, 3 Nov 2015 23:51:39 +0000 (23:51 +0000)]
ActivityView gets its own thread pool. DO NOT MERGE
am:
7e19e286cc -s ours
* commit '
7e19e286cc990daaafe934ed82ddfa00762907d6':
ActivityView gets its own thread pool. DO NOT MERGE
Bill Yi [Tue, 3 Nov 2015 23:46:38 +0000 (23:46 +0000)]
Wale Ogunwale [Tue, 3 Nov 2015 23:39:11 +0000 (23:39 +0000)]
Merge "[ActivityManager] Fix NullPointerException in startNextMatchingActivity." am:
7810aed854 am:
d89b76a58d
am:
8401a8d0c5
* commit '
8401a8d0c5bad075a7d46a68a30cd9af4c0d4413':
[ActivityManager] Fix NullPointerException in startNextMatchingActivity.
Glenn Kasten [Tue, 3 Nov 2015 23:37:48 +0000 (23:37 +0000)]
Merge "BluetoothMidiDevice: change write type to support JamStik" am:
6079b990f1 am:
613c63c742
am:
a10d826b1b
* commit '
a10d826b1bfcd3b919193e85476df0336d03c622':
BluetoothMidiDevice: change write type to support JamStik
Glenn Kasten [Tue, 3 Nov 2015 23:36:27 +0000 (23:36 +0000)]
Merge "BLE-MIDI: change binding for BluetoothMidiService" am:
5831944a6e am:
bd32753700
am:
ff4e4425b7
* commit '
ff4e4425b7e032feba1afc81ddeec7ad17e8a7ea':
BLE-MIDI: change binding for BluetoothMidiService
Ian Pedowitz [Tue, 3 Nov 2015 23:34:54 +0000 (23:34 +0000)]
Merge "Limit persistent ashmem backed fds to a minimum of 128kB." into mnc-dr-dev am:
966d6040c6 am:
95fc53b029 am:
d6f3e38738
am:
87455c7397
* commit '
87455c7397605fba4bf3ad04af8df3c599a7a6ba':
Limit persistent ashmem backed fds to a minimum of 128kB.
Bill Yi [Tue, 3 Nov 2015 23:33:07 +0000 (23:33 +0000)]
Wale Ogunwale [Tue, 3 Nov 2015 23:29:47 +0000 (23:29 +0000)]
Merge "[ActivityManager] Fix NullPointerException in startNextMatchingActivity." am:
7810aed854
am:
d89b76a58d
* commit '
d89b76a58dcffa7dbc5974d14c7914f44233bef3':
[ActivityManager] Fix NullPointerException in startNextMatchingActivity.
Glenn Kasten [Tue, 3 Nov 2015 23:28:10 +0000 (23:28 +0000)]
Merge "BluetoothMidiDevice: change write type to support JamStik" am:
6079b990f1
am:
613c63c742
* commit '
613c63c742f1609297156fffe6169ee17db895f4':
BluetoothMidiDevice: change write type to support JamStik
Glenn Kasten [Tue, 3 Nov 2015 23:26:41 +0000 (23:26 +0000)]
Merge "BLE-MIDI: change binding for BluetoothMidiService" am:
5831944a6e
am:
bd32753700
* commit '
bd3275370000d657ea86e3a42f1bd76343b2e6a5':
BLE-MIDI: change binding for BluetoothMidiService
Winson Chung [Tue, 3 Nov 2015 23:16:03 +0000 (23:16 +0000)]
Merge "Updating freeform layout to be static at the top of recents."
Glenn Kasten [Tue, 3 Nov 2015 23:08:12 +0000 (15:08 -0800)]
Merge commit '
ca2daddfea' into temp
Change-Id: I4efdb25d63be2c805059b1035cfccae2885a96fd
Daniel Koulomzin [Thu, 24 Sep 2015 18:38:17 +0000 (14:38 -0400)]
ActivityView gets its own thread pool. DO NOT MERGE
Bug:
24316798
Change-Id: I4278fa792cec8d2710f2f41eed02ba4a14af7052
Steve McKay [Tue, 3 Nov 2015 22:52:09 +0000 (22:52 +0000)]
Merge "Show only selection count in ActionBar."
Steve McKay [Tue, 3 Nov 2015 22:50:05 +0000 (22:50 +0000)]
Merge "Don't show advanced menu in downloads ui."
Jeff Sharkey [Tue, 3 Nov 2015 22:48:08 +0000 (22:48 +0000)]
Merge "Yell when calling installd with PM lock held."
Steve McKay [Tue, 3 Nov 2015 19:56:44 +0000 (11:56 -0800)]
Don't show advanced menu in downloads ui.
Also, don't show search, and file size....and maybe others.
Bug:
25383741
Change-Id: I4bc867254b89011786fdf087b371974ee80d09da
Jeff Sharkey [Tue, 3 Nov 2015 20:33:54 +0000 (12:33 -0800)]
Yell when calling installd with PM lock held.
As a matter of policy, we should never be holding the mPackages lock
while calling down into installd. This little bit of logic helps us
catch accidental cases where this happens.
Change-Id: I676c81df43ef936ffd36290d45a79429630c1b4b
Steve McKay [Tue, 3 Nov 2015 22:42:20 +0000 (22:42 +0000)]
Merge "Handle SpacerItem on click correctly."
Bill Yi [Tue, 3 Nov 2015 22:29:59 +0000 (14:29 -0800)]
Ching Tzung Lin [Tue, 3 Nov 2015 22:28:49 +0000 (22:28 +0000)]
Merge "Remove circular_display_mask_offset symbol and default" into cw-e-dev am:
7f54aa1e81 am:
9c7f6a409b
am:
7078a44687
* commit '
7078a446874bdb2a51b9eae8b41f9d1ec0bce86a':
Remove circular_display_mask_offset symbol and default
OSDN Git Service
