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

147591 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
John Spurlock
08ffa6d487 am b1e68e97: am 8acc32ee: Merge "QS: Add 8dp above and below the tile panel." into lmp-dev 
* commit 'b1e68e97d08bdc4f4bc16e8787a1c1a5b88b8e77':
  QS: Add 8dp above and below the tile panel.
 2014-08-04 19:39:15 +00:00
John Spurlock
29c5f04632 am 8acc32ee: Merge "QS: Add 8dp above and below the tile panel." into lmp-dev 
* commit '8acc32eedd0eaff018863453af328d51496ff61c':
  QS: Add 8dp above and below the tile panel.
 2014-08-04 19:35:23 +00:00
Tom Taylor
05d601b991 am 9b7596e1: am f36cba5f: Merge "Allow MmsConfig override per request (1/3)" into lmp-dev 
* commit '9b7596e19034cc7305bb22c8ec3bbd9ffe3a4593':
  Allow MmsConfig override per request (1/3)
 2014-08-04 19:22:11 +00:00
Tom Taylor
2a38be897c am f36cba5f: Merge "Allow MmsConfig override per request (1/3)" into lmp-dev 
* commit 'f36cba5f8d315a2e043848c35d533a48b5881154':
  Allow MmsConfig override per request (1/3)
 2014-08-04 19:14:45 +00:00
Chet Haase
b81305a55a am 04c5921c: am 7c98f923: Merge "Give disappearing children a chance to recreate DisplayLists" into lmp-dev 
* commit '04c5921c3e256f149d69d321b8729b2cf07840af':
  Give disappearing children a chance to recreate DisplayLists
 2014-08-04 19:14:24 +00:00
Chet Haase
944ca2dfd3 am 7c98f923: Merge "Give disappearing children a chance to recreate DisplayLists" into lmp-dev 
* commit '7c98f92375c8037b513b58f84d627dc592c7005d':
  Give disappearing children a chance to recreate DisplayLists
 2014-08-04 19:10:30 +00:00
John Spurlock
191d09c467 am d8fc8726: am cdc993dd: Doze: Add a user opt-out setting. 
* commit 'd8fc8726188adf26929b998f14515cdffc313964':
  Doze: Add a user opt-out setting.
 2014-08-04 19:10:07 +00:00
John Spurlock
21752f5b4e am cdc993dd: Doze: Add a user opt-out setting. 
* commit 'cdc993dd255f9667e9b14c39e78c38718811d4d7':
  Doze: Add a user opt-out setting.
 2014-08-04 19:06:15 +00:00
John Spurlock
a4215ceb86 Doze: Add a user opt-out setting. 
When devices are configured with a doze component, the user
now has the option of disabling doze mode with a secure setting.

Bug:16703536
Change-Id: Ieab6ee8d2acf54580b86fb16e9d77b52080fb3b1
 2014-08-04 14:57:06 -04:00
Brian Carlstrom
31797e5c7b am 5a9b135f: am 20bac14e: Merge changes I69c064b0,I1972c5af 
* commit '5a9b135f983aa080fccbff29a328d1fc231d7e4a':
  Move image classes options from art to AndroidRuntime [frameworks/base]
  Disable compilation based on vold.decrypt. [frameworks/base]
 2014-08-04 18:37:59 +00:00
Brian Carlstrom
3c4d9ac865 am bccea16e: am 1de3c633: Merge "Move from dalvik.vm.image-dex2oat-flags to dalvik.vm.dex2oat-filter [frameworks/base]" 
* commit 'bccea16ec1dc0d91750dc2b6932c4d370b365b2a':
  Move from dalvik.vm.image-dex2oat-flags to dalvik.vm.dex2oat-filter [frameworks/base]
 2014-08-04 18:37:35 +00:00
Brian Carlstrom
5a9b135f98 am 20bac14e: Merge changes I69c064b0,I1972c5af 
* commit '20bac14e521dd551addd8541380f1d9b6c910bd2':
  Move image classes options from art to AndroidRuntime [frameworks/base]
  Disable compilation based on vold.decrypt. [frameworks/base]
 2014-08-04 18:32:59 +00:00
