Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
244,534 Commits 3 Branches 0 Tags
fa3e66e0aef5b4868a554fcebcaba502426cbe89
Commit Graph

244534 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chris Craik
fa3e66e0ae Merge "Fix hw layer overdraw/update visualization" into nyc-dev 
am: 189e3e5ec5

* commit '189e3e5ec5b698f1062fb98692fa75d3750148e0':
  Fix hw layer overdraw/update visualization

Change-Id: I4e788e8a83fa02881ca18d82dc2371d5bf43284c
 2016-05-17 00:07:54 +00:00
TreeHugger Robot
189e3e5ec5 Merge "Fix hw layer overdraw/update visualization" into nyc-dev 2016-05-16 23:58:28 +00:00
Jorim Jaggi
4958217aa4 Handle multi-window for inset hint 
am: 23bf5462f0

* commit '23bf5462f05b33ce4390d8370520e43b74dbec09':
  Handle multi-window for inset hint

Change-Id: I67d202891330ba78b6fbe62510261cc7f1449b42
 2016-05-16 23:27:56 +00:00
Tim Murray
b9e8a87240 Merge "Make persistent apps become top correctly." into nyc-dev 
am: 29af3cab29

* commit '29af3cab293dc7a19ca3b387c5507e521f66d0b7':
  Make persistent apps become top correctly.

Change-Id: Ic022afa3fa2004735b371dce4738da8d7dfeb008
 2016-05-16 23:22:39 +00:00
Jorim Jaggi
23bf5462f0 Handle multi-window for inset hint 
We need to incorporate task bounds when calculating the inset hint
so we don't specify something wrong to the client which we correct
immediately after.

Bug: 28697105
Change-Id: I23cec7d6cc62a4d982e0796a867e803d4cce0803
 2016-05-16 23:18:14 +00:00
TreeHugger Robot
29af3cab29 Merge "Make persistent apps become top correctly." into nyc-dev 2016-05-16 23:13:25 +00:00
Anthony Hugh
91dd6209f8 Merge "Change Priority Only mode defaults on watches" into nyc-mr1-dev 2016-05-16 23:00:53 +00:00
Hans Boehm
eb714f3d29 Merge "Clear more native pointers in finalizers" into nyc-dev 
am: 53c33d9701

* commit '53c33d97013ad10a42d9b37fe77884f596250109':
  Clear more native pointers in finalizers

Change-Id: I0e28a59e0f2d60b38a5e2bdd55bbd72ec1da42d9
 2016-05-16 22:57:14 +00:00
Svetoslav Ganov
5f8c5ec9a4 Merge "Ensure app op restrictions reset when the app that set them dies." into nyc-dev 
am: 008d73bd5b

* commit '008d73bd5b3ca4b1b7a8af61957759d65dd67e3b':
  Ensure app op restrictions reset when the app that set them dies.

Change-Id: Iebbe27690aeac898807c13ef05c730697dbb406a
 2016-05-16 22:48:35 +00:00
Dirk Dougherty
69083dd202 Merge "Update default image for n preview docs. Update tools resources." into mnc-mr-docs am: 0a957d5aa2 am: b33f36497d am: a4101e6693 
am: de84a27872

* commit 'de84a27872a9eca52d0703d602335f558021c10e':
  Update default image for n preview docs. Update tools resources.

Change-Id: I2b2c575fff29152e32b6ad46005b3e27fa865f11
 2016-05-16 22:48:33 +00:00
Scott Main
231adb3e0f Merge "Avoid weird line wrapping by removing columns and forcing line breaks between the links" into mnc-mr-docs am: a0acf474e9 am: 592b36a326 am: 0b019a3d02 
am: 1d145e7d2b

* commit '1d145e7d2b4b10ba0b9330766e3975802e5aa1e4':
  Avoid weird line wrapping by removing columns and forcing line breaks between the links

Change-Id: I67591e599c9d0def077ad2a8b48cd53a78b785c7
 2016-05-16 22:48:30 +00:00
Hans Boehm
53c33d9701 Merge "Clear more native pointers in finalizers" into nyc-dev 2016-05-16 22:45:04 +00:00
Jaewan Kim
3f41684de5 Merge "Workaround that Recents is shown again after an activity is PIPed" into nyc-dev 
am: 174aa3346c

