Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
239,574 Commits 3 Branches 0 Tags
36e09451c3c73b336a6ddb33edcd0eccc7e688fa
Commit Graph

62675 Commits

Author SHA1 Message Date
Alan Viverette
36e09451c3 Merge "Use default implementation for onForwardingStopped() in action menu" into nyc-dev 
am: f25ea2f

* commit 'f25ea2fece6dfe3c63cd063e5342e0102ee6d1f3':
  Use default implementation for onForwardingStopped() in action menu

Change-Id: I884e15fce160a4cdefbad3418bfe6213f1977a1e
 2016-03-29 18:37:53 +00:00
Christopher Tate
b3f53cb6c3 Merge "Clean up a couple of bugs about transport init staging" into nyc-dev 
am: 09d83b0

* commit '09d83b032e5f456750f2f3149aa4932836643957':
  Clean up a couple of bugs about transport init staging

Change-Id: I0c32b31bf82b1d3ed798263816ca789c3a7305d8
 2016-03-29 18:37:49 +00:00
Markus Michler
e113d6a669 Merge "Fix javadoc for View.getMeasuredHeight() and View.getMeasuredHeightAndState()" am: 7160459 
am: ae975ab

* commit 'ae975aba7372b18cbf7f30cdc4b74cff32cc3558':
  Fix javadoc for View.getMeasuredHeight() and View.getMeasuredHeightAndState()

Change-Id: I565ec862ff883bac9894aeec6fc63b7ce323e00c
 2016-03-29 18:34:03 +00:00
Markus Michler
ae975aba73 Merge "Fix javadoc for View.getMeasuredHeight() and View.getMeasuredHeightAndState()" 
am: 7160459

* commit '71604596117c02a885da356cd0015c29493e48bc':
  Fix javadoc for View.getMeasuredHeight() and View.getMeasuredHeightAndState()

Change-Id: I5d522742dc4c7a46a74dfe4838c5bde8aadd8789
 2016-03-29 18:30:31 +00:00
Alan Viverette
f25ea2fece Merge "Use default implementation for onForwardingStopped() in action menu" into nyc-dev 2016-03-29 18:25:32 +00:00
Adam Lesinski
7160459611 Merge "Fix javadoc for View.getMeasuredHeight() and View.getMeasuredHeightAndState()" 2016-03-29 18:24:39 +00:00
Chris Tate
09d83b032e Merge "Clean up a couple of bugs about transport init staging" into nyc-dev 2016-03-29 18:18:12 +00:00
Alan Viverette
736a85f166 Use default implementation for onForwardingStopped() in action menu 
Otherwise we never exit forwarding if the popup has already been
dismissed.

Bug: 27886370
Change-Id: I3a7a51c18c15e12e2e9ef4cac853b87eb46d36de
 2016-03-29 13:13:17 -04:00
Makoto Onuki
74b8a6545d Merge "ShortcutManager: Fix work profile" into nyc-dev 
am: bdda585

* commit 'bdda585f862bd2880c98dabe1a981f9559d29662':
  ShortcutManager: Fix work profile

Change-Id: If2a197a16b3715d2da8e16b14c4fe10414660e65
 2016-03-29 15:43:49 +00:00
Makoto Onuki
bdda585f86 Merge "ShortcutManager: Fix work profile" into nyc-dev 2016-03-29 15:35:50 +00:00
Alan Viverette
99eaf2cd21 Merge "Various fixes for MagnificationController" into nyc-dev 
am: 4d2a423

* commit '4d2a42336be1dc57093c70a351f407cf0f58c967':
  Various fixes for MagnificationController

Change-Id: I502d206e7ecf1d685fb323a965c1e879e123b80b
 2016-03-29 15:18:14 +00:00
Alan Viverette
4d2a42336b Merge "Various fixes for MagnificationController" into nyc-dev 2016-03-29 15:13:04 +00:00
Gustav Sennton
d187015b0d Merge "Remove the system api method WebViewFactory.getWebViewPackageName" into nyc-dev 
am: bf0982d

* commit 'bf0982d01135d544e9057efbab66b95592823c3f':
  Remove the system api method WebViewFactory.getWebViewPackageName

Change-Id: Ic58bb541715ca43b8d4101107b063a01e0fc6880
 2016-03-29 13:53:45 +00:00
Gustav Sennton
bf0982d011 Merge "Remove the system api method WebViewFactory.getWebViewPackageName" into nyc-dev 2016-03-29 13:47:37 +00:00
Nicolas Prevot
f201d49c7b Merge "Update cross-profile intent resolver." into nyc-dev 
am: 82b1a68

* commit '82b1a68ed488b5d787c4eee2bc0052b4a76d7ae1':
  Update cross-profile intent resolver.

