Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
238,460 Commits 3 Branches 0 Tags
da5022650e40b94e3c17dfeaf3b6840491bf4772
Commit Graph

56783 Commits

Author SHA1 Message Date
Muyuan Li
da5022650e Merge "Partial screenshot" into nyc-dev am: a8446ef782 
am: 26aac3978d

* commit '26aac3978d0b333777f5258866cd2950b7731f46':
  Partial screenshot
 2016-03-09 02:44:56 +00:00
Muyuan Li
26aac3978d Merge "Partial screenshot" into nyc-dev 
am: a8446ef782

* commit 'a8446ef7826783056af70d82815df83e8aa96031':
  Partial screenshot
 2016-03-09 02:42:45 +00:00
Muyuan Li
a8446ef782 Merge "Partial screenshot" into nyc-dev 2016-03-09 02:36:52 +00:00
Makoto Onuki
3b0196122f Merge "Implement LauncherApps.startShortcut()." into nyc-dev am: 76cb56bb21 
am: 6e6a3ed250

* commit '6e6a3ed2502e5e6b07403a21e8e954a200fb0146':
  Implement LauncherApps.startShortcut().
 2016-03-09 01:47:10 +00:00
Makoto Onuki
6e6a3ed250 Merge "Implement LauncherApps.startShortcut()." into nyc-dev 
am: 76cb56bb21

* commit '76cb56bb210a2ffeeda6294b8cde2dd971c495a7':
  Implement LauncherApps.startShortcut().
 2016-03-09 01:43:46 +00:00
Makoto Onuki
76cb56bb21 Merge "Implement LauncherApps.startShortcut()." into nyc-dev 2016-03-09 01:38:37 +00:00
Abhijith Shastry
f988290d3b Merge "Document that emergency numbers will not be blocked by the platform." into nyc-dev am: d1a766e820 
am: 3aea500d9b

* commit '3aea500d9b61b44e8d14a59283127e97dcde8558':
  Document that emergency numbers will not be blocked by the platform.
 2016-03-09 01:28:54 +00:00
Abhijith Shastry
3aea500d9b Merge "Document that emergency numbers will not be blocked by the platform." into nyc-dev 
am: d1a766e820

* commit 'd1a766e820115ed5ce743e819402d6b52ab8036d':
  Document that emergency numbers will not be blocked by the platform.
 2016-03-09 01:26:59 +00:00
Makoto Onuki
43204b8357 Implement LauncherApps.startShortcut(). 
Bug 27548047

Change-Id: I357732e22be0959fb573fd6cdaee7c6b439ef7c4
 2016-03-08 17:26:28 -08:00
Abhijith Shastry
d1a766e820 Merge "Document that emergency numbers will not be blocked by the platform." into nyc-dev 2016-03-09 01:22:21 +00:00
Abhijith Shastry
e3e686cff8 Document that emergency numbers will not be blocked by the platform. 
BUG: 27534486
Change-Id: Idd339ca16e2b754112fc5d0966a7cf76d9990c98
 2016-03-08 16:55:01 -08:00
Yohei Yukawa
40b8a87272 Merge "Dump spell checker service info from TSMS." into nyc-dev am: bc234bb9b6 
am: adf00fb062

* commit 'adf00fb0625f3110af0d5255939c0a80888333ad':
  Dump spell checker service info from TSMS.
 2016-03-09 00:28:22 +00:00
Yohei Yukawa
adf00fb062 Merge "Dump spell checker service info from TSMS." into nyc-dev 
am: bc234bb9b6

* commit 'bc234bb9b683b204545655b89523ac63aa0dacbe':
  Dump spell checker service info from TSMS.
 2016-03-09 00:21:21 +00:00
Sudheer Shanka
80e6e6332b Merge "Update DPM.getWifiMacAddress to take admin component as argument." into nyc-dev am: 97e89c624e 
am: 6f0d578ea9

* commit '6f0d578ea97454e550586f58279bf868f24a2d53':
  Update DPM.getWifiMacAddress to take admin component as argument.
 2016-03-08 23:49:35 +00:00
Yohei Yukawa
bc234bb9b6 Merge "Dump spell checker service info from TSMS." into nyc-dev 2016-03-08 23:44:23 +00:00
Yohei Yukawa
85df698df5 Dump spell checker service info from TSMS. 
This is a preparation CL to make TextServicesManagerService (TSMS)
encryption-aware.

This CL changes nothing except for the output of TSMS#dump().

To diagnose File-Based Encryption (FBE) related issues, it would be
useful if we can see if each spell checker service is encryption-aware
or not.  To do that this CL updates TSMS#dump() so that it can include
the result of ResolveInfo#dump() as we have done in
InputMethodManagerService.