* commit '174aa3346c06341d13f287c72ccd9ec47fce5987':
  Workaround that Recents is shown again after an activity is PIPed

Change-Id: I8a2a7daeebeb37817a36d12e52db86912dce2186
 2016-05-16 22:43:01 +00:00
Svetoslav Ganov
008d73bd5b Merge "Ensure app op restrictions reset when the app that set them dies." into nyc-dev 2016-05-16 22:42:49 +00:00
Dirk Dougherty
de84a27872 Merge "Update default image for n preview docs. Update tools resources." into mnc-mr-docs am: 0a957d5aa2 am: b33f36497d 
am: a4101e6693

* commit 'a4101e66933fd5acb882bfc0311f3f4b5cbd5b11':
  Update default image for n preview docs. Update tools resources.

Change-Id: I859659905ab0bdd7e16a2406542c0cac69e1f4d7
 2016-05-16 22:41:55 +00:00
smain@google.com
1d145e7d2b Merge "Avoid weird line wrapping by removing columns and forcing line breaks between the links" into mnc-mr-docs am: a0acf474e9 am: 592b36a326 
am: 0b019a3d02

* commit '0b019a3d028990a9832188d3ef2c9540e5d37f40':
  Avoid weird line wrapping by removing columns and forcing line breaks between the links

Change-Id: Ifba667194d2e2f04a9824945d5100cdea01a9c77
 2016-05-16 22:41:44 +00:00
Jaewan Kim
174aa3346c Merge "Workaround that Recents is shown again after an activity is PIPed" into nyc-dev 2016-05-16 22:38:23 +00:00
Dirk Dougherty
a4101e6693 Merge "Update default image for n preview docs. Update tools resources." into mnc-mr-docs am: 0a957d5aa2 
am: b33f36497d

* commit 'b33f36497dbc7265ee16323ee6c0281690ca3221':
  Update default image for n preview docs. Update tools resources.

Change-Id: I1ed7ac4ecf30538252d4b277b1baf93ec61e4835
 2016-05-16 22:35:33 +00:00
Scott Main
0b019a3d02 Merge "Avoid weird line wrapping by removing columns and forcing line breaks between the links" into mnc-mr-docs am: a0acf474e9 
am: 592b36a326

* commit '592b36a326216cd2442c47da9608ca2afd7e4d16':
  Avoid weird line wrapping by removing columns and forcing line breaks between the links

Change-Id: I54b1282f6ef2d92251a4624c8f439499831af1a6
 2016-05-16 22:35:30 +00:00
Svetoslav Ganov
a8bbd76d9b Ensure app op restrictions reset when the app that set them dies. 
We were not keeping track when an app that set an app op restriction
dies to clean up after that. As a result we may end up with stale
restrictions that will be there until the device reoots - not cool.
This change adds remote binder death tracking and simplifies the
code as adding the formed would have made more complex.

bug:28770536

Change-Id: I7dcaafba2354843a0cdf0206ab1f96625edc5120
 2016-05-16 15:34:34 -07:00
Jorim Jaggi
87072fed10 Merge "Fix transition delay tracking when starting activity from recents" into nyc-dev 
am: 8e30eb3a7f

* commit '8e30eb3a7f81729065bad6d971bf414f995410df':
  Fix transition delay tracking when starting activity from recents

Change-Id: I1b0a85c1fe5ce607e7bb46da03d27f77abe498db
 2016-05-16 22:31:32 +00:00
Dirk Dougherty
b33f36497d Merge "Update default image for n preview docs. Update tools resources." into mnc-mr-docs 
am: 0a957d5aa2

* commit '0a957d5aa28920f8854070676955f941e3ae6726':
  Update default image for n preview docs. Update tools resources.

Change-Id: I3fa206d3bfc74d20cb74e19f0d084d62fb47c0e2
 2016-05-16 22:31:30 +00:00
Dianne Hackborn
c5d784caf3 Merge "Fix issue #28794831: meminfo considers cached processes to be services" into nyc-dev 
am: 0cb1cc74b8

* commit '0cb1cc74b851f995110b8231f754c9f84122c816':
  Fix issue #28794831: meminfo considers cached processes to be services