Change-Id: Icb4a80d4ee7ad571835bf038a4d3f0c316370749
 2016-03-29 13:31:51 +00:00
Nicolas Prévot
82b1a68ed4 Merge "Update cross-profile intent resolver." into nyc-dev 2016-03-29 13:25:48 +00:00
Gustav Sennton
79f1216eb1 Remove the system api method WebViewFactory.getWebViewPackageName 
We no longer user this method and it doesn't return any useful
information.

Bug: 27719581

Change-Id: Id282f1501cde9a7d7cc1fe66016cfb54956686c5
 2016-03-29 13:36:02 +01:00
Makoto Onuki
d99c6f04bb ShortcutManager: Fix work profile 
- Pinned shortcuts need to know not only which package
has pinned them, but also on which user's, due to work profile.

- Launcher can always launch shortcuts that it has pinned.

Bug 27548047

Change-Id: I23b4e7dfbb6ecc42099d31008bcfd61d44e2c7fb
 2016-03-28 18:47:39 -07:00
Christopher Tate
d5f70b7483 Clean up a couple of bugs about transport init staging 
Using the right names for things typically works better.

Bug 27794697

Change-Id: Ic8c3c2c978536545bd669c1c12aad9ee6783f38a
 2016-03-28 17:57:51 -07:00
Jungshik Shin
5e3bbb0a95 Merge "Load hyphenator for 22 new languages" into nyc-dev 
am: 3b26279

* commit '3b262793a0ae15b96ed270eef8f41ac781740b1c':
  Load hyphenator for 22 new languages
 2016-03-29 00:18:45 +00:00
Jungshik Shin
3b262793a0 Merge "Load hyphenator for 22 new languages" into nyc-dev 2016-03-29 00:06:36 +00:00
Siyamed Sinir
28b538aa77 Merge "Update get/setFontFeatureSettings JavaDoc" into nyc-dev 
am: eb90e44

* commit 'eb90e4406f93aafde20e43773d33b4b496292239':
  Update get/setFontFeatureSettings JavaDoc
 2016-03-28 23:35:09 +00:00
Siyamed Sinir
eb90e4406f Merge "Update get/setFontFeatureSettings JavaDoc" into nyc-dev 2016-03-28 23:16:20 +00:00
Siyamed Sinir
0925f40372 Update get/setFontFeatureSettings JavaDoc 
Add CSS font-feature-settings URL to get/setFontFeatureSettings method
JavaDoc in both TextView and Paint.

Bug: 27857640
Change-Id: I8c20068801032407d493e4f4a15b89dcf35949d2
 2016-03-28 16:14:46 -07:00
Jungshik Shin
31445528c0 Load hyphenator for 22 new languages 
In addition, all English locales other than those explicitly mapped
to en-US are mapped to en-GB.

BUG: 26405413
Change-Id: Ie5b77af164c95a6ed5639da5752ddf21f92181bc
 2016-03-28 16:05:22 -07:00
Jorim Jaggi
99821d54b1 Merge "Fix nav bar consuming" into nyc-dev 
am: 15d4b5a

* commit '15d4b5aae852f4c4df9b4a97d86fb4e304cfd677':
  Fix nav bar consuming
 2016-03-28 22:28:24 +00:00
Jorim Jaggi
c2b545c2d7 Merge "Cleanup window callbacks locking" into nyc-dev 
am: 2eb6273

* commit '2eb62737af8be74ce7a8e314b8ee134a7f28b1fd':
  Cleanup window callbacks locking
 2016-03-28 22:28:22 +00:00
Christopher Tate
721426b967 Merge "Don\'t back up / restore "we\'re in night mode"" into nyc-dev 
am: a3e8bf3

* commit 'a3e8bf3b9f8d146c2128171c546c5a272038ea0f':
  Don't back up / restore "we're in night mode"
 2016-03-28 22:28:20 +00:00
Jorim Jaggi
15d4b5aae8 Merge "Fix nav bar consuming" into nyc-dev 2016-03-28 22:16:44 +00:00
Jorim Jaggi
2eb62737af Merge "Cleanup window callbacks locking" into nyc-dev 2016-03-28 22:16:18 +00:00
Chris Tate
a3e8bf3b9f Merge "Don't back up / restore "we're in night mode"" into nyc-dev 2016-03-28 22:14:43 +00:00
sergeyv
cd9180d743 Merge "Fix NPE while using mLayerPaint" into nyc-dev 
am: 4edfdd5

* commit '4edfdd55cf0459c0d02b073ac38053b20060ec2f':
  Fix NPE while using mLayerPaint
 2016-03-28 22:05:09 +00:00
Jorim Jaggi
e5638a6f75 Fix nav bar consuming 
- Cache shouldAlwaysConsumeNavbar so it doesn't get reset when
insets == null
- Remove logic with frame comparison when determining whether to
consume nav bar. Not sure how that ever worked.
- Make sure shouldAlwaysConsumeNavBar survives when consuming
insets.

