drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
152,509 Commits 1 Branch 0 Tags
Commit Graph

152509 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Christoph Studer
7b9e4a9e3f am 9566d968: am 6cddeb73: am 2af8bb02: Merge "SysUI: Fix NotificationData dump" into lmp-dev 
* commit '9566d9688df43c921eb12813c64489d89c57648d':
  SysUI: Fix NotificationData dump
 2014-08-22 14:46:49 +00:00
Jessica Hummel
6736235831 am 6488989d: am e8bedefe: Merge "Final strings tweaks for work profile" into lmp-dev 
* commit '6488989d38187c0778be6e56dcdfd9c59d0ff0b6':
  Final strings tweaks for work profile
 2014-08-22 14:46:46 +00:00
Adrian Roos
7159a12b09 am 4e58c7e0: am 0fd731bd: am d7efee2a: Merge "Only run TrustAgentServices for users with secure keyguards" into lmp-dev 
* commit '4e58c7e0b80e128eb5751e6a71e17133ff894d61':
  Only run TrustAgentServices for users with secure keyguards
 2014-08-22 14:46:45 +00:00
Kenny Guy
dabe02d6ca am 1b637e65: am 28088d5b: Merge "Fix notification badge when line 3 not shown." into lmp-dev 
* commit '1b637e652374daa50524623852fd3cdc868a8117':
  Fix notification badge when line 3 not shown.
 2014-08-22 14:37:46 +00:00
Christoph Studer
51e87b82b7 am 6cddeb73: am 2af8bb02: Merge "SysUI: Fix NotificationData dump" into lmp-dev 
* commit '6cddeb7337d1f8649dd94a4aec08e16f2cf1b2a0':
  SysUI: Fix NotificationData dump
 2014-08-22 14:37:40 +00:00
Adrian Roos
060b15a058 am 0fd731bd: am d7efee2a: Merge "Only run TrustAgentServices for users with secure keyguards" into lmp-dev 
* commit '0fd731bd1c1572a11d119172c6b3e13e3719b568':
  Only run TrustAgentServices for users with secure keyguards
 2014-08-22 14:37:35 +00:00
Jessica Hummel
50582cc7ee am e8bedefe: Merge "Final strings tweaks for work profile" into lmp-dev 
* commit 'e8bedefebd2ec5a79bb5a13d904cfbadcfd3d089':
  Final strings tweaks for work profile
 2014-08-22 14:36:57 +00:00
Jessica Hummel
f9220b3953 Merge "Final strings tweaks for work profile" into lmp-dev 2014-08-22 14:26:56 +00:00
Kenny Guy
6a205dd37e am 28088d5b: Merge "Fix notification badge when line 3 not shown." into lmp-dev 
* commit '28088d5b3b58a815910e815347cf38e8093a7d7a':
  Fix notification badge when line 3 not shown.
 2014-08-22 14:26:56 +00:00
Christoph Studer
652f3e84f6 am 2af8bb02: Merge "SysUI: Fix NotificationData dump" into lmp-dev 
* commit '2af8bb0244633292d0143f9204363db1919166cf':
  SysUI: Fix NotificationData dump
 2014-08-22 14:26:50 +00:00
Adrian Roos
26277ea5ec am d7efee2a: Merge "Only run TrustAgentServices for users with secure keyguards" into lmp-dev 
* commit 'd7efee2a4168123572769032b6d37a6324b138cd':
  Only run TrustAgentServices for users with secure keyguards
 2014-08-22 14:26:46 +00:00
Kenny Guy
91d065bcbf Merge "Fix notification badge when line 3 not shown." into lmp-dev 2014-08-22 14:20:31 +00:00
Christoph Studer
17cda4f80f Merge "SysUI: Fix NotificationData dump" into lmp-dev 2014-08-22 14:18:04 +00:00
Adrian Roos
076e72554d Merge "Only run TrustAgentServices for users with secure keyguards" into lmp-dev 2014-08-22 14:17:32 +00:00
Christoph Studer
11840cdca9 SysUI: Fix NotificationData dump 
Inactive notification count and indices were off.

Change-Id: I6e8555fe7dcaf6e7f999f09fb4cda56622928b07
 2014-08-22 16:06:49 +02:00
Jessica Hummel
36b4e35a00 Final strings tweaks for work profile 
Change-Id: I29ea13d522d867f847e72f5c43170a526e4e7f07
bug:15744182
 2014-08-22 15:00:15 +01:00
John Spurlock
0674c4cf08 am 86def3c6: am e12bd4d1: am 4ebb6384: Merge "QS: Repoint Wifi + BT dual tile labels to settings." into lmp-dev 
* commit '86def3c679cf9ac1ebdf1ab6a9f2f0bfd9bd4c7e':
  QS: Repoint Wifi + BT dual tile labels to settings.
 2014-08-22 13:49:58 +00:00
