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

124749 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chris Craik
b7d0cfa0d8 Merge "Add Path.isConvex, and force View outlines to be convex" 2014-03-06 18:18:59 +00:00
Chris Craik
ef8c07c86f Merge "Draw shadows from casters together if the Z values are similar" 2014-03-06 17:45:29 +00:00
Baligh Uddin
46b8d00b1e Merge "Import translations. DO NOT MERGE" 2014-03-06 17:00:38 +00:00
Baligh Uddin
a16e2a5c95 Merge "Import translations. DO NOT MERGE" 2014-03-06 17:00:35 +00:00
Martijn Coenen
ae2a35baf4 am 4d328a79: am a43f7cb0: am 1507c18f: am 29e55bef: Merge "NFC: getNdefMessage() should throw exception if no tag in field." 
* commit '4d328a79bdee417c1248660b1c33b5cd86dbd814':
  NFC: getNdefMessage() should throw exception if no tag in field.
 2014-03-06 16:21:46 +00:00
Martijn Coenen
4d328a79bd am a43f7cb0: am 1507c18f: am 29e55bef: Merge "NFC: getNdefMessage() should throw exception if no tag in field." 
* commit 'a43f7cb01e3638607949465d7a872bd5b0ce7253':
  NFC: getNdefMessage() should throw exception if no tag in field.
 2014-03-06 16:15:19 +00:00
Martijn Coenen
a43f7cb01e am 1507c18f: am 29e55bef: Merge "NFC: getNdefMessage() should throw exception if no tag in field." 
* commit '1507c18f87da9906337237d34184d6ac8f1afabd':
  NFC: getNdefMessage() should throw exception if no tag in field.
 2014-03-06 15:54:40 +00:00
Martijn Coenen
1507c18f87 am 29e55bef: Merge "NFC: getNdefMessage() should throw exception if no tag in field." 
* commit '29e55bef771ee1453017fbf73bb4de62d356e4fc':
  NFC: getNdefMessage() should throw exception if no tag in field.
 2014-03-06 07:51:13 -08:00
Andy McFadden
391d489ce0 Merge "FramebufferNativeWindow.h is obsolete" 2014-03-06 15:30:51 +00:00
Martijn Coenen
29e55bef77 Merge "NFC: getNdefMessage() should throw exception if no tag in field." 2014-03-06 14:33:11 +00:00
Kenny Guy
34a0992512 Merge "Start related users on boot and user switch." 2014-03-06 10:41:29 +00:00
Dianne Hackborn
97ae538554 Formalize time bases in battery stats. 
Battery stats used to revolve around a single time base
it maintained, "battery uptime and realtime."  This is derived
from the system's uptime and realtime, but only increments while
the device is on battery.  It is used to update its timers for
things like the screen being on, wake locks, etc only while the
device is not plugged in to power.

This change formalizes that time base into a separate class that
maintains all of its state.  This is used to introduce a new
time base, "battery screen off," which only increments while the
device is on battery *and* the screen is off.  Wake locks are now
based on this time base, so we don't count them while the screen
is on -- it is misleading to have them increment while the screen
is on because the device is defined to always stay awake anyway
during that time, so what they are doing is irrelevant.

Change-Id: I020e20c930d8dca2953c6c3ddef1dc93c24161a5
 2014-03-05 21:48:07 -08:00
Santos Cordon
2c9fc10554 am 2fab2f63: am 91d59ad1: am 03f0834a: am a04a1fd1: am a45bb4be: am 77a60f00: Merge "Update permission description string." into klp-dev 
* commit '2fab2f63676af8a8f45fd303b255c88761c4f224':
  Update permission description string.
 2014-03-06 02:57:25 +00:00
Griff Hazen
5ab311550f am 6daf22ca: am 47826bfa: am c748341a: Merge "Add addExtras and getExtras to Notification.Builder." into klp-modular-dev 
* commit '6daf22ca7680261e07dfd298a43d6e473e6c06f6':
  Add addExtras and getExtras to Notification.Builder.
 2014-03-06 02:57:21 +00:00
Michael Wright
a6434b5e80 am 78e208ac: am 6b661fdc: am dd9f7cb2: Add Odie KL file. 
* commit '78e208accebd68fd1dc634a57323cafa1143d6ed':
  Add Odie KL file.
 2014-03-06 02:57:18 +00:00
Michael Wright
ecc7ca5385 resolved conflicts for merge of fa2e53cc to master 
Change-Id: Idc54765c28ab7c6c810095aba1ba21d7695e08d5
 2014-03-05 18:46:22 -08:00
Santos Cordon
2fab2f6367 am 91d59ad1: am 03f0834a: am a04a1fd1: am a45bb4be: am 77a60f00: Merge "Update permission description string." into klp-dev 
* commit '91d59ad18c441fce65f36314b4bc10aece3c0c4f':
  Update permission description string.
 2014-03-06 02:40:10 +00:00
Griff Hazen
6daf22ca76 am 47826bfa: am c748341a: Merge "Add addExtras and getExtras to Notification.Builder." into klp-modular-dev 
* commit '47826bfa1627fe84bf2ab5d2ee45845bef7b2ff6':
  Add addExtras and getExtras to Notification.Builder.
 2014-03-06 02:35:56 +00:00
