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

124914 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dianne Hackborn
1fb6b9557e am 38d12b07: (-s ours) am a6947c41: am 045ed665: am 8e904d56: (-s ours) am 785d764b: Merge "More on issue #12031685 (DO NOT MERGE)" into klp-dev 
* commit '38d12b07e7483764749359a6f5aaebbf13d99f39':
  More on issue #12031685 (DO NOT MERGE)
 2014-03-07 20:33:35 +00:00
Andy McFadden
80af2fc5c6 am 43cd1d87: am ae6bd610: am 66069adb: am cda61e95: am faddd77a: Merge "EGL14.eglCreateWindowSurface should set producerControlledByApp" into klp-dev 
* commit '43cd1d87261dad595ed8bde271f1202cc7e5855d':
  EGL14.eglCreateWindowSurface should set producerControlledByApp
 2014-03-07 20:33:27 +00:00
Narayan Kamath
e78a747d35 am f7a6fe95: am 0425a51b: am 51ec4ec5: am 5de03b18: Merge "Don\'t assume that size_t is 32-bit" 
* commit 'f7a6fe95b0b439d3c6288b0b9da152b4c70c2265':
  Don't assume that size_t is 32-bit
 2014-03-07 20:22:15 +00:00
Narayan Kamath
6ae7cd063b am f2c11c14: am 214c3d9b: am 6ac6263d: am 28ccb4f7: Merge "Don\'t use size_t for variables that store uint32_t value" 
* commit 'f2c11c142975f1571a0e8606a3b274afcb987b83':
  Don't use size_t for variables that store uint32_t value
 2014-03-07 20:22:13 +00:00
Narayan Kamath
11d9e512eb am 3c9c67ae: (-s ours) am ca35c18a: am cd4874cf: am d265bcc4: Merge "Inform libcore of time format pref. changes." 
* commit '3c9c67ae666312070ddfb4d3aca1c0add708d056':
  Inform libcore of time format pref. changes.
 2014-03-07 20:22:10 +00:00
Chris Wren
e29c1ebd88 resolved conflicts for merge of 2f03cbe6 to master 
Change-Id: I3a11aa9e8e2228cfbb15900f2acaf062dd2660c5
 2014-03-07 15:04:11 -05:00
Jeff Brown
71c8fb92a1 am 2b27ef97: am c969450a: am 840c8474: Merge "Add config_supportAutoRotation." into klp-modular-dev 
* commit '2b27ef979dba3808cdae6dce32fe27b59197e34c':
  Add config_supportAutoRotation.
 2014-03-07 19:29:48 +00:00
Jeff Brown
2d6413a294 am 0b93d86b: am 1dade011: am 7ddc3cec: Merge "Reorder config.xml constants related to auto-rotation." into klp-modular-dev 
* commit '0b93d86bf4ab4a0ff2606af881d8bf4aaa8ce9b2':
  Reorder config.xml constants related to auto-rotation.
 2014-03-07 19:29:43 +00:00
John Spurlock
668fd22690 Merge "Tweaks to zen mode shade UI." 2014-03-07 18:54:06 +00:00
George Mount
daeb393618 Merge "Fix problem with Animators pausing the wrong Window." 2014-03-07 18:39:35 +00:00
John Spurlock
679fca5504 Tweaks to zen mode shade UI. 
Haptic feedback when shade is unlatched, and don't commit to expansion
until gesture up.

Bug:13359710
Change-Id: I128afc15c01478f643400da8b96679fcf1c89bf2
 2014-03-07 13:38:09 -05:00
Dianne Hackborn
38d12b07e7 am a6947c41: am 045ed665: am 8e904d56: (-s ours) am 785d764b: Merge "More on issue #12031685 (DO NOT MERGE)" into klp-dev 
* commit 'a6947c418129acc0815aac8aee86be0db5360232':
  More on issue #12031685 (DO NOT MERGE)
 2014-03-07 18:25:29 +00:00
Dianne Hackborn
a6947c4181 am 045ed665: am 8e904d56: (-s ours) am 785d764b: Merge "More on issue #12031685 (DO NOT MERGE)" into klp-dev 
* commit '045ed665197ed3ba0681db173a058a55662cd16a':
  More on issue #12031685 (DO NOT MERGE)
 2014-03-07 18:21:52 +00:00
Dianne Hackborn
045ed66519 am 8e904d56: (-s ours) am 785d764b: Merge "More on issue #12031685 (DO NOT MERGE)" into klp-dev 
* commit '8e904d565e8a54f755814e9ae062743b8b012731':
  More on issue #12031685 (DO NOT MERGE)
 2014-03-07 18:18:31 +00:00
Dianne Hackborn
8e904d565e am 785d764b: Merge "More on issue #12031685 (DO NOT MERGE)" into klp-dev 
* commit '785d764bd56b2d41216aa52ab8f6b6af9179f9c9':
  More on issue #12031685 (DO NOT MERGE)
 2014-03-07 18:15:19 +00:00
