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

181629 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joe Fernandez
3548de6073 am 5c37c8e6: am d801a123: am 2b68ab3a: Merge "docs: studio emulator platform update" into lmp-docs 
* commit '5c37c8e66227b15d471047e7c4c986cf3c67876a':
  docs: studio emulator platform update
 2015-01-31 00:14:39 +00:00
Jon Larimer
9e7e8afbb9 am 545dd853: am 9a425aa7: am 159aa735: am d4031809: am 48c95c43: Fix build breakage in older branches by avoiding <> notation 
automerge: 5c9d0de

* commit '5c9d0de174caf151937f19aa6898f60bce3fb4f4':
  Fix build breakage in older branches by avoiding <> notation
 2015-01-31 00:05:54 +00:00
Alan Viverette
96ccd39d35 Use inherited visibility to set visibility of managed drawables 
Previously we only used direct visibility, which resulted in strange
behavior when a parent view with an animated child was hidden. We were
also incorrectly awakening scroll bars for non-visible views, though
that's a much less visible (pun intended) bug.

Only handles the two most common cases for ripples. A subsequent CL will
update handling of View drawable management and fix this for all managed
drawables.

Bug: 15350931
Change-Id: I0d0fe2c51210e8d2e0a73b0248cec3b93bfc36f5
 2015-01-30 15:55:48 -08:00
Joe Fernandez
5c37c8e662 am d801a123: am 2b68ab3a: Merge "docs: studio emulator platform update" into lmp-docs 
* commit 'd801a1238392b8c7a8e0131cee89370143363046':
  docs: studio emulator platform update
 2015-01-30 23:41:10 +00:00
Scott Kennedy
2333e3406c Add some @Nullable annotations to SharedPreferences 
Change-Id: I26e7a02a18d802902fca6892bed77b4f98ccf3ee
 2015-01-30 15:37:45 -08:00
Joe Fernandez
d801a12383 am 2b68ab3a: Merge "docs: studio emulator platform update" into lmp-docs 
* commit '2b68ab3adda1ecce045b7b56b8c37ab4d960d2b4':
  docs: studio emulator platform update
 2015-01-30 23:34:44 +00:00
Joe Fernandez
2b68ab3add Merge "docs: studio emulator platform update" into lmp-docs 2015-01-30 23:25:51 +00:00
John Reck
8a6b56651b Merge "Add a WAIT_FOR_GPU_COMPLETION option" 2015-01-30 23:12:43 +00:00
Jon Larimer
0f2d0dbac6 am 3a6d8f54: am 90d5bd8d: am feb362a5: am a0d3bfbe: am 5c9d0de1: am 545dd853: am 9a425aa7: am 159aa735: am d4031809: am 48c95c43: Fix build breakage in older branches by avoiding <> notation 
automerge: ff526fa

* commit 'ff526fa7106fd45bfc4f1606fe051000c5201920':
  Fix build breakage in older branches by avoiding <> notation
 2015-01-30 22:41:30 +00:00
Jon Larimer
ff526fa710 am 3a6d8f54: am 90d5bd8d: am feb362a5: am a0d3bfbe: am 5c9d0de1: am 545dd853: am 9a425aa7: am 159aa735: am d4031809: am 48c95c43: Fix build breakage in older branches by avoiding <> notation 
* commit '3a6d8f5473f2451a0bdf13d4cc1d31e419d23f0c':
  Fix build breakage in older branches by avoiding <> notation
 2015-01-30 22:40:17 +00:00
Jon Larimer
3a6d8f5473 am 90d5bd8d: am feb362a5: am a0d3bfbe: am 5c9d0de1: am 545dd853: am 9a425aa7: am 159aa735: am d4031809: am 48c95c43: Fix build breakage in older branches by avoiding <> notation 
* commit '90d5bd8daab404afc50470f5c19ea725bd2466fe':
  Fix build breakage in older branches by avoiding <> notation
 2015-01-30 22:33:13 +00:00
Stuart Scott
3165abfd34 am 712d5b3d: am 147b6a35: Merge "[DS] Correct the access method for telephony system property" into lmp-mr1-dev 
automerge: 2e233d3

* commit '2e233d30662d26846a42c298967842d2e8537653':
  [DS] Correct the access method for telephony system property
 2015-01-30 22:26:27 +00:00
Jon Larimer
90d5bd8daa am feb362a5: am a0d3bfbe: am 5c9d0de1: am 545dd853: am 9a425aa7: am 159aa735: am d4031809: am 48c95c43: Fix build breakage in older branches by avoiding <> notation 
* commit 'feb362a5d194b30226caf2efbaae77991007c65c':
  Fix build breakage in older branches by avoiding <> notation
 2015-01-30 22:24:43 +00:00
Stuart Scott
2e233d3066 am 712d5b3d: am 147b6a35: Merge "[DS] Correct the access method for telephony system property" into lmp-mr1-dev 
* commit '712d5b3d582dfe8f7fb855ba98704c98e9441836':
  [DS] Correct the access method for telephony system property
 2015-01-30 22:24:25 +00:00