Brian Carlstrom
bccea16ec1 am 1de3c633: Merge "Move from dalvik.vm.image-dex2oat-flags to dalvik.vm.dex2oat-filter [frameworks/base]" 
* commit '1de3c633dc1c355ee2356249e6309c5adf83c9a6':
  Move from dalvik.vm.image-dex2oat-flags to dalvik.vm.dex2oat-filter [frameworks/base]
 2014-08-04 18:32:54 +00:00
Geoff Mendal
6af1e7d126 am 5b17e517: (-s ours) am 0742dd28: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '5b17e51709b70feed9ee90e5e1b6010596976581':
  Import translations. DO NOT MERGE
 2014-08-04 18:31:23 +00:00
Geoff Mendal
03c8b91179 am a95df0fe: (-s ours) am b1a8c86d: (-s ours) Import translations. DO NOT MERGE 
* commit 'a95df0fe39fbe42e1aac436d6e05564de9bcb3a8':
  Import translations. DO NOT MERGE
 2014-08-04 18:31:19 +00:00
Geoff Mendal
7f2a792ca1 am 0742dd28: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '0742dd28ce5cc03120735ec27f5f7deffc249402':
  Import translations. DO NOT MERGE
 2014-08-04 18:26:51 +00:00
Geoff Mendal
a833246785 am b1a8c86d: (-s ours) Import translations. DO NOT MERGE 
* commit 'b1a8c86d7e3a8042ed42f5772c7aa5d2ba63c6c2':
  Import translations. DO NOT MERGE
 2014-08-04 18:26:47 +00:00
Geoff Mendal
d809436c92 Import translations. DO NOT MERGE 
Change-Id: I11a53b337e1607794c52fd0e60fd6fefac76f9ef
Auto-generated-cl: translation import
 2014-08-04 18:21:48 +00:00
Craig Mautner
5138d44c31 am d096c7c1: am 4f7ebb7f: Merge "Call method while holding lock." into lmp-dev 
* commit 'd096c7c175074458dd2a2fe0a41b14ecbd5f5402':
  Call method while holding lock.
 2014-08-04 17:42:00 +00:00
Craig Mautner
995eeb3e05 am 4f7ebb7f: Merge "Call method while holding lock." into lmp-dev 
* commit '4f7ebb7f957136fa32dc4acd29d51256ea8977fb':
  Call method while holding lock.
 2014-08-04 17:37:06 +00:00
Geoff Mendal
3bde7fcfdb am e19cf672: (-s ours) am 525c049f: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit 'e19cf672ee7085fabd4d60a142f85340f8a6e1f0':
  Import translations. DO NOT MERGE
 2014-08-04 17:14:26 +00:00
Geoff Mendal
8dfb1ec33e am a3efb0e4: (-s ours) am 61cd3da7: (-s ours) Import translations. DO NOT MERGE 
* commit 'a3efb0e4e6bd9fdd942c4bc623f0bc84b00af82f':
  Import translations. DO NOT MERGE
 2014-08-04 17:14:22 +00:00
Geoff Mendal
5155133bc8 am 525c049f: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '525c049f87b3ae72224f9b0c172cd047a1fa7da1':
  Import translations. DO NOT MERGE
 2014-08-04 17:11:10 +00:00
Geoff Mendal
c70f41f744 am 61cd3da7: (-s ours) Import translations. DO NOT MERGE 
* commit '61cd3da7e93e257cf2f51fb9c7efe640255daa84':
  Import translations. DO NOT MERGE
 2014-08-04 17:11:06 +00:00
Geoff Mendal
fddc4e9578 Import translations. DO NOT MERGE 
Change-Id: I9416cdb82f88c7cf05339c23a241100b0fb09bc4
Auto-generated-cl: translation import
 2014-08-04 17:06:17 +00:00
John Spurlock
dea8f79f88 am da1c042b: am a8473a79: Doze: Follow the notification light. 
* commit 'da1c042bd7399319a2403ab523e5b9cb95f74182':
  Doze: Follow the notification light.
 2014-08-04 15:41:09 +00:00