This CL also updates TSMS#dump() so that its output can be more
consistent with IMMS#dump().

Bug: 27456430
Change-Id: Ie2321278f1d52533a3cd74d98f1f84c950a8f6d0
 2016-03-08 15:16:07 -08:00
Sudheer Shanka
6f0d578ea9 Merge "Update DPM.getWifiMacAddress to take admin component as argument." into nyc-dev 
am: 97e89c624e

* commit '97e89c624e19c0a0ebe3d76506a493cfe29c0558':
  Update DPM.getWifiMacAddress to take admin component as argument.
 2016-03-08 23:09:23 +00:00
Sudheer Shanka
97e89c624e Merge "Update DPM.getWifiMacAddress to take admin component as argument." into nyc-dev 2016-03-08 22:52:11 +00:00
Selim Cinek
5473760ae0 Merge "Fixed a bug where the font sizes where not enforced correctly" into nyc-dev am: c5ce69f555 
am: 47bc04b0b0

* commit '47bc04b0b0403491fa64ec40d47d669be26bc428':
  Fixed a bug where the font sizes where not enforced correctly
 2016-03-08 22:47:06 +00:00
Selim Cinek
47bc04b0b0 Merge "Fixed a bug where the font sizes where not enforced correctly" into nyc-dev 
am: c5ce69f555

* commit 'c5ce69f555ce703a0bd1d7438e1b87ee9854eae8':
  Fixed a bug where the font sizes where not enforced correctly
 2016-03-08 22:27:42 +00:00
Selim Cinek
c5ce69f555 Merge "Fixed a bug where the font sizes where not enforced correctly" into nyc-dev 2016-03-08 22:16:44 +00:00
Muyuan Li
6ca619fe1a Partial screenshot 
Added a partial screenshot function in TakeScreenshotService
also added corresponding shortcut keys in PhoneWindowManager

Bug: 26820467
Change-Id: Id67cd3b4b0eed848eb4665056766546500bdac88
(cherry picked from commit 03e45541e9d54a2f285906ac7b5bcb374db14495)
 2016-03-08 14:12:18 -08:00
Adrian Roos
6f86c33ee2 Merge "Fix and optimize stripForDelivery" into nyc-dev am: 37b3a4a544 
am: 336256e1f6

* commit '336256e1f6aba6446f307957ba391c75f3a05eb2':
  Fix and optimize stripForDelivery
 2016-03-08 22:05:27 +00:00
mariagpuyol
a6d52f5f4f Merge "Fix bug in setText" into nyc-dev am: eff0a83a23 
am: 382caadcd8

* commit '382caadcd8872fd6d19006305c11c0153751c1b6':
  Fix bug in setText
 2016-03-08 21:58:15 +00:00
George Mount
57274f7b12 Merge "Fix propagation delay not working with minimum value = 0" into nyc-dev am: 193b821829 
am: dd37121f8a

* commit 'dd37121f8a07a267ee147e1f48150a93c1daab29':
  Fix propagation delay not working with minimum value = 0
 2016-03-08 21:52:14 +00:00
Adrian Roos
336256e1f6 Merge "Fix and optimize stripForDelivery" into nyc-dev 
am: 37b3a4a544

* commit '37b3a4a5440f489f65941b8182b33c34f86ffc1d':
  Fix and optimize stripForDelivery
 2016-03-08 21:50:32 +00:00
Adrian Roos
37b3a4a544 Merge "Fix and optimize stripForDelivery" into nyc-dev 2016-03-08 21:47:03 +00:00
mariagpuyol
382caadcd8 Merge "Fix bug in setText" into nyc-dev 
am: eff0a83a23

* commit 'eff0a83a23d1c34ea8a330e461a5660f7de1d768':
  Fix bug in setText
 2016-03-08 21:19:01 +00:00
George Mount
dd37121f8a Merge "Fix propagation delay not working with minimum value = 0" into nyc-dev 
am: 193b821829

* commit '193b821829723c008663e7f2021d9ad135c6c0b7':
  Fix propagation delay not working with minimum value = 0
 2016-03-08 21:11:19 +00:00
Maria Garcia Puyol
eff0a83a23 Merge "Fix bug in setText" into nyc-dev 2016-03-08 21:04:27 +00:00
George Mount
193b821829 Merge "Fix propagation delay not working with minimum value = 0" into nyc-dev 2016-03-08 21:03:16 +00:00
mariagpuyol
3dc88c8f14 Fix bug in setText 
Bug:27547655
Change-Id: Ia15facda59fab9a8fe9b30f74ddd085bc26871af
 2016-03-08 11:45:39 -08:00