Jon Larimer
feb362a5d1 am a0d3bfbe: am 5c9d0de1: am 545dd853: am 9a425aa7: am 159aa735: am d4031809: am 48c95c43: Fix build breakage in older branches by avoiding <> notation 
* commit 'a0d3bfbe8736fd638621ae48371b6e4e237ed4b1':
  Fix build breakage in older branches by avoiding <> notation
 2015-01-30 22:18:34 +00:00
Stuart Scott
712d5b3d58 am 147b6a35: Merge "[DS] Correct the access method for telephony system property" into lmp-mr1-dev 
* commit '147b6a3522b7032ede24101f5ac32ec7d7afa9e9':
  [DS] Correct the access method for telephony system property
 2015-01-30 22:17:42 +00:00
Jinsuk Kim
266fd264db am 42e785fb: am 3457ae47: Merge "Revert "CEC: Let playback device switch TV input after bootup"" into lmp-mr1-dev 
automerge: 7bc0929

* commit '7bc0929905fa5964a6f9a5b0b059153dc8cdd69d':
  Revert "CEC: Let playback device switch TV input after bootup"
 2015-01-30 22:16:46 +00:00
Jinsuk Kim
7bc0929905 am 42e785fb: am 3457ae47: Merge "Revert "CEC: Let playback device switch TV input after bootup"" into lmp-mr1-dev 
* commit '42e785fbf7dfa50096275cf1e6233247e9fc15f7':
  Revert "CEC: Let playback device switch TV input after bootup"
 2015-01-30 22:15:00 +00:00
Jon Larimer
a0d3bfbe87 am 5c9d0de1: am 545dd853: am 9a425aa7: am 159aa735: am d4031809: am 48c95c43: Fix build breakage in older branches by avoiding <> notation 
* commit '5c9d0de174caf151937f19aa6898f60bce3fb4f4':
  Fix build breakage in older branches by avoiding <> notation
 2015-01-30 22:11:56 +00:00
Stuart Scott
147b6a3522 Merge "[DS] Correct the access method for telephony system property" into lmp-mr1-dev 2015-01-30 22:09:38 +00:00
Jinsuk Kim
42e785fbf7 am 3457ae47: Merge "Revert "CEC: Let playback device switch TV input after bootup"" into lmp-mr1-dev 
* commit '3457ae4709c8444f8ff9cdaf5809d6164f3bd21a':
  Revert "CEC: Let playback device switch TV input after bootup"
 2015-01-30 22:06:09 +00:00
Jon Larimer
5c9d0de174 am 545dd853: am 9a425aa7: am 159aa735: am d4031809: am 48c95c43: Fix build breakage in older branches by avoiding <> notation 
* commit '545dd853bffbf778a0a44816ac6ed381b13f2158':
  Fix build breakage in older branches by avoiding <> notation
 2015-01-30 22:01:50 +00:00
Jinsuk Kim
3457ae4709 Merge "Revert "CEC: Let playback device switch TV input after bootup"" into lmp-mr1-dev 2015-01-30 22:00:40 +00:00
Jinsuk Kim
4361549891 Revert "CEC: Let playback device switch TV input after bootup" 
This reverts commit 8913a0e1e8559d96e82b1ff408dd312ed279021b.

Change-Id: Ibfabdd94206141274a69040e0ed90ba29aeae75b
 2015-01-30 21:58:18 +00:00
Jon Larimer
545dd853bf am 9a425aa7: am 159aa735: am d4031809: am 48c95c43: Fix build breakage in older branches by avoiding <> notation 
* commit '9a425aa71c0ae6fb8c9c84d3e71321a44433d861':
  Fix build breakage in older branches by avoiding <> notation
 2015-01-30 21:54:31 +00:00
Dianne Hackborn
bd39d50624 Merge "Record memory data in event log as we collect it for procstats." 2015-01-30 21:51:35 +00:00
Jon Larimer
9a425aa71c am 159aa735: am d4031809: am 48c95c43: Fix build breakage in older branches by avoiding <> notation 
* commit '159aa73574804967aded45d06b70df5a8dd64a58':
  Fix build breakage in older branches by avoiding <> notation
 2015-01-30 21:44:17 +00:00
Soonil Nagarkar
16bce33af6 Merge "Update Location.convert() javadocs to reflect their inconsistency with locales." 2015-01-30 21:29:38 +00:00
Jon Larimer
159aa73574 am d4031809: am 48c95c43: Fix build breakage in older branches by avoiding <> notation 
* commit 'd403180997898c98f0be15b810c4c9dd9002f92c':
  Fix build breakage in older branches by avoiding <> notation
 2015-01-30 21:28:59 +00:00