Change-Id: I2d9ab20344f982e97d91422e89e56a27420233bd
 2016-05-16 22:31:25 +00:00
smain@google.com
592b36a326 Merge "Avoid weird line wrapping by removing columns and forcing line breaks between the links" into mnc-mr-docs 
am: a0acf474e9

* commit 'a0acf474e9db6e1a444d7e48b520b48ded8fcdce':
  Avoid weird line wrapping by removing columns and forcing line breaks between the links

Change-Id: I337e5167eb9191f674c6cc397d61925c334c3b72
 2016-05-16 22:31:22 +00:00
Dirk Dougherty
0a957d5aa2 Merge "Update default image for n preview docs. Update tools resources." into mnc-mr-docs 2016-05-16 22:27:48 +00:00
TreeHugger Robot
8e30eb3a7f Merge "Fix transition delay tracking when starting activity from recents" into nyc-dev 2016-05-16 22:27:39 +00:00
Dianne Hackborn
0cb1cc74b8 Merge "Fix issue #28794831: meminfo considers cached processes to be services" into nyc-dev 2016-05-16 22:26:13 +00:00
Scott Main
a0acf474e9 Merge "Avoid weird line wrapping by removing columns and forcing line breaks between the links" into mnc-mr-docs 2016-05-16 22:25:51 +00:00
Billy Lamberta
031929076e Merge "docs: work minisite" into mnc-io-docs am: 8f740bea13 am: 51ceb1bad1 
am: a0a34f6017

* commit 'a0a34f6017287d466e90a27f82ff8cf4c91c0663':
  docs: work minisite

Change-Id: I2152083326c271ebd9adc5eea7a072db9b7aa080
 2016-05-16 22:23:55 +00:00
Felipe Leme
d028ec4e29 Merge "Documented return value of getRestrictBackgroundStatus()." into nyc-dev 
am: 522787f39a

* commit '522787f39a759cf8af8438641fa8df7470a1b959':
  Documented return value of getRestrictBackgroundStatus().

Change-Id: I1187ffeeb42b61329674ca022735efa08c7e9d98
 2016-05-16 22:23:46 +00:00
smain@google.com
d078d20ac6 Avoid weird line wrapping by removing columns and forcing line breaks between the links 
Change-Id: I797b46d75643ce2491d47c95599164022ce451a7
 2016-05-16 15:22:17 -07:00
Michael Kwan
0092f82d4c Merge "Allow ANR dialogs for Watch eng builds." into nyc-mr1-dev 2016-05-16 22:21:30 +00:00
Billy Lamberta
a0a34f6017 Merge "docs: work minisite" into mnc-io-docs am: 8f740bea13 
am: 51ceb1bad1

* commit '51ceb1bad18c39a5281fc2cbd6d9c234c2e7f14a':
  docs: work minisite

Change-Id: Ieac1a9a571bfe6ef94663623f5715d1b205dd242
 2016-05-16 22:19:41 +00:00
TreeHugger Robot
522787f39a Merge "Documented return value of getRestrictBackgroundStatus()." into nyc-dev 2016-05-16 22:17:42 +00:00
Billy Lamberta
51ceb1bad1 Merge "docs: work minisite" into mnc-io-docs 
am: 8f740bea13

* commit '8f740bea131ca0234fee9dce273f23c6f21ddf2f':
  docs: work minisite

Change-Id: Id0a4c1be427a131f1766f3452bca1b2f90365981
 2016-05-16 22:12:37 +00:00
Philip P. Moltmann
6c8767fea9 Merge "Adjust PrintRecommendationService for Konica Minolta." into nyc-dev 
am: 5bfaa9c128

* commit '5bfaa9c1283e05567cd88d35f13ae6872dd687e2':
  Adjust PrintRecommendationService for Konica Minolta.

Change-Id: Icd5edb72267ac24f700a9b171f97455f6319b74a
 2016-05-16 22:09:32 +00:00
Fyodor Kupolov
89033ea614 Merge "Delay grantDefaultPermissions until user\'s first start" into nyc-dev 
am: 6eb923cb64

* commit '6eb923cb64f38dcb23fd3ca15793a13a900b1630':
  Delay grantDefaultPermissions until user's first start

