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

125100 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Narayan Kamath
3a26ed5ab3 Merge "Support deprecated language codes." 2014-03-07 09:17:22 +00:00
Yohei Yukawa
ae90d762c3 Merge "Introduce InputMethodSubtypeArray for memory efficient IPCs" 2014-03-07 08:27:23 +00:00
Craig Mautner
e3987dff9c Merge "Merge commit 'c29ab2dd' into manualmerge" 2014-03-07 06:33:42 +00:00
Craig Mautner
00156ec200 Merge commit 'c29ab2dd' into manualmerge 
resolved conflicts for merge of c29ab2dd to master

Change-Id: I231bde04ed804097e546d6275d248310593dc3c5
 2014-03-06 22:29:37 -08:00
Marco Nelissen
faab8b2313 Fix build 
Bad automerge

Change-Id: I000a9d3ac2915b3e39d2d34bd52062ac47e9f0fe
 2014-03-06 22:19:02 -08:00
Jeff Brown
840c84749a Merge "Add config_supportAutoRotation." into klp-modular-dev 2014-03-07 04:40:10 +00:00
Jeff Brown
7ddc3cec32 Merge "Reorder config.xml constants related to auto-rotation." into klp-modular-dev 2014-03-07 04:39:06 +00:00
Jeff Brown
bcdfc62ae3 Add config_supportAutoRotation. 
On some products, it may not make sense to use the accelerometer
to perform auto-rotation.  In that case, the product's config.xml
framework resource overlay should set config_supportAutoRotation
to false.

Setting this to false also disables auto-rotation settings.

Bug: 13211999
Change-Id: If9d7d72f2a2c576b14a4ff0afb61ea52c42c3357
 2014-03-06 19:57:59 -08:00
Will Haldean Brown
760f1ffa17 am 9550ac44: am d7b5caab: am da9a956b: Merge "Fix Theme.Micro to not request ActionBar." into klp-modular-dev 
* commit '9550ac44a4a793c66f68794929a9e3704fecd096':
  Fix Theme.Micro to not request ActionBar.
 2014-03-07 03:10:08 +00:00
Svetoslav
20c86bcca5 am c4fce60c: am b28f8730: am 3cd04c99: am d2a244f9: am 8cb232cb: Merge "ProgressBar is important for accessibility by default." into klp-dev 
* commit 'c4fce60cd340a7c46c4643db6181472afc99e675':
  ProgressBar is important for accessibility by default.
 2014-03-07 03:10:05 +00:00
Marco Nelissen
da7ad468d9 am 4bf85e84: am daefb17c: am e1af0bd8: am 4f36104f: am e29c96e7: Merge "libexif is now libjhead" into klp-dev 
* commit '4bf85e84e95cd39f5bded8abc8d1e0bf9c28e3ce':
  libexif is now libjhead
 2014-03-07 03:10:01 +00:00
Jay Shrauner
f1cfb222e6 am 2876797c: (-s ours) am 4395a082: am d96e021a: am 1276295b: (-s ours) am a3ea4be5: Prevent SpellChecker from setting invalid range - DO NOT MERGE 
* commit '2876797cfba3b8e443c54469dc551a35a1f00ece':
  Prevent SpellChecker from setting invalid range - DO NOT MERGE
 2014-03-07 03:09:52 +00:00
Leon Scroggins III
5cf0595c17 am 5a2c6a21: (-s ours) am 6f71894b: am a4d7259c: am 87e9e744: (-s ours) am 92a32832: DO NOT MERGE - Fix Javadoc build break. 
* commit '5a2c6a2110e3ad26336158bd6679eba4292009e6':
  DO NOT MERGE - Fix Javadoc build break.
 2014-03-07 03:02:53 +00:00
Leon Scroggins III
a9193553dd am 9d3f94b9: (-s ours) am 86176afd: am 337a2003: am 8d3281f5: (-s ours) am ee008d42: Merge "Update framework to use M33 Skia. DO NOT MERGE" into klp-dev 
* commit '9d3f94b99b39c5748ba4a7e8198e5fcd9087414d':
  Update framework to use M33 Skia. DO NOT MERGE
 2014-03-07 03:02:35 +00:00
Eric Laurent
a68b609047 am 33ac1218: am 6c506aac: am 3260f254: am eac19754: am 617e715a: Merge "Fix RemoteController synchronization mode" into klp-dev 
* commit '33ac1218b93cb4fcaba398fd73f27dcc72dfede3':
  Fix RemoteController synchronization mode
 2014-03-07 03:02:31 +00:00
