drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
268,807 Commits 1 Branch 0 Tags
Commit Graph

268807 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Philip P. Moltmann
4ec38dbfcc Merge \"Merge \\\"Version PrintRecommendationService.\\\" into nyc-dev am: 8e3a16ad91 am: 2e6fde579d\" into nyc-mr1-dev-plus-aosp 
am: 7cfccdba1a

Change-Id: Id6e13c36e8aa3bb40dc59b99e3b60b1a27baa032
 2016-06-14 22:57:13 +00:00
Philip P. Moltmann
5c458c3215 Merge \\\"Version PrintRecommendationService.\\\" into nyc-dev am: 8e3a16ad91 am: c6ded5559c 
am: d4f26d2d0e

Change-Id: I2d0eaec4493755d8dd6e760b057cb394b1d9f006
 2016-06-14 22:57:05 +00:00
Yohei Yukawa
f3ab69c34c Merge \\"Quick workaround for a performance regression in IME APIs.\\" into nyc-dev am: 6fe4865e85 
am: cb2c497230

Change-Id: I682870edc734bba31c887fce49dce54b1e5cb47c
 2016-06-14 22:55:55 +00:00
TreeHugger Robot
8d7b4a4945 Merge "docs: Noted "Crypto" removal" into nyc-dev 2016-06-14 22:54:47 +00:00
Yohei Yukawa
da7846ae8b Merge \\"Quick workaround for a performance regression in IME APIs.\\" into nyc-dev am: 6fe4865e85 
am: bb587122c6

Change-Id: I678349a113f27a1aa41a404ca97411f2c524a511
 2016-06-14 22:53:27 +00:00
Chris Thornton
174c581877 Prevent NPE when updating models without a vendor UUID 
Change-Id: If58cd3ddb0a2afd601af3e3868ab4ff500be53a9
 2016-06-14 15:53:14 -07:00
Yohei Yukawa
cb2c497230 Merge \"Quick workaround for a performance regression in IME APIs.\" into nyc-dev 
am: 6fe4865e85

Change-Id: I96bef7f47729282a57b6acc11c8bf4ada42c6a06
 2016-06-14 22:48:35 +00:00
Yohei Yukawa
bb587122c6 Merge \"Quick workaround for a performance regression in IME APIs.\" into nyc-dev 
am: 6fe4865e85

Change-Id: Id039d1dd681483c1d86349ee7e765b2f1f4fa95f
 2016-06-14 22:47:28 +00:00
Robert Carr
291aea2202 Toast timeout: Just strip FLAG_KEEP_SCREEN_ON 
We added the toast timeout to fix b/21693547. Where the client
leaks non visible toasts which end up keeping the screen on.
Simply removing the toast windows as we were doing previously,
isn't very good though. If the timeout fires when an app could
still use the toast (e.g. due to long pause under debugger),
the app could crash. It's not obvious how (if even possible
without API semantic/guarantee change) to prevent this issue
from the client side. Furthermore, #33 at b/21693457 implies that
we need to respect FLAG_KEEP_SCREEN_ON even for windows that
never submitted a buffer. With time constraints as they are,
the only solution I can think of that solves both without
chance of regression is just stripping FLAG_KEEP_SCREEN_ON when the
timeout fires.

Bug: 29105388
Change-Id: Ic2df897f86acf814ea3d4f911a0532d65af0c19f
 2016-06-14 15:44:04 -07:00
Andrii Kulian
1105458ba3 Merge \"Merge \\\"Revert \\\"Don\\\'t update task to return to type for last task over home\\\"\\\" into nyc-dev am: 5c176ff133 am: 1315d0cb9f\" into nyc-mr1-dev-plus-aosp 
am: 7bd8849515

Change-Id: I05ef0142d2092c82ea3f29c5dff42cb21387ca30
 2016-06-14 22:43:36 +00:00
Hemal Patel
cd241081c2 Merge \"Docs: Added overview of Custom Pointer API am: 37663db137 am: 96344aafc2\" into nyc-mr1-dev-plus-aosp 
am: 0aef9ebb4b