Zheng Fu
6e7c2c7ca5 Merge "Add backup_id column to raw_contacts, and hash_id column to data" 2015-01-30 21:16:52 +00:00
John Reck
5515637540 Add a WAIT_FOR_GPU_COMPLETION option 
Change-Id: I18d526120651676109200bfd5da87cafcd7e3d13
 2015-01-30 12:46:09 -08:00
Elliott Hughes
39f273b92d Merge branch 'master' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base 2015-01-30 19:32:21 +00:00
Jason Monk
c4980829e5 am b5083a7d: Merge "Fix QS bluetooth tile accessibility issue" into lmp-mr1-dev automerge: b2dd5cb automerge: d2f15ec 
* commit 'b5083a7d54f839db779a1fa60adc3ac5dbf70e79':
  Fix QS bluetooth tile accessibility issue
 2015-01-30 19:32:01 +00:00
Jon Larimer
d403180997 am 48c95c43: Fix build breakage in older branches by avoiding <> notation 
* commit '48c95c4370533bf27e537cbca1e64d060a016c5f':
  Fix build breakage in older branches by avoiding <> notation
 2015-01-30 19:30:57 +00:00
Jason Monk
6574cd8842 Merge "Fix QS bluetooth tile accessibility issue" into lmp-mr1-dev automerge: b2dd5cb automerge: d2f15ec 
automerge: b5083a7

* commit 'b5083a7d54f839db779a1fa60adc3ac5dbf70e79':
  Fix QS bluetooth tile accessibility issue
 2015-01-30 19:30:56 +00:00
Soonil Nagarkar
71f0cd45ef Update Location.convert() javadocs to reflect their inconsistency with locales. 
The Location.convert() methods do not invert each other as might be
expected. Changing this would introduce breaking changes, so I've
updated the javadocs to make this clearer.

Bug: 13280976
Change-Id: If4bd3c83d5fb67915450849ca471aabc27544dac
 2015-01-30 11:29:42 -08:00
Jason Monk
84183103f4 Fix expandSettingsPanel status bar call automerge: 3c68ca2 automerge: f388249 
automerge: 734219d

* commit '734219d9c22cbab2549d1d43d077e9e8e089730c':
  Fix expandSettingsPanel status bar call
 2015-01-30 19:29:31 +00:00
Jason Monk
b5083a7d54 Merge "Fix QS bluetooth tile accessibility issue" into lmp-mr1-dev automerge: b2dd5cb 
automerge: d2f15ec

* commit 'd2f15ecb08042aa49da04cb2bdbc6f4e7f97c757':
  Fix QS bluetooth tile accessibility issue
 2015-01-30 19:27:06 +00:00
Jason Monk
734219d9c2 Fix expandSettingsPanel status bar call automerge: 3c68ca2 
automerge: f388249

* commit 'f38824928cf586124ffc6dc7a85c7f8603f77c5a':
  Fix expandSettingsPanel status bar call
 2015-01-30 19:25:20 +00:00
Fyodor Kupolov
babdb0dc36 Merge "Removed userHandle from setXXX methods" 2015-01-30 19:21:10 +00:00
RoboErik
ddce02f3b9 Merge "Move mute/unmute handling to adjust volume paths" 2015-01-30 18:55:10 +00:00
Alan Viverette
447590524a Merge "Add accessors for switch thumb and track tinting" 2015-01-30 18:53:14 +00:00
Chris Craik
d7328ae790 Merge "Refactor blending and texture gl state" 2015-01-30 18:53:01 +00:00
Chris Craik
44eb2c0086 Refactor blending and texture gl state 
Change-Id: Ia6b3c8b2afd3dfcee7f3ce401d846b789612054a
 2015-01-30 10:49:05 -08:00
Jason Monk
d2f15ecb08 Merge "Fix QS bluetooth tile accessibility issue" into lmp-mr1-dev 
automerge: b2dd5cb

* commit 'b2dd5cb900d031acf255bddcbe2f57efb8f43adb':
  Fix QS bluetooth tile accessibility issue
 2015-01-30 18:48:15 +00:00
Jason Monk
f38824928c Fix expandSettingsPanel status bar call 
automerge: 3c68ca2

* commit '3c68ca2feab6d3cd09c297ddc2e77af67694feec':
  Fix expandSettingsPanel status bar call
 2015-01-30 18:46:31 +00:00
Winson Chung
0e0b7310a8 Merge "Adding some debug controls to test multi-window." 2015-01-30 18:43:19 +00:00
Mike Lockwood
5569aa5011 Merge "MidiManager: minor Javadoc tweaks" 2015-01-30 18:33:02 +00:00
Jason Monk
b2dd5cb900 Merge "Fix QS bluetooth tile accessibility issue" into lmp-mr1-dev 2015-01-30 18:27:53 +00:00
Derek Sollenberger
8bc2d056e1 Merge "Create proxy between Skia's SkCanvas and the framework Canvas." 2015-01-30 18:23:01 +00:00