John Spurlock
1069f17217 am a8473a79: Doze: Follow the notification light. 
* commit 'a8473a7962291ad292b2a98e8e43ee07eb0cd5c4':
  Doze: Follow the notification light.
 2014-08-04 15:37:19 +00:00
John Spurlock
cb566aab57 Doze: Follow the notification light. 
- Send the notification light info up to SystemUI from NoMan.
 - Doze mode will now periodically pulse the display (once)
   if the notification light is active.
 - Change "tease" terminology to "pulse", which is the singular.
   Maintain the multi-pulse on buzz-beep-blink for now as extra
   emphasis.
 - Scrim controller now always takes number of pulses as an arg,
   to support a single pulse (used for notification light, and
   eventually pickup once available).
 - Dial down the display brightness when pulsing.

Bug:15863249
Change-Id: Ifb208a27e82b66cff1d0c04e5b7f758098ea29cf
 2014-08-04 11:32:18 -04:00
Jason Monk
0b564c9012 am a4aefb76: am b903eee6: Merge "QS: Add security footer." into lmp-dev 
* commit 'a4aefb76e700a1e8657a49391191dadb3a73fe83':
  QS: Add security footer.
 2014-08-04 15:06:18 +00:00
Jason Monk
423db04a58 am b903eee6: Merge "QS: Add security footer." into lmp-dev 
* commit 'b903eee67e6b262a2ca3fab427ea8bd5d9fdaa85':
  QS: Add security footer.
 2014-08-04 15:02:24 +00:00
Christoph Studer
e71d2d596e am 3ac1c594: am 4021914f: Merge "NoMan: Optimize profile badge retrieval" into lmp-dev 
* commit '3ac1c59455bd17a6921bfff8cc2125a00ae552ee':
  NoMan: Optimize profile badge retrieval
 2014-08-04 14:47:19 +00:00
Christoph Studer
5d2f125176 am 4021914f: Merge "NoMan: Optimize profile badge retrieval" into lmp-dev 
* commit '4021914fd594f1cb0c3f07047fdc527565b0c7d9':
  NoMan: Optimize profile badge retrieval
 2014-08-04 14:42:44 +00:00
Christoph Studer
2bebe8b243 am 457b4ac4: am 48ee8b10: Merge "NoMan: Fix notification sqlite log schema" into lmp-dev 
* commit '457b4ac423e340c12687d9ebf612bbfe256c9d9e':
  NoMan: Fix notification sqlite log schema
 2014-08-04 14:31:57 +00:00
Christoph Studer
91ad08420a am 48ee8b10: Merge "NoMan: Fix notification sqlite log schema" into lmp-dev 
* commit '48ee8b10abb287d8852e7a1088e114d8bf4c574a':
  NoMan: Fix notification sqlite log schema
 2014-08-04 14:27:35 +00:00
Torne (Richard Coles)
d26d2fcb5c am 19f21500: am 5deb8d4f: Don\'t let failures to load the null WebView propagate. 
* commit '19f215005f25bcfd0a25bca456305f07a80fab9f':
  Don't let failures to load the null WebView propagate.
 2014-08-04 13:41:47 +00:00
Torne (Richard Coles)
0b65f61821 am 5deb8d4f: Don\'t let failures to load the null WebView propagate. 
* commit '5deb8d4fae6cc8f34fdecb24f519da4fab569b6d':
  Don't let failures to load the null WebView propagate.
 2014-08-04 13:36:20 +00:00
Torne (Richard Coles)
5f3278ba1e Don't let failures to load the null WebView propagate. 
We load the null WebView if the real WebView package is not available to
support devices that aren't intended to have a WebView, but this results
in confusing log messages if the real WebView is supposed to be present
but is broken/unloadable for some reason. Since the null WebView is in
the system classpath on devices that should use it, swallow any failures
to load it on the assumption that this is actually just a failure of the
real WebView to be loaded.

Change-Id: I15820da3517daffde6169343c648a4486c0309d7
 2014-08-04 14:26:16 +01:00