Dianne Hackborn
785d764bd5 Merge "More on issue #12031685 (DO NOT MERGE)" into klp-dev 2014-03-07 18:12:30 +00:00
Andy McFadden
43cd1d8726 am ae6bd610: am 66069adb: am cda61e95: am faddd77a: Merge "EGL14.eglCreateWindowSurface should set producerControlledByApp" into klp-dev 
* commit 'ae6bd6103f3d31387add53c6beac884ced82b706':
  EGL14.eglCreateWindowSurface should set producerControlledByApp
 2014-03-07 17:53:16 +00:00
Andy McFadden
ae6bd6103f am 66069adb: am cda61e95: am faddd77a: Merge "EGL14.eglCreateWindowSurface should set producerControlledByApp" into klp-dev 
* commit '66069adb9d22f28b48bd4689b592c887c008be52':
  EGL14.eglCreateWindowSurface should set producerControlledByApp
 2014-03-07 17:50:09 +00:00
Andy McFadden
66069adb9d am cda61e95: am faddd77a: Merge "EGL14.eglCreateWindowSurface should set producerControlledByApp" into klp-dev 
* commit 'cda61e95f6b600378ab64f43beb42dbbfa2f6a1a':
  EGL14.eglCreateWindowSurface should set producerControlledByApp
 2014-03-07 17:46:42 +00:00
Andy McFadden
cda61e95f6 am faddd77a: Merge "EGL14.eglCreateWindowSurface should set producerControlledByApp" into klp-dev 
* commit 'faddd77a917dd423aee5fc64c056c8c2e0ce6f9a':
  EGL14.eglCreateWindowSurface should set producerControlledByApp
 2014-03-07 17:43:40 +00:00
Andy McFadden
faddd77a91 Merge "EGL14.eglCreateWindowSurface should set producerControlledByApp" into klp-dev 2014-03-07 17:40:40 +00:00
Narayan Kamath
f7a6fe95b0 am 0425a51b: am 51ec4ec5: am 5de03b18: Merge "Don\'t assume that size_t is 32-bit" 
* commit '0425a51b0715e23de7c21feddf6cb055563c3a7a':
  Don't assume that size_t is 32-bit
 2014-03-07 16:18:21 +00:00
Narayan Kamath
f2c11c1429 am 214c3d9b: am 6ac6263d: am 28ccb4f7: Merge "Don\'t use size_t for variables that store uint32_t value" 
* commit '214c3d9b064c35437cfbab1ea3b82a7fb343ca6b':
  Don't use size_t for variables that store uint32_t value
 2014-03-07 16:18:18 +00:00
Narayan Kamath
3c9c67ae66 am ca35c18a: am cd4874cf: am d265bcc4: Merge "Inform libcore of time format pref. changes." 
* commit 'ca35c18a374c143831cc282987c762507c0ffc34':
  Inform libcore of time format pref. changes.
 2014-03-07 16:18:15 +00:00
Narayan Kamath
0425a51b07 am 51ec4ec5: am 5de03b18: Merge "Don\'t assume that size_t is 32-bit" 
* commit '51ec4ec51f88d854b182547405e37f3ae74c35bd':
  Don't assume that size_t is 32-bit
 2014-03-07 16:11:38 +00:00
Narayan Kamath
214c3d9b06 am 6ac6263d: am 28ccb4f7: Merge "Don\'t use size_t for variables that store uint32_t value" 
* commit '6ac6263dcc55a4a93647cc1307c901a01c06d89c':
  Don't use size_t for variables that store uint32_t value
 2014-03-07 16:11:35 +00:00
Narayan Kamath
ca35c18a37 am cd4874cf: am d265bcc4: Merge "Inform libcore of time format pref. changes." 
* commit 'cd4874cfdc00d17454529b5dca85a487c7c2de77':
  Inform libcore of time format pref. changes.
 2014-03-07 16:11:29 +00:00
Narayan Kamath
51ec4ec51f am 5de03b18: Merge "Don\'t assume that size_t is 32-bit" 
* commit '5de03b18ea455c0250cbd01912282f28d8635910':
  Don't assume that size_t is 32-bit
 2014-03-07 08:08:21 -08:00
Narayan Kamath
6ac6263dcc am 28ccb4f7: Merge "Don\'t use size_t for variables that store uint32_t value" 
* commit '28ccb4f7d9bbea65c8cb1807e332a46ef37bc619':
  Don't use size_t for variables that store uint32_t value
 2014-03-07 08:08:18 -08:00
Narayan Kamath
cd4874cfdc am d265bcc4: Merge "Inform libcore of time format pref. changes." 
* commit 'd265bcc4b555ab75009f8ceb32cc90007a621b41':
  Inform libcore of time format pref. changes.
 2014-03-07 08:08:05 -08:00
Narayan Kamath
5de03b18ea Merge "Don't assume that size_t is 32-bit" 2014-03-07 16:04:50 +00:00
Narayan Kamath
28ccb4f7d9 Merge "Don't use size_t for variables that store uint32_t value" 2014-03-07 16:04:28 +00:00
Chris Wren
2f03cbe6f8 am 148a965c: am d1862dac: am 111e981d: am 70d5ed26: Merge "use relative positioning for notification actions" into klp-dev 
* commit '148a965c81dfe8ca7281001931bdc65a7c1d2ded':
  use relative positioning for notification actions
 2014-03-07 15:20:38 +00:00