Bug: 27157904
Change-Id: I35f209ab27cc12240038da7efa9e79c95f70c6ce
 2016-03-28 21:58:30 +00:00
Christopher Tate
009938c984 Don't back up / restore "we're in night mode" 
Bug 27880039

Change-Id: Ida59c9e602b939038e4bb3f55a6bf96db8897348
 2016-03-28 14:32:15 -07:00
Sergei Vasilinetc
4edfdd55cf Merge "Fix NPE while using mLayerPaint" into nyc-dev 2016-03-28 21:21:45 +00:00
Jorim Jaggi
16b631923d Cleanup window callbacks locking 
- Also get rid of USE_MT_RENDERER, because there is no point in
having a flag if the other path never gets tested.

Bug: 27738239
Change-Id: Ic76115962940e72f2c59b8d291d078d15f8d493c
 2016-03-28 21:19:17 +00:00
Joe Onorato
ee93672b78 Merge "Refactor ProcessStats." into nyc-dev 
am: 0caf007

* commit '0caf007b3f0b4cd21be285820c270c51a8e502b7':
  Refactor ProcessStats.
 2016-03-28 21:06:08 +00:00
Wale Ogunwale
ff064a4679 Merge "Show non-top tasks in the docked stack in recents." into nyc-dev 
am: ddfc6f7

* commit 'ddfc6f7dc9e2b2a5b5c2cab033bf894c5cf1a59b':
  Show non-top tasks in the docked stack in recents.
 2016-03-28 21:06:04 +00:00
Tao Bao
85b0ba3cc3 Merge "UpdateEngine: Add resetStatus() as system API." into nyc-dev 
am: 9971d02

* commit '9971d02c38151a4289552d5b1cfb7b3c7c0acec6':
  UpdateEngine: Add resetStatus() as system API.
 2016-03-28 21:05:36 +00:00
Brad Ebinger
ca3c3012df Merge "Add VIA number column to CallLog Database" into nyc-dev 
am: 900f163

* commit '900f1635c021b022243049e2401ef04ad554465f':
  Add VIA number column to CallLog Database
 2016-03-28 21:05:11 +00:00
Chad Brubaker
71ea9666d8 Merge "Use X509ExtendedTrustManagers" into nyc-dev 
am: 12da920

* commit '12da920fa41eef7b28b14b4ae9af06212c77da4b':
  Use X509ExtendedTrustManagers
 2016-03-28 21:05:04 +00:00
Yigit Boyar
e46e7fbde9 Merge "Recover focus on size change in ListView" into nyc-dev 
am: e082735

* commit 'e0827355a5ca89188ed16f6df7db930aa964be4f':
  Recover focus on size change in ListView
 2016-03-28 21:04:56 +00:00
Yohei Yukawa
ab0dbb1d53 Merge "Dump more info for View when IMM#DEBUG is true." into nyc-dev 
am: feade80

* commit 'feade806098a0fe6bc53e1a531dedb6af13fac57':
  Dump more info for View when IMM#DEBUG is true.
 2016-03-28 21:03:43 +00:00
Yohei Yukawa
34b4ff24a0 Merge "Clean-up a workaround that is no longer necessary." into nyc-dev 
am: 207d325

* commit '207d325c52b94f61a4ad645597fe88ef7374708d':
  Clean-up a workaround that is no longer necessary.
 2016-03-28 21:03:11 +00:00
Eino-Ville Talvala
6da63cfb19 Merge "Camera: Add bandaid for preview orientation on reverse-landscape cameras" into nyc-dev 
am: 8c349f5

* commit '8c349f5d3b764d4ab726070dba397a2a292a6858':
  Camera: Add bandaid for preview orientation on reverse-landscape cameras
 2016-03-28 21:02:27 +00:00
Joe Onorato
0caf007b3f Merge "Refactor ProcessStats." into nyc-dev 2016-03-28 20:52:39 +00:00
sergeyv
e66be622f6 Fix NPE while using mLayerPaint 
bug:27873847
Change-Id: I9bfae72dfa9bda45fdeb94544b7656e2584f29f6
 2016-03-28 13:23:28 -07:00
Wale Ogunwale
ddfc6f7dc9 Merge "Show non-top tasks in the docked stack in recents." into nyc-dev 2016-03-28 20:22:35 +00:00
Tao Bao
9971d02c38 Merge "UpdateEngine: Add resetStatus() as system API." into nyc-dev 2016-03-28 19:51:36 +00:00
Brad Ebinger
900f1635c0 Merge "Add VIA number column to CallLog Database" into nyc-dev 2016-03-28 19:27:20 +00:00