Makoto Onuki
af00108ca4 resolve merge conflicts of 1ca3800c44 to master 
Change-Id: I4657cdf99900cd555c3109605e8cbdbb0fed79e6
 2016-03-08 10:39:25 -08:00
Makoto Onuki
1ca3800c44 Merge "Introducing ShortcutManager" into nyc-dev 
am: ed58f5f0aa

* commit 'ed58f5f0aa580dd4a6dc0fd5dc957862309db8d9':
  Introducing ShortcutManager
 2016-03-08 18:05:33 +00:00
Makoto Onuki
ed58f5f0aa Merge "Introducing ShortcutManager" into nyc-dev 2016-03-08 18:01:05 +00:00
Julia Reynolds
9a49d6c8ac Merge "Condition cleanup." into nyc-dev am: 4ed0e8cf8f 
am: ad23e7bf78

* commit 'ad23e7bf78b3826ed2eb4866593386af1533a2b4':
  Condition cleanup.
 2016-03-08 17:47:00 +00:00
Julia Reynolds
ad23e7bf78 Merge "Condition cleanup." into nyc-dev 
am: 4ed0e8cf8f

* commit '4ed0e8cf8fb38b30f7518286e4d52c091339ae63':
  Condition cleanup.
 2016-03-08 17:43:21 +00:00
Julia Reynolds
4ed0e8cf8f Merge "Condition cleanup." into nyc-dev 2016-03-08 17:39:01 +00:00
Teng-Hui Zhu
e81070387b Merge "Add tileMode support into GradientColor" into nyc-dev am: e4e4da5cc6 
am: b2c660bebe

* commit 'b2c660bebe05f9e4812fe38130c315eadb0927e3':
  Add tileMode support into GradientColor
 2016-03-08 17:34:28 +00:00
Teng-Hui Zhu
b2c660bebe Merge "Add tileMode support into GradientColor" into nyc-dev 
am: e4e4da5cc6

* commit 'e4e4da5cc6436c66765130e9ce498d29717c5f33':
  Add tileMode support into GradientColor
 2016-03-08 17:32:18 +00:00
George Mount
23d57f30c5 Fix propagation delay not working with minimum value = 0 
Bug 27545221

When the propagation delay had a minimum value of 0, no
propagation delay was happening.

Change-Id: Id28c2cac1c40d5c57f6b49fa11a60218ac1787a0
 2016-03-08 09:32:07 -08:00
Tenghui Zhu
e4e4da5cc6 Merge "Add tileMode support into GradientColor" into nyc-dev 2016-03-08 17:25:48 +00:00
Wale Ogunwale
61c9d69685 Merge "Disabled debug logs" into nyc-dev am: a521c4a9fa 
am: 677a569682

* commit '677a5696829e5e01a3e53d7a069a7653ad2f3bce':
  Disabled debug logs
 2016-03-08 17:16:35 +00:00
Tony Mantler
f8444fdfda Merge "Add hidden slide fraction call to Slide" into nyc-dev am: ad43160b65 
am: be08f26177

* commit 'be08f261773ebddb3be0870eb152c52c821daccf':
  Add hidden slide fraction call to Slide
 2016-03-08 17:14:05 +00:00
Wale Ogunwale
677a569682 Merge "Disabled debug logs" into nyc-dev 
am: a521c4a9fa

* commit 'a521c4a9fae31a1d51e80b2312c7e2a0b03908a9':
  Disabled debug logs
 2016-03-08 17:11:28 +00:00
Tony Mantler
be08f26177 Merge "Add hidden slide fraction call to Slide" into nyc-dev 
am: ad43160b65

* commit 'ad43160b6592de79bc9b8275370e57b338a5d9a4':
  Add hidden slide fraction call to Slide
 2016-03-08 17:08:43 +00:00
Wale Ogunwale
a521c4a9fa Merge "Disabled debug logs" into nyc-dev 2016-03-08 16:55:35 +00:00
Tony Mantler
ad43160b65 Merge "Add hidden slide fraction call to Slide" into nyc-dev 2016-03-08 16:53:58 +00:00
Julia Reynolds
1d6d16d699 Condition cleanup. 
Change-Id: If978bebac52c0b1438e86339669f409b4b17c6fc
 2016-03-08 10:41:31 -05:00
Jorim Jaggi
80a192059f Merge "Don\'t dock tasks that are non-dockable" into nyc-dev am: f2d7b28115 
am: d31546c9e8

* commit 'd31546c9e8832ee90ea0ba09b111f27539a0abd8':
  Don't dock tasks that are non-dockable
 2016-03-08 15:36:30 +00:00