Change-Id: Ie0a27576e0fd17e5a0b28939a9250331c34d1902
 2016-06-14 22:43:34 +00:00
Andrii Kulian
9e114b2d3b Merge \\\"Revert \\\"Don\\\'t update task to return to type for last task over home\\\"\\\" into nyc-dev am: 5c176ff133 am: 01cc848c6d 
am: e9f326e8d6

Change-Id: Icfb23fadd2efdd9b37e080797752fc5ce0d2a57e
 2016-06-14 22:43:31 +00:00
Hemal Patel
6e08e76d42 Docs: Added overview of Custom Pointer API am: 37663db137 am: 892d5ccdc5 
am: 1b1f0656f0

Change-Id: I6349f2103cb8638f772cad8ed4a31d01041ab4ae
 2016-06-14 22:43:28 +00:00
Mark Renouf
b59ac99897 Merge changes I3352e1fc,I52ac4dda,Ie9d51041,Id643a27e into nyc-mr1-dev-plus-aosp 
am: 4015cdc67a

Change-Id: If07e33b5639b2093f7fc0703c30a725fa40bea3a
 2016-06-14 22:43:24 +00:00
Yohei Yukawa
6fe4865e85 Merge "Quick workaround for a performance regression in IME APIs." into nyc-dev 2016-06-14 22:43:19 +00:00
Doris Ling
4be6c44ee2 Merge \"Added config system navigation keys.\" into nyc-mr1-dev 
am: 32300db186

Change-Id: I9de582c7ae95aa36fbae75be6b72b4ffc01ae695
 2016-06-14 22:39:50 +00:00
Doris Ling
32300db186 Merge "Added config system navigation keys." into nyc-mr1-dev 2016-06-14 22:35:19 +00:00
Android Build Merger (Role)
7cfccdba1a Merge "Merge \\"Version PrintRecommendationService.\\" into nyc-dev am: 8e3a16ad91 am: 2e6fde579d" into nyc-mr1-dev-plus-aosp 2016-06-14 22:25:47 +00:00
Philip P. Moltmann
0d944b3c1b Merge \\"Version PrintRecommendationService.\\" into nyc-dev am: 8e3a16ad91 
am: 2e6fde579d

Change-Id: Ifba59226f9cfe87a4c3465d6da88d20399a5d90a
 2016-06-14 22:25:24 +00:00
Philip P. Moltmann
d4f26d2d0e Merge \\"Version PrintRecommendationService.\\" into nyc-dev am: 8e3a16ad91 
am: c6ded5559c

Change-Id: Ide47bb18bb992f8aa499fcb57f0cb33126107d4f
 2016-06-14 22:24:18 +00:00
Philip P. Moltmann
2e6fde579d Merge \"Version PrintRecommendationService.\" into nyc-dev 
am: 8e3a16ad91

Change-Id: Ifd37bc80af0fe759a5e6673245ace2eebd82e513
 2016-06-14 22:20:30 +00:00
Philip P. Moltmann
c6ded5559c Merge \"Version PrintRecommendationService.\" into nyc-dev 
am: 8e3a16ad91

Change-Id: Ic4d75b1549d314e46db032f3e3506e2cd4776308
 2016-06-14 22:19:45 +00:00
Android Build Merger (Role)
7bd8849515 Merge "Merge \\"Revert \\"Don\\'t update task to return to type for last task over home\\"\\" into nyc-dev am: 5c176ff133 am: 1315d0cb9f" into nyc-mr1-dev-plus-aosp 2016-06-14 22:15:57 +00:00
Android Build Merger (Role)
0aef9ebb4b Merge "Docs: Added overview of Custom Pointer API am: 37663db137 am: 96344aafc2" into nyc-mr1-dev-plus-aosp 2016-06-14 22:15:44 +00:00
TreeHugger Robot
8cf1cf99c9 Merge "Notify end animation after setting the state to not running." 2016-06-14 22:15:41 +00:00
Andrii Kulian
a5b326bbeb Merge \\"Revert \\"Don\\'t update task to return to type for last task over home\\"\\" into nyc-dev am: 5c176ff133 
am: 1315d0cb9f