John Spurlock
38ce842030 am 7ccf5171: am 43a6f7ac: am a15effc2: Merge "Don\'t do ambient display when in power-conservation mode." into lmp-dev 
* commit '7ccf51713f0ebadff7f3d78d95333d0df53e21d2':
  Don't do ambient display when in power-conservation mode.
 2014-08-22 13:49:53 +00:00
Jorim Jaggi
8377f50636 am 460edc86: am df0fc631: am f229ee63: Merge "Content description for padlock icon depending on state" into lmp-dev 
* commit '460edc86e811fc3999a3406bedbde8f6d8cb5e7b':
  Content description for padlock icon depending on state
 2014-08-22 13:49:46 +00:00
John Spurlock
25adf47efb am e12bd4d1: am 4ebb6384: Merge "QS: Repoint Wifi + BT dual tile labels to settings." into lmp-dev 
* commit 'e12bd4d1c3cb9b0ff852c13f33efc49b3229da5c':
  QS: Repoint Wifi + BT dual tile labels to settings.
 2014-08-22 13:39:43 +00:00
John Spurlock
b920f8f453 am 43a6f7ac: am a15effc2: Merge "Don\'t do ambient display when in power-conservation mode." into lmp-dev 
* commit '43a6f7acf9e50dc3005ac358d020bb63e9cb1476':
  Don't do ambient display when in power-conservation mode.
 2014-08-22 13:39:39 +00:00
Jorim Jaggi
c54d5a3b06 am df0fc631: am f229ee63: Merge "Content description for padlock icon depending on state" into lmp-dev 
* commit 'df0fc631614177fe95cec5ab2adaa131eb2d9a19':
  Content description for padlock icon depending on state
 2014-08-22 13:39:34 +00:00
John Spurlock
d3ca9165d2 am 4ebb6384: Merge "QS: Repoint Wifi + BT dual tile labels to settings." into lmp-dev 
* commit '4ebb638496a76b1810a655e9196bf41641690a48':
  QS: Repoint Wifi + BT dual tile labels to settings.
 2014-08-22 13:30:24 +00:00
John Spurlock
a0125c91ca am a15effc2: Merge "Don\'t do ambient display when in power-conservation mode." into lmp-dev 
* commit 'a15effc2f830a13c9b5a997b1c132e56ea5b6e9c':
  Don't do ambient display when in power-conservation mode.
 2014-08-22 13:30:20 +00:00
Jorim Jaggi
3631717fda am f229ee63: Merge "Content description for padlock icon depending on state" into lmp-dev 
* commit 'f229ee632cdf798ef2b1b68a438cd63ca7bbded9':
  Content description for padlock icon depending on state
 2014-08-22 13:30:15 +00:00
John Spurlock
2cd26fa48a Merge "QS: Repoint Wifi + BT dual tile labels to settings." into lmp-dev 2014-08-22 13:27:47 +00:00
John Spurlock
bd60d7f568 Merge "Don't do ambient display when in power-conservation mode." into lmp-dev 2014-08-22 13:27:29 +00:00
John Spurlock
af4c2183d9 am 79c8f6ff: am 6fa1365b: am 36902e93: Merge "Doze: Improve icon treatment when dozing." into lmp-dev 
* commit '79c8f6ff705f3613fee468c6266b7f8fb112d859':
  Doze: Improve icon treatment when dozing.
 2014-08-22 13:25:57 +00:00
Jorim Jaggi
414b152856 Merge "Content description for padlock icon depending on state" into lmp-dev 2014-08-22 13:21:46 +00:00
John Spurlock
438c847c30 am 6fa1365b: am 36902e93: Merge "Doze: Improve icon treatment when dozing." into lmp-dev 
* commit '6fa1365bf0e9c5c192dec84e10f6baea23dd07ee':
  Doze: Improve icon treatment when dozing.
 2014-08-22 13:15:52 +00:00
John Spurlock
45ff7a7285 am 36902e93: Merge "Doze: Improve icon treatment when dozing." into lmp-dev 
* commit '36902e93d806da8766c483e4271ac72945927d23':
  Doze: Improve icon treatment when dozing.
 2014-08-22 13:06:48 +00:00
John Spurlock
d96179e02d Don't do ambient display when in power-conservation mode. 
Finish SystemUI's doze dream early when we enter saver mode.

Bug:17164834
Change-Id: I79153be34da8c4b6447acf5dc9f93364906b2bab
 2014-08-22 09:02:58 -04:00
John Spurlock
394fd61115 Merge "Doze: Improve icon treatment when dozing." into lmp-dev 2014-08-22 12:59:16 +00:00
Kenny Guy
98193ea54f Fix notification badge when line 3 not shown. 
Ongoing notifications from chrome and drive
don't have content in line 3 so profile badge
wasn't shown.
Add profile badge to large notifications which
hide line 3.

Bug: 16366324
Change-Id: Ib4f1e888674743aa8ef93b7eaceae72602d8df4d
 2014-08-22 13:30:58 +01:00
Narayan Kamath
ab53d72be6 am f253175f: am 3a5f2493: am 00e947b5: Remove a line that was accidentally committed. 
* commit 'f253175ff91673070a33baca06252954626f2e03':
  Remove a line that was accidentally committed.
 2014-08-22 12:06:12 +00:00