Michael Wright
78e208acce am 6b661fdc: am dd9f7cb2: Add Odie KL file. 
* commit '6b661fdcb6032851b6901a9ff0b82fd79dbbdfb7':
  Add Odie KL file.
 2014-03-06 02:35:53 +00:00
Santos Cordon
91d59ad18c am 03f0834a: am a04a1fd1: am a45bb4be: am 77a60f00: Merge "Update permission description string." into klp-dev 
* commit '03f0834a03ed8296f31341b6d7b530ea74bc0188':
  Update permission description string.
 2014-03-06 02:35:19 +00:00
Jason Sams
659a05a25c am edf0b79d: am 24ea88a9: am 9a9916b5: am 2383f220: Merge "Validate objects are from the correct context." 
* commit 'edf0b79d55df17fddb6b96de32f34ffccc8ec2d4':
  Validate objects are from the correct context.
 2014-03-06 02:29:06 +00:00
Fabrice Di Meglio
5cdb8d1d99 am 9c918534: (-s ours) am db3e7782: am 71c3a3d9: am 6c3a45d7: am 57f8a4b4: am 1ff2df61: Merge "Fix bug #12066726 java.lang.NullPointerException at android.widget.CalendarView.onScroll(CalendarView.java:1216) - DO NOT MERGE" into klp-dev 
* commit '9c9185348ad2487aad043c565fe221b4a56ef0b9':
  Fix bug #12066726 java.lang.NullPointerException at android.widget.CalendarView.onScroll(CalendarView.java:1216) - DO NOT MERGE
 2014-03-06 02:29:01 +00:00
Fabrice Di Meglio
2af0f354f5 am dfb76305: (-s ours) am 1eb5c055: am cf33fe68: am e1190a99: am cb6dcd7a: am 2b58a29f: Merge "Fix bug #12422326 Unable to change text direction programmatically using setTextDirection Android SDK API - DO NOT MERGE" into klp-dev 
* commit 'dfb76305c78ac596cf025e3410a04bd8221cfeab':
  Fix bug #12422326 Unable to change text direction programmatically using setTextDirection Android SDK API - DO NOT MERGE
 2014-03-06 02:28:58 +00:00
Santos Cordon
03f0834a03 am a04a1fd1: am a45bb4be: am 77a60f00: Merge "Update permission description string." into klp-dev 
* commit 'a04a1fd10304de3f7a471aae6c954548be760c12':
  Update permission description string.
 2014-03-06 02:20:36 +00:00
Griff Hazen
47826bfa16 am c748341a: Merge "Add addExtras and getExtras to Notification.Builder." into klp-modular-dev 
* commit 'c748341af5616e183303dbe3267627a7f08aea37':
  Add addExtras and getExtras to Notification.Builder.
 2014-03-06 02:19:38 +00:00
Michael Wright
6b661fdcb6 am dd9f7cb2: Add Odie KL file. 
* commit 'dd9f7cb2948af46047ab16d44c28a8f91948bdf5':
  Add Odie KL file.
 2014-03-06 02:19:35 +00:00
Santos Cordon
a04a1fd103 am a45bb4be: am 77a60f00: Merge "Update permission description string." into klp-dev 
* commit 'a45bb4be2f12144754aa62a5d44c39db08b21c92':
  Update permission description string.
 2014-03-06 02:14:46 +00:00
Griff Hazen
c748341af5 Merge "Add addExtras and getExtras to Notification.Builder." into klp-modular-dev 2014-03-06 02:05:38 +00:00
Griff Hazen
720042b72f Add addExtras and getExtras to Notification.Builder. 
addExtras allows merging with exiting set extras instead of replacing
them. This matches the similar function putExtras in Intent.

Both functions are useful for multi-stage notification building logic.

Change-Id: Ice3e4a53ec05b7129ebdac14e2084163946273a4
 2014-03-05 18:00:57 -08:00
Santos Cordon
a45bb4be2f am 77a60f00: Merge "Update permission description string." into klp-dev 
* commit '77a60f006f8b7260207043529d3ed004db301bd5':
  Update permission description string.
 2014-03-06 01:56:50 +00:00
Filip Gruszczyński
b50cea0267 resolved conflicts for merge of 1569d61f to master 
Change-Id: I5bc751a2ae52a8d7542b5b49d27fc90b4a1c7673
 2014-03-05 17:56:40 -08:00
Santos Cordon
77a60f006f Merge "Update permission description string." into klp-dev 2014-03-06 01:54:20 +00:00
Michael Wright
dd9f7cb294 Add Odie KL file. 
Change-Id: I74cc90a3c66e876db51da8f9fd8ced3bac373032
 2014-03-05 17:47:54 -08:00
Christopher Tate
cb20740ee1 Fix build. Silly gits. 
Change-Id: I8f21b7239621da500d9a73eb17d350e06dda9b20
 2014-03-05 17:22:25 -08:00