Change-Id: I5c38b2288407f9b34c7f5863d3e3246c925c67a6
 2016-06-14 22:15:13 +00:00
Hemal Patel
8efb991c5f Docs: Added overview of Custom Pointer API am: 37663db137 
am: 96344aafc2

Change-Id: Ie9cd2573a1ce95b104fb47da2714a1b69fa8f681
 2016-06-14 22:15:09 +00:00
Andrii Kulian
e9f326e8d6 Merge \\"Revert \\"Don\\'t update task to return to type for last task over home\\"\\" into nyc-dev am: 5c176ff133 
am: 01cc848c6d

Change-Id: I09b4e5e9083362b4cf0aeac1adc934514ce9b31a
 2016-06-14 22:14:50 +00:00
Hemal Patel
1b1f0656f0 Docs: Added overview of Custom Pointer API am: 37663db137 
am: 892d5ccdc5

Change-Id: I924d29ba5561bc2d55df7057e4ca204cd3ea924d
 2016-06-14 22:14:42 +00:00
Andrii Kulian
1315d0cb9f Merge \"Revert \"Don\'t update task to return to type for last task over home\"\" into nyc-dev 
am: 5c176ff133

Change-Id: I7a901be3116ee6ee8005ee7d6e41c1781ad02718
 2016-06-14 22:08:50 +00:00
Andrii Kulian
01cc848c6d Merge \"Revert \"Don\'t update task to return to type for last task over home\"\" into nyc-dev 
am: 5c176ff133

Change-Id: Ibd14c8a53b8d675298d4e13fc064281813881137
 2016-06-14 22:08:46 +00:00
Hemal Patel
96344aafc2 Docs: Added overview of Custom Pointer API 
am: 37663db137

Change-Id: I8e1824c392fda188fa276a5d2da7ec990a17030b
 2016-06-14 22:08:46 +00:00
Hemal Patel
892d5ccdc5 Docs: Added overview of Custom Pointer API 
am: 37663db137

Change-Id: I1bf94ef4e1c86dcd14bcf956d35e890ed3a1ad23
 2016-06-14 22:08:44 +00:00
TreeHugger Robot
8e3a16ad91 Merge "Version PrintRecommendationService." into nyc-dev 2016-06-14 22:08:42 +00:00
Mark Renouf
4015cdc67a Merge changes I3352e1fc,I52ac4dda,Ie9d51041,Id643a27e into nyc-mr1-dev-plus-aosp 
* changes:
  Merge \"Set hintTextColor and composingSpan style for EditText and extract view\" into nyc-mr1-dev am: a884aacb47
  Merge \\"Update validation-layer.jd for NDK-R12:    use packed layer binaries    punt building layers to Khronos github repo\\" into nyc-dev am: da66010cd8 am: ab45c9df1f
  Merge \\"Fix QS edit view accessibility classes\\" into nyc-dev am: 0809964452 am: a78fd8a31b
  Merge \\"Delete simple reduction implementation.\\" into nyc-dev am: d749245b88 am: 9a53329b0a
 2016-06-14 21:57:37 +00:00
TreeHugger Robot
5c176ff133 Merge "Revert "Don't update task to return to type for last task over home"" into nyc-dev 2016-06-14 21:55:54 +00:00
Winson
edaffc5792 Fixing header bar icons. 
Bug: 28402665
Change-Id: If61a2c1fbfb881a61e67d8bc6f3a79236e01c7fa
 2016-06-14 14:48:01 -07:00
Wale Ogunwale
d6aee18cab Make sure task exists in WM before trying to set the resizing state 
It is possible for a task to be removed from the WM and stack in AM
while resizing (e.g. app crashes). In this case we want to make sure
the task exist in WM before we try to set the dock resizing state vs.
depending on the fact that the task is in recent list in AM.

Bug: 29325623
Change-Id: Ib89a7bfe12fe1f2c4c6c56ac9e13b0052ea2b4ec
 2016-06-14 14:39:05 -07:00