Narayan Kamath
433f783259 am 3a5f2493: am 00e947b5: Remove a line that was accidentally committed. 
* commit '3a5f24936a9115203ba2661ce8be2a6ba49fd1e1':
  Remove a line that was accidentally committed.
 2014-08-22 11:56:53 +00:00
Narayan Kamath
a5bcef721c am 00e947b5: Remove a line that was accidentally committed. 
* commit '00e947b545dd6c193907d0a3d94d30fc59d6e54d':
  Remove a line that was accidentally committed.
 2014-08-22 11:47:01 +00:00
Narayan Kamath
31fe102d57 Remove a line that was accidentally committed. 
Prevents the APK from being installed.

bug: 17153971

Change-Id: Ic53c94dc6f0583371965d5edb0b12248c915214e
 2014-08-22 11:37:20 +00:00
Yohei Yukawa
b31fd9c8ee am f9040f30: am 3756a2e2: am dc42737e: Remove CursorAnchorInfoRequest and related stuff 
* commit 'f9040f30f0c80b3808999a3f639537ab36644a62':
  Remove CursorAnchorInfoRequest and related stuff
 2014-08-22 09:26:20 +00:00
Yohei Yukawa
75830944a8 am 3756a2e2: am dc42737e: Remove CursorAnchorInfoRequest and related stuff 
* commit '3756a2e2b17bee21d729c99488635d7d93010ce0':
  Remove CursorAnchorInfoRequest and related stuff
 2014-08-22 09:17:28 +00:00
Narayan Kamath
0d493531d3 am b01ba162: am 219e4501: am 089f9feb: Merge "Fix service tests." into lmp-dev 
* commit 'b01ba162b9ec2c74cb666859b12026c29a550277':
  Fix service tests.
 2014-08-22 09:06:56 +00:00
Yohei Yukawa
ab086bcd2d am dc42737e: Remove CursorAnchorInfoRequest and related stuff 
* commit 'dc42737ef203189df65f385bc370c7e19d3968fd':
  Remove CursorAnchorInfoRequest and related stuff
 2014-08-22 09:06:39 +00:00
Narayan Kamath
c5b929a94d am 219e4501: am 089f9feb: Merge "Fix service tests." into lmp-dev 
* commit '219e45010ecc695df42a13d76192afb714a8656b':
  Fix service tests.
 2014-08-22 08:03:34 +00:00
Yohei Yukawa
a277db28e9 Remove CursorAnchorInfoRequest and related stuff 
This CL removes CursorAnchorInfoRequest and related stuff
in favor of InputConnection.requestUpdateCursorAnchorInfo,
which is more easy to understand. This CL also deprecates
InputMethodManager#updateCursor and related stuff.

Rationale:
1. The spec of #updateCursor says that it provides the cursor
   position in local coordinates, while the input method
   requires it in the screen coordinates.
2. #updateCursor has never been enabled in AOSP, because
   InputMethodManager#isWatchingCursor always returned false.
3. There has been no way to let
   InputMethodManager#isWatchingCursor return true.
4. In L, InputMethodManager#updateCursorAnchorInfo is
   introduced to address all the issues above.

Given that we no longer need to support #updateCursor,
CursorAnchorInfoRequest is overkill when we need to convey
just a couple of parameters.

BUG: 17185263
BUG: 17182367

Change-Id: I4a577bfd02b37b9e56c80b8b41bb25afa95dd8ef
 2014-08-22 00:55:06 -07:00
Narayan Kamath
e082f26e21 am 089f9feb: Merge "Fix service tests." into lmp-dev 
* commit '089f9feb0913b4e9d3c854d8b0540573e8a8f0c9':
  Fix service tests.
 2014-08-22 07:54:39 +00:00
Narayan Kamath
97a50adde5 Merge "Fix service tests." into lmp-dev 2014-08-22 07:47:38 +00:00
Jungshik Jang
45b42cb423 am 770b50ce: am 32c63a97: am b66b5991: Add spam-safe logger. 
* commit '770b50ceffc1ca216d8a7e31c0c068c94d22c912':
  Add spam-safe logger.
 2014-08-22 07:07:26 +00:00
Jungshik Jang
132de2d573 am 32c63a97: am b66b5991: Add spam-safe logger. 
* commit '32c63a97fcd1c96533b9e6198eb4f69b62249607':
  Add spam-safe logger.
 2014-08-22 06:57:55 +00:00
Jungshik Jang
12e7300e1d am b66b5991: Add spam-safe logger. 
* commit 'b66b59918313532d36c557ad66b585a849566169':
  Add spam-safe logger.
 2014-08-22 06:48:06 +00:00
Jungshik Jang
dbe6b45545 Add spam-safe logger. 
This change introduces a new helper class, HdmiLogger,
which prevents spammy log for same error message.

Bug: 17179667
Change-Id: Ia55808408e0a92b0370cd627361f80754b2f1018
 2014-08-22 15:30:04 +09:00