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

63308 Commits

Author SHA1 Message Date
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
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
Chad Brubaker
12da920fa4 Merge "Use X509ExtendedTrustManagers" into nyc-dev 2016-03-28 19:14:23 +00:00
Yigit Boyar
e0827355a5 Merge "Recover focus on size change in ListView" into nyc-dev 2016-03-28 19:10:08 +00:00
Wale Ogunwale
64ae08aa16 Show non-top tasks in the docked stack in recents. 
Allows the user to access the task through recents since
it isn't currently visible on screen.

Also, changed recents to launch task currently in the docked
stack in the fullscreen stack when selected from recents list.

Bug: 27864383
Change-Id: I58549023920d064a30b6355367c3193ce3207bbd
 2016-03-28 12:06:44 -07:00
Yohei Yukawa
feade80609 Merge "Dump more info for View when IMM#DEBUG is true." into nyc-dev 2016-03-28 18:20:56 +00:00