Dianne Hackborn
470d50dab4 am ece7042d: (-s ours) am 01579953: am 76e1d769: am 12caef78: (-s ours) am 71ab245a: Merge "Fix issue #11536426 DO NOT MERGE" into klp-dev 
* commit 'ece7042d7dc0e449fbcdb7698b31dee114042290':
  Fix issue #11536426 DO NOT MERGE
 2014-03-07 03:02:28 +00:00
Santos Cordon
eb7febbedf am 056d9ee4: (-s ours) am 61e385ac: am 59999040: am abbd963e: (-s ours) am 4c8c27ed: Updating wording around PROCESS_INCOMING_CALL. DO NOT MERGE. 
* commit '056d9ee45a8854441626e27a8ec3ad1339fb0728':
  Updating wording around PROCESS_INCOMING_CALL. DO NOT MERGE.
 2014-03-07 03:02:26 +00:00
Filip Gruszczyński
9fd3fa160d am 311bc983: am 2f1b6851: am fb71862d: Merge "Setting pretty large divider distance for NumberPicker in clockwork." into klp-modular-dev 
* commit '311bc98362d6944928865de414837bb73bbc7892':
  Setting pretty large divider distance for NumberPicker in clockwork.
 2014-03-07 02:55:27 +00:00
Baligh Uddin
7d42b895e6 am 3d207a2e: (-s ours) am 7f2a7372: (-s ours) am c7a535c5: (-s ours) am d010cf12: (-s ours) am 221849b6: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '3d207a2e5713c0b59efdf03c6096e3c1cefdfa0a':
  Import translations. DO NOT MERGE
 2014-03-07 02:55:24 +00:00
Alan Viverette
858a0405ec Add icons for display adjustment quick settings 
BUG: 13028934
Change-Id: I437abc48ad34364995b37c504019f7a4871c8031
 2014-03-06 18:36:43 -08:00
Jeff Brown
e7be7915a3 Reorder config.xml constants related to auto-rotation. 
Make it a little easier to find all of the relevant resources
in one place.  No functional changes.

Bug: 13211999
Change-Id: Ibfe48f48eae282fa09c95138983dab5e979a866c
 2014-03-06 18:16:34 -08:00
Adam Powell
c9e5f540a9 Fix a bug where OnTouchListeners in action views could be removed 
ActionMenuPresenter should only replace the touch listener when binding
a generated item view.

Bug 12470259

Change-Id: I8c4c6110065605225a20cb7ed872255282085661
 2014-03-06 17:57:05 -08:00
Marco Nelissen
50b70746af am 6cc044b0: am b2c45abc: am 233e7e9f: am 98a6bcf4: Merge "ExifInterface: fix class load failure" into klp-dev 
* commit '6cc044b0b0a095249f3929975bb7bd2f765c1327':
  ExifInterface: fix class load failure
 2014-03-07 01:40:25 +00:00
Dianne Hackborn
a6590837a9 am 8b776e86: am c71c901a: am 278fa87c: am 430652c1: Merge "Fix issue #13199860: PRE_BOOT_COMPLETED intent is..." into klp-dev 
* commit '8b776e8616ebbf49ae0bfcc79d74d32c560016b1':
  Fix issue #13199860: PRE_BOOT_COMPLETED intent is...
 2014-03-07 01:40:22 +00:00
Dianne Hackborn
cb15c7a83b More on issue #12031685 (DO NOT MERGE) 
Integrate from master:

Fix issue #13065185: Frequent runtime restarts on launching...

..."Hill Climb Racing" app

A service is in use when it is in the restarting state.

Change-Id: Iffdea96f867f89089e7ad07b4b1bef056951a5e8
 2014-03-06 17:39:11 -08:00
Marco Nelissen
6cc044b0b0 am b2c45abc: am 233e7e9f: am 98a6bcf4: Merge "ExifInterface: fix class load failure" into klp-dev 
* commit 'b2c45abc1d6f791f254c2cf6affcfc4f564d9cd2':
  ExifInterface: fix class load failure
 2014-03-07 01:35:35 +00:00
Dianne Hackborn
8b776e8616 am c71c901a: am 278fa87c: am 430652c1: Merge "Fix issue #13199860: PRE_BOOT_COMPLETED intent is..." into klp-dev 
* commit 'c71c901ad4d33a373efdad4cf97d12f8ca77e089':
  Fix issue #13199860: PRE_BOOT_COMPLETED intent is...
 2014-03-07 01:35:32 +00:00