Michael Wright
fa2e53cc9f am 1f762b34: am 9aa7c6e5: am e4a71792: am 4448f9d7: am c5dea68e: Merge "Revert Japanese special case fallback keys." into klp-dev 
* commit '1f762b3490ce3583354ac3bf23732e88ebdb7b81':
  Revert Japanese special case fallback keys.
 2014-03-06 01:07:30 +00:00
Michael Wright
1f762b3490 am 9aa7c6e5: am e4a71792: am 4448f9d7: am c5dea68e: Merge "Revert Japanese special case fallback keys." into klp-dev 
* commit '9aa7c6e583ac18d6c338af8d478512c4ab5293b4':
  Revert Japanese special case fallback keys.
 2014-03-06 01:03:52 +00:00
Jason Sams
edf0b79d55 am 24ea88a9: am 9a9916b5: am 2383f220: Merge "Validate objects are from the correct context." 
* commit '24ea88a986cfb6de7197b213ad933a6eb6f0e285':
  Validate objects are from the correct context.
 2014-03-06 01:03:09 +00:00
Michael Wright
9aa7c6e583 am e4a71792: am 4448f9d7: am c5dea68e: Merge "Revert Japanese special case fallback keys." into klp-dev 
* commit 'e4a7179278375f48171746ffe93ca4529a927ecb':
  Revert Japanese special case fallback keys.
 2014-03-06 01:00:43 +00:00
Jason Sams
24ea88a986 am 9a9916b5: am 2383f220: Merge "Validate objects are from the correct context." 
* commit '9a9916b58fb22da735d18a03beffb24b4d5cd9a3':
  Validate objects are from the correct context.
 2014-03-06 00:59:17 +00:00
David 'Digit' Turner
fd2c77ca24 am 4bd720c2: am a05e7526: am 9c6f41e3: am be7b8f4f: Merge "aidl: Support building with updated host sysroot." 
* commit '4bd720c2c63b2400437db971ac96616693a8fe3b':
  aidl: Support building with updated host sysroot.
 2014-03-06 00:59:15 +00:00
Dianne Hackborn
f0dd80f673 am a984c582: am 75870cf3: am 75374879: am ea391750: am 5e578e17: am 40a26004: Issue #13308712: Add --checkin to package manager dump. 
* commit 'a984c5828749185ce560aa1e29661a5dadc93fbd':
  Issue #13308712: Add --checkin to package manager dump.
 2014-03-06 00:59:12 +00:00
Svetoslav
58af2ac338 am 28ba546c: am 8c6ed03c: am 1caa092f: Allow click listener registration in NumberPicker. 
* commit '28ba546c91418978f18a3da5e265e27d57d4f14e':
  Allow click listener registration in NumberPicker.
 2014-03-06 00:59:09 +00:00
Michael Wright
e4a7179278 am 4448f9d7: am c5dea68e: Merge "Revert Japanese special case fallback keys." into klp-dev 
* commit '4448f9d7ade3d08a29b1a191e182a403c5584388':
  Revert Japanese special case fallback keys.
 2014-03-06 00:56:59 +00:00
Jason Sams
9a9916b58f am 2383f220: Merge "Validate objects are from the correct context." 
* commit '2383f2200ab0c2dbd71708b5c1fb6af98db408fa':
  Validate objects are from the correct context.
 2014-03-05 16:56:02 -08:00
Michael Wright
4448f9d7ad am c5dea68e: Merge "Revert Japanese special case fallback keys." into klp-dev 
* commit 'c5dea68e9856698953dafca868eaee7207614641':
  Revert Japanese special case fallback keys.
 2014-03-06 00:53:22 +00:00
Jason Sams
2383f2200a Merge "Validate objects are from the correct context." 2014-03-06 00:50:24 +00:00
Michael Wright
c5dea68e98 Merge "Revert Japanese special case fallback keys." into klp-dev 2014-03-06 00:50:15 +00:00
Fabrice Di Meglio
9c9185348a am db3e7782: am 71c3a3d9: am 6c3a45d7: am 57f8a4b4: am 1ff2df61: Merge "Fix bug #12066726 java.lang.NullPointerException at android.widget.CalendarView.onScroll(CalendarView.java:1216) - DO NOT MERGE" into klp-dev 
* commit 'db3e77825d339cbe8840486bffbf7e03a53c1c4c':
  Fix bug #12066726 java.lang.NullPointerException at android.widget.CalendarView.onScroll(CalendarView.java:1216) - DO NOT MERGE
 2014-03-06 00:45:47 +00:00
Fabrice Di Meglio
dfb76305c7 am 1eb5c055: am cf33fe68: am e1190a99: am cb6dcd7a: am 2b58a29f: Merge "Fix bug #12422326 Unable to change text direction programmatically using setTextDirection Android SDK API - DO NOT MERGE" into klp-dev 
* commit '1eb5c0551f98b0340db37525f1f490c2d100cf38':
  Fix bug #12422326 Unable to change text direction programmatically using setTextDirection Android SDK API - DO NOT MERGE
 2014-03-06 00:45:44 +00:00
Chris Craik
dc66ee2103 Merge "Fix warnings in hwui" 2014-03-06 00:44:06 +00:00