Chris Wren
148a965c81 am d1862dac: am 111e981d: am 70d5ed26: Merge "use relative positioning for notification actions" into klp-dev 
* commit 'd1862dac05e4302761c8d741a3286fe5eb6f1174':
  use relative positioning for notification actions
 2014-03-07 15:17:49 +00:00
Chris Wren
d1862dac05 am 111e981d: am 70d5ed26: Merge "use relative positioning for notification actions" into klp-dev 
* commit '111e981dc7f7d62647d6aa5e6c44cfd13af53608':
  use relative positioning for notification actions
 2014-03-07 15:15:08 +00:00
Chris Wren
111e981dc7 am 70d5ed26: Merge "use relative positioning for notification actions" into klp-dev 
* commit '70d5ed269268c1da6169b49b555d7295ac5d6763':
  use relative positioning for notification actions
 2014-03-07 15:10:47 +00:00
Chris Wren
70d5ed2692 Merge "use relative positioning for notification actions" into klp-dev 2014-03-07 15:08:29 +00:00
Jorim Jaggi
2d171a5bce Merge "Change appearance of notifications to light theme." 2014-03-07 14:07:07 +00:00
Narayan Kamath
f084e2779b Merge "Inform libcore of time format pref. changes." 2014-03-07 14:02:19 +00:00
Narayan Kamath
ccb2a086fe Inform libcore of time format pref. changes. 
- Introduce a boolean extra for intent TIME_CHANGED that
  specifies if the user wants a 24 hour format or not.
- Have the ActivityManagerService inform running processes
  of changes to this preference.
- Add plumbing in ActivityThread to inform j.t.DateFormat

(cherry-picked from dd491cc756233c088fd26eba4918671fcc9cfc30)

Change-Id: Ib90636bda4bc8332cfa22def831877b524b5c486
 2014-03-07 13:55:23 +00:00
Narayan Kamath
d265bcc4b5 Merge "Inform libcore of time format pref. changes." 2014-03-07 13:50:04 +00:00
Narayan Kamath
27ad525c7e Inform libcore of time format pref. changes. 
- Introduce a boolean extra for intent TIME_CHANGED that
  specifies if the user wants a 24 hour format or not.
- Have the ActivityManagerService inform running processes
  of changes to this preference.
- Add plumbing in ActivityThread to inform j.t.DateFormat

Change-Id: I05fafb903ae54e39c03a048b7a219dc5a93fd472
 2014-03-07 13:48:04 +00:00
Jorim Jaggi
39fa59fc49 Change appearance of notifications to light theme. 
Change-Id: Ic15e96582d6b46b4dc195b1c7c0cef38f25f0d38
 2014-03-07 14:34:17 +01:00
John Spurlock
6dd48a4e54 Merge "Separate power warnings UI from state calculation." 2014-03-07 13:28:58 +00:00
Marco Nelissen
35eb23cb10 am 50b70746: am 6cc044b0: am b2c45abc: am 233e7e9f: am 98a6bcf4: Merge "ExifInterface: fix class load failure" into klp-dev 
* commit '50b70746af13417f76b9abc846970ca5f3bff173':
  ExifInterface: fix class load failure
 2014-03-07 11:01:09 +00:00
Dianne Hackborn
72f456fc51 am a6590837: am 8b776e86: am c71c901a: am 278fa87c: am 430652c1: Merge "Fix issue #13199860: PRE_BOOT_COMPLETED intent is..." into klp-dev 
* commit 'a6590837a9d0211b4c44f25e1cbe2cd196aa1a3d':
  Fix issue #13199860: PRE_BOOT_COMPLETED intent is...
 2014-03-07 11:00:38 +00:00
Jeff Brown
2b27ef979d am c969450a: am 840c8474: Merge "Add config_supportAutoRotation." into klp-modular-dev 
* commit 'c969450acd4924f0f5478274c345207bf2c57768':
  Add config_supportAutoRotation.
 2014-03-07 10:50:44 +00:00
Jeff Brown
0b93d86bf4 am 1dade011: am 7ddc3cec: Merge "Reorder config.xml constants related to auto-rotation." into klp-modular-dev 
* commit '1dade011d740c58510d3731be11491dbd028ebda':
  Reorder config.xml constants related to auto-rotation.
 2014-03-07 10:50:42 +00:00
Jeff Brown
c969450acd am 840c8474: Merge "Add config_supportAutoRotation." into klp-modular-dev 
* commit '840c84749a6066b436db4dc94c3e3929a8440575':
  Add config_supportAutoRotation.
 2014-03-07 10:43:52 +00:00
Jeff Brown
1dade011d7 am 7ddc3cec: Merge "Reorder config.xml constants related to auto-rotation." into klp-modular-dev 
* commit '7ddc3cec322f0a4968f00c6bdf8e396094e36f5b':
  Reorder config.xml constants related to auto-rotation.
 2014-03-07 10:43:47 +00:00