Change-Id: I16a8505e69e06faf9932c9a173ef8c07ebfddb59
 2016-05-16 22:09:28 +00:00
Billy Lamberta
8f740bea13 Merge "docs: work minisite" into mnc-io-docs 2016-05-16 22:06:01 +00:00
Philip P. Moltmann
5bfaa9c128 Merge "Adjust PrintRecommendationService for Konica Minolta." into nyc-dev 2016-05-16 22:02:47 +00:00
TreeHugger Robot
6eb923cb64 Merge "Delay grantDefaultPermissions until user's first start" into nyc-dev 2016-05-16 22:01:15 +00:00
Philip P. Moltmann
4012f08b73 Merge "Clear state when ProgressMessageCtrl. is canceled" into nyc-dev 
am: 11e215bc45

* commit '11e215bc45de37102977462c9ced878c130ff74a':
  Clear state when ProgressMessageCtrl. is canceled

Change-Id: Ic5e24461b1891d37363195de6bff8d55fba95f3f
 2016-05-16 22:01:03 +00:00
Tim Murray
666212b75c Make persistent apps become top correctly. 
Sometimes, a persistent app should be the top app (recents). Make sure
such an app can use the top-app cpuset.

bug 28317812
bug 28794389

Change-Id: I756cec3fbab8cc552a6d90c007aa2e07f6b78dbc
 2016-05-16 14:53:29 -07:00
Jorim Jaggi
840165f0bf Don\'t throw away wallpaper bitmap just because we are hidden. 
am: ed0e1a68a4

* commit 'ed0e1a68a437979e399724ca17f422add80bd0e4':
  Don't throw away wallpaper bitmap just because we are hidden.

Change-Id: Id1af47665ea63354c6f6e6f8f01761b7c917d2ad
 2016-05-16 21:51:23 +00:00
Philip P. Moltmann
11e215bc45 Merge "Clear state when ProgressMessageCtrl. is canceled" into nyc-dev 2016-05-16 21:43:13 +00:00
Julia Reynolds
197ab4d5dc Merge "Adjust spacing." into nyc-dev 
am: 45626c448d

* commit '45626c448d63b7a3c0e86d7b03043271f7fa68af':
  Adjust spacing.

Change-Id: I9368d77b3d6d630d53a8a9beb6f5d20665268930
 2016-05-16 21:41:52 +00:00
Anthony Hugh
d216ac3da3 Change Priority Only mode defaults on watches 
Changes Priority Only mode defaults on watches to the following:
Allow starred contacts to go through only. Repeated calls on.
Calls, messages, reminders, events off

BUG: 28640779
Change-Id: I89d57de58a8c3bb62432f97e96b60c653745d303
 2016-05-16 14:38:59 -07:00
Jorim Jaggi
ed0e1a68a4 Don't throw away wallpaper bitmap just because we are hidden. 
TRIM_MEMORY_UI_HIDDEN > TRIM_MEMORY_RUNNING constants, so we only
need to throw away the wallpaper if we are actually running low on
memory.

Bug: 28769940
Change-Id: I8aa27d081bbcc2eff553e9420b2b9b0920f3781f
 2016-05-16 21:37:59 +00:00
Julia Reynolds
45626c448d Merge "Adjust spacing." into nyc-dev 2016-05-16 21:34:15 +00:00
Andrew Solovay
a1a224fa83 docs: Minor permissions phrasing tweak am: 9acd851ee6 am: 072b6fb839 am: 8804495bff 
am: 3228255e77

* commit '3228255e772e026da7d00cb914e76e454830328d':
  docs: Minor permissions phrasing tweak

Change-Id: Iaa59ba0131a79a17d408d0a42ef15a190b0d972c
 2016-05-16 21:30:54 +00:00
Andrew Solovay
232d2f8fc7 Merge "docs: Removed note that GET_ACCOUNTS was deprecated am: cc80393d94 am: af9dc9292b am: be2b224d80" into nyc-dev 
am: a586b078b3

* commit 'a586b078b356b4a2da6b2d9b1135c6a41b85703e':
  docs: Removed note that GET_ACCOUNTS was deprecated

Change-Id: I1e90ff314935950c751b1f42f637806f01054e8f
 2016-05-16 21:26:12 +00:00