Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
242,418 Commits 3 Branches 0 Tags
4824ed486cbe38bcd3df41670dd738522534d556
Commit Graph

63324 Commits

Author SHA1 Message Date
Makoto Onuki
4824ed486c Merge "ShortcutManager: Fix work profile" into nyc-dev am: bdda585 
am: 74b8a65

* commit '74b8a6545d337f49031f28908bce3d9db845cd22':
  ShortcutManager: Fix work profile

Change-Id: I022371e785a944c01cf5fe307b53dbad71e8cc6c
 2016-03-29 15:46:40 +00: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
ff7e5ac8eb Merge "Various fixes for MagnificationController" into nyc-dev am: 4d2a423 
am: 99eaf2c

* commit '99eaf2cd21dc1a23c1f08435c20293376b2800ff':
  Various fixes for MagnificationController

Change-Id: Iaecd49608b2976e16dbc52920a8caadc4eeea9df
 2016-03-29 15:21:10 +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
1b257e485b Merge "Remove the system api method WebViewFactory.getWebViewPackageName" into nyc-dev am: bf0982d 
am: d187015

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

Change-Id: I05776787c59d9f96b1e6f4278068cd70ffbe964b
 2016-03-29 13:56:35 +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
248478d9f5 Merge "Update cross-profile intent resolver." into nyc-dev am: 82b1a68 
am: f201d49

* commit 'f201d49c7be4b79ca149d75756f1e43f4f39f446':
  Update cross-profile intent resolver.

Change-Id: I55485c9e74ce330331c93656a047cc4b99db9241
 2016-03-29 13:34:28 +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
Jungshik Shin
fee211a19c Merge "Load hyphenator for 22 new languages" into nyc-dev am: 3b26279 
am: 5e3bbb0

* commit '5e3bbb0a95551d7868cce657054c9e77993f32dc':
  Load hyphenator for 22 new languages
 2016-03-29 00:22:49 +00: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
78ee380215 Merge "Update get/setFontFeatureSettings JavaDoc" into nyc-dev am: eb90e44 
am: 28b538a

* commit '28b538aa779116d88b5a152b5f38ad4d8afce644':
  Update get/setFontFeatureSettings JavaDoc
 2016-03-28 23:38:56 +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
f5a1cedeeb Merge "Fix nav bar consuming" into nyc-dev am: 15d4b5a 
am: 99821d5

* commit '99821d54b1347588ebca9a0e1e60caea328cf45a':
  Fix nav bar consuming
 2016-03-28 22:33:02 +00:00
Jorim Jaggi
ebd189bc17 Merge "Cleanup window callbacks locking" into nyc-dev am: 2eb6273 
am: c2b545c

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

* commit '721426b967368d738d92c5841df74b74eef52d70':
  Don't back up / restore "we're in night mode"
 2016-03-28 22:32:56 +00: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
177ba59281 Merge "Fix NPE while using mLayerPaint" into nyc-dev am: 4edfdd5 
am: cd9180d

* commit 'cd9180d743db846a1f6f79f510ae419c79c088b0':
  Fix NPE while using mLayerPaint
 2016-03-28 22:09:24 +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
df1f2c5205 Merge "Refactor ProcessStats." into nyc-dev am: 0caf007 
am: ee93672

* commit 'ee93672b78a8054713f340ef07a512d86e6db5cc':
  Refactor ProcessStats.
 2016-03-28 21:17:56 +00:00
Wale Ogunwale
f33eb79eb5 Merge "Show non-top tasks in the docked stack in recents." into nyc-dev am: ddfc6f7 
am: ff064a4

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

* commit '85b0ba3cc369cc5106a5368434524ae479dfa00d':
  UpdateEngine: Add resetStatus() as system API.
 2016-03-28 21:17:04 +00:00
Brad Ebinger
7fde28455a Merge "Add VIA number column to CallLog Database" into nyc-dev am: 900f163 
am: ca3c301

* commit 'ca3c3012df230e0c49906e18fdea93992d6313b2':
  Add VIA number column to CallLog Database
 2016-03-28 21:16:01 +00:00
Chad Brubaker
8a549ff056 Merge "Use X509ExtendedTrustManagers" into nyc-dev am: 12da920 
am: 71ea966

* commit '71ea9666d80bed95d1c2bfff6e063db03a78e23b':
  Use X509ExtendedTrustManagers
 2016-03-28 21:14:58 +00:00
Yigit Boyar
41b29bd32d Merge "Recover focus on size change in ListView" into nyc-dev am: e082735 
am: e46e7fb

* commit 'e46e7fbde9bd6c16efc1a2fdee554b73afa7d124':
  Recover focus on size change in ListView
 2016-03-28 21:14:16 +00:00
Yohei Yukawa
4c5d6e5eb7 Merge "Dump more info for View when IMM#DEBUG is true." into nyc-dev am: feade80 
am: ab0dbb1

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

* commit '34b4ff24a052c92cb8425d5a251874c9b285e99e':
  Clean-up a workaround that is no longer necessary.
 2016-03-28 21:12:32 +00:00
Eino-Ville Talvala
2c72580d2c Merge "Camera: Add bandaid for preview orientation on reverse-landscape cameras" into nyc-dev am: 8c349f5 
am: 6da63cf

* commit '6da63cfb19be997671419fe8773d1f8f0ddd67d5':
  Camera: Add bandaid for preview orientation on reverse-landscape cameras
 2016-03-28 21:10:15 +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