Julia Reynolds
0d86f437d9 Only reload callback on configuration change. am: 8d0a400119 am: 2045488afd 
am: 070c52c640

Change-Id: Ie006271830800a2676dfdda856b3ad69507bf23e
 2016-06-14 21:28:20 +00:00
Hemal Patel
37663db137 Docs: Added overview of Custom Pointer API 
Bug: 28241984
Change-Id: Iffa2a0cc46f71377b79f4ac792d2f469353cc395
 2016-06-14 14:26:15 -07:00
Winson
18beccfa9d Merge \\\"Fixing several issues with accessibility\\\" into nyc-dev am: 987cd20acf am: 55e93a0594 
am: 75ece5a455

Change-Id: I957eae53887910a44f010130f6dc6c35271253b2
 2016-06-14 21:26:02 +00:00
Julia Reynolds
addbdbfc27 Merge \\\"Revert \\\"Announce access point changes.\\\"\\\" into nyc-dev am: a64e3a0844 am: b269cfe9e1 
am: 3768d13d54

Change-Id: I43ff2a3e1a46cffd38e5f07c5d4181d0f5c802c4
 2016-06-14 21:26:00 +00:00
Christopher Tate
8b2189a2f2 Merge \\\"Note null alarm worksource names under the alarm\\\'s package\\\" into nyc-dev am: 2f4636a333 am: ab367d1d64 
am: e1b9bd57da

Change-Id: I7f9faa81bfef8803bd704fed6ecf41caff0aae4c
 2016-06-14 21:25:58 +00:00
Andrew Solovay
381faeacf9 Merge \\\"docs: Updated support library revisions page for 24.0.0\\\" into nyc-dev am: eb4e8105d3 am: 8d853e0cdc 
am: 04726c1b43

Change-Id: Ifb5d595e77e8dba803bf753e96ead1524f8a5dfa
 2016-06-14 21:25:55 +00:00
Julia Reynolds
d51a761c8e Only reload callback on configuration change. am: 8d0a400119 am: f2958d4fa5 
am: fa1fe439ce

Change-Id: Id04e76b3db42bb9ba57b1a5835f8fc8c9da8048b
 2016-06-14 21:25:53 +00:00
Winson
376ec00d54 Merge \\\"Fixing several issues with accessibility\\\" into nyc-dev am: 987cd20acf am: 18bb19206a 
am: 2c42bd73e5

Change-Id: Ia7d694c089a3ca7bb64859af00678b319ff3f29d
 2016-06-14 21:23:42 +00:00
Julia Reynolds
d1cb656ea6 Merge \\\"Revert \\\"Announce access point changes.\\\"\\\" into nyc-dev am: a64e3a0844 am: 66e87fec8c 
am: de96410bd1

Change-Id: Ib55384d465e57e98f7237f5f0102bf544566e5f4
 2016-06-14 21:23:40 +00:00
Christopher Tate
edad354580 Merge \\\"Note null alarm worksource names under the alarm\\\'s package\\\" into nyc-dev am: 2f4636a333 am: 84df024632 
am: 6341ca30db

Change-Id: I36154dc768407086bf648309c3a9f3b8f3467cb7
 2016-06-14 21:23:37 +00:00
Andrew Solovay
b4e2c57722 Merge \\\"docs: Updated support library revisions page for 24.0.0\\\" into nyc-dev am: eb4e8105d3 am: f1a2347d04 
am: 6a2565a90a

Change-Id: If15f769ec3bfdc0a1840e322d31c27d43707889d
 2016-06-14 21:23:34 +00:00
Daniel Yu
25766f52aa Merge \\\\\"docs: Clarifying direct boot notification messages\\\\\" into mnc-io-docs am: 120fd583d5 am: 4c5e5ec6d5 am: 189ef624d1 am: bae1198640 
am: e6d7cf1786

Change-Id: Idf3d30c197b02e1ba26cb3d4442d99dfe66fb0a5
 2016-06-14 21:23:31 +00:00