Jorim Jaggi
33876762d9 am 05990f0e: am af334fb6: Merge "Faster timings when a notification comes out from more card" into lmp-dev 
* commit '05990f0e272524ac9fc5ff30c71d3cdeb166e444':
  Faster timings when a notification comes out from more card
 2014-08-04 12:17:48 +00:00
Christoph Studer
6f4316a866 am 06a6416a: am 63cb39a3: Merge "NoMan: Fix speedbump when no low-prio notifs" into lmp-dev 
* commit '06a6416a29bb98ffdb44d12a28a33956d0b1bb02':
  NoMan: Fix speedbump when no low-prio notifs
 2014-08-04 12:17:40 +00:00
Christoph Studer
4692edac29 am f20347e6: am 728662c8: Merge "Notif: Fix profile badge for stripped RemoteViews" into lmp-dev 
* commit 'f20347e6575ae8410446d667e026d938435f573f':
  Notif: Fix profile badge for stripped RemoteViews
 2014-08-04 12:17:36 +00:00
Tadashi G. Takaoka
33c23a8c38 am a2e464db: am 8b2a9aff: Merge "Fix input method picker using Material design language" into lmp-dev 
* commit 'a2e464db8134866429252f38cc12280bf46c5862':
  Fix input method picker using Material design language
 2014-08-04 12:17:30 +00:00
Yuncheol Heo
eded54ea23 am 377d02aa: am 4fe40c84: Merge "Add the CEC message handler for the standby mode." into lmp-dev 
* commit '377d02aa19444a54ca4a9929fd965f31f0cddfdf':
  Add the CEC message handler for the standby mode.
 2014-08-04 12:17:26 +00:00
Jaewan Kim
314f07da46 am 78542305: am 009d7b75: Merge "Fix typo in tv_content_rating_systems.xml" into lmp-dev 
* commit '7854230564df132b7f1904e15d26f6defd5d3330':
  Fix typo in tv_content_rating_systems.xml
 2014-08-04 12:17:22 +00:00
Jorim Jaggi
56bae5911e am af334fb6: Merge "Faster timings when a notification comes out from more card" into lmp-dev 
* commit 'af334fb69350c6fad3d83ec0ab4b88983a2139b2':
  Faster timings when a notification comes out from more card
 2014-08-04 12:08:19 +00:00
Christoph Studer
5f4eebd132 am 63cb39a3: Merge "NoMan: Fix speedbump when no low-prio notifs" into lmp-dev 
* commit '63cb39a348e2a88663c959da5b82cd15517e37f7':
  NoMan: Fix speedbump when no low-prio notifs
 2014-08-04 12:03:35 +00:00
Christoph Studer
89fdccc6a5 am 728662c8: Merge "Notif: Fix profile badge for stripped RemoteViews" into lmp-dev 
* commit '728662c89d47fc3719ea15fa2075af8cf4280456':
  Notif: Fix profile badge for stripped RemoteViews
 2014-08-04 11:57:58 +00:00
Tadashi G. Takaoka
887d8d62a7 am 8b2a9aff: Merge "Fix input method picker using Material design language" into lmp-dev 
* commit '8b2a9aff89f88ae7784cde4c4f4f52076d6c19bd':
  Fix input method picker using Material design language
 2014-08-04 11:57:54 +00:00
Yuncheol Heo
91cba804ac am 4fe40c84: Merge "Add the CEC message handler for the standby mode." into lmp-dev 
* commit '4fe40c84ab521fe740819da844529ee8fde22a69':
  Add the CEC message handler for the standby mode.
 2014-08-04 11:57:49 +00:00
Jaewan Kim
119e22cddb am 009d7b75: Merge "Fix typo in tv_content_rating_systems.xml" into lmp-dev 
* commit '009d7b75746d5bef1a848a3447e5a8dd60c7894c':
  Fix typo in tv_content_rating_systems.xml
 2014-08-04 11:57:44 +00:00
Jason Monk
3e137eb2b1 Merge "QS: Add security footer." into lmp-dev 2014-08-04 08:01:05 +00:00