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

181655 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joe Fernandez
f4b2bd4c41 am 1a9bf5c1: Merge "docs: training intent doc error update" into lmp-docs automerge: f02a8d9 automerge: cacf7da 
automerge: 346a9a2

* commit '346a9a2f364f7cdabf06944014594b299d384082':
  docs: training intent doc error update
 2015-01-31 04:01:11 +00:00
Deepanshu Gupta
c053438286 am 3d5535cf: Merge "Limited AppCompat support" into lmp-dev automerge: 7789447 
automerge: 580937f

* commit '580937fc45bc5ef97e45f1eaf67945a07c5ce41f':
  Limited AppCompat support
 2015-01-31 03:59:37 +00:00
Deepanshu Gupta
862cdd6f11 am 1d59871e: Merge "Resource resolution fixes." into lmp-dev automerge: 7e683bd 
automerge: 1575ca6

* commit '1575ca6e1a713f9d2e4a9f91bc6943ae10fde083':
  Resource resolution fixes.
 2015-01-31 03:58:26 +00:00
Jon Larimer
27d099a7e1 am 545dd853: am 9a425aa7: am 159aa735: am d4031809: am 48c95c43: Fix build breakage in older branches by avoiding <> notation automerge: 5c9d0de 
automerge: 9e7e8af

* commit '9e7e8afbb934742cb7996b22e32f94c1c09704af':
 2015-01-31 03:39:19 +00:00
Joe Fernandez
346a9a2f36 am 1a9bf5c1: Merge "docs: training intent doc error update" into lmp-docs automerge: f02a8d9 
automerge: cacf7da

* commit 'cacf7da1c4d078641f099bab717e155609c5dc99':
  docs: training intent doc error update
 2015-01-31 03:04:16 +00:00
Deepanshu Gupta
580937fc45 am 3d5535cf: Merge "Limited AppCompat support" into lmp-dev 
automerge: 7789447

* commit '7789447bd97c851b7a09623a417300590e5439d5':
  Limited AppCompat support
 2015-01-31 03:02:42 +00:00
Deepanshu Gupta
1575ca6e1a am 1d59871e: Merge "Resource resolution fixes." into lmp-dev 
automerge: 7e683bd

* commit '7e683bdaddff77a24a36d420c5782b47795c5ccb':
  Resource resolution fixes.
 2015-01-31 03:01:20 +00:00
Joe Fernandez
cacf7da1c4 am 1a9bf5c1: Merge "docs: training intent doc error update" into lmp-docs 
automerge: f02a8d9

* commit 'f02a8d9ffcd2f14c069b23d588ff2083cc53062d':
  docs: training intent doc error update
 2015-01-31 02:50:57 +00:00
Joe Fernandez
f02a8d9ffc am 1a9bf5c1: Merge "docs: training intent doc error update" into lmp-docs 
* commit '1a9bf5c10049e99398a80b985e22ea1bfd737bcd':
  docs: training intent doc error update
 2015-01-31 01:59:54 +00:00
Wonsik Kim
b561ccedd8 audio: allow audio port cache update even when audio patches contain invalidated sources/sinks 
When an audio device disconnects from Android, custom audio patches
containing the device become invalidated.
AudioManager::updateAudioPortCache() used to fail in that case, but
it causes onAudioPortListUpdated() event never gets called so that
the creator of the custom audio patch cannot update it. Let
updateAudioPortCached() succeed even in the case so that the entity
that created the audio patch can get notified.

Bug: 18909299
Change-Id: If4f6ed73f69213d792117fb42aec103ae2e50b79
 2015-01-31 01:51:28 +00:00
Joe Fernandez
1a9bf5c100 Merge "docs: training intent doc error update" into lmp-docs 2015-01-31 01:00:16 +00:00
Ruben Brunk
a27eef432a Add ProcessInfoService to activity manager. 
- Adds a new AIDL interface for querying process
  information from activity manager.

Bug: 19186859
Change-Id: Ic08858f346d6b66e7bfc9da6faa2c6e38d9b2e82
 2015-01-30 16:58:14 -08:00
Rich Slogar
367bfb3b50 docs: training intent doc error update 
b/18386294

Change-Id: Id0fb07e567e0f698e786ac57a19c60895f4d6fc1
 2015-01-30 16:55:55 -08:00
Deepanshu Gupta
7789447bd9 am 3d5535cf: Merge "Limited AppCompat support" into lmp-dev 
* commit '3d5535cfb7755c20619529649b025c4682013b85':
  Limited AppCompat support
 2015-01-31 00:54:10 +00:00
Deepanshu Gupta
7e683bdadd am 1d59871e: Merge "Resource resolution fixes." into lmp-dev 
* commit '1d59871e4e8a3a657dab3931d684706c45630a2f':
  Resource resolution fixes.
 2015-01-31 00:54:07 +00:00
Deepanshu Gupta
3d5535cfb7 Merge "Limited AppCompat support" into lmp-dev 2015-01-31 00:50:35 +00:00
Deepanshu Gupta
1d59871e4e Merge "Resource resolution fixes." into lmp-dev 2015-01-31 00:48:57 +00:00
Joe Fernandez
12dc562fa4 Merge branch 'master' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base 2015-01-31 00:35:00 +00:00
Joe Fernandez
317c8ac2df am 52c39c27: am 5c37c8e6: am d801a123: am 2b68ab3a: Merge "docs: studio emulator platform update" into lmp-docs automerge: 3548de6 automerge: 95fa882 
* commit '52c39c27e9f5fde74e2d326c6a3560334fbea926':
  docs: studio emulator platform update
 2015-01-31 00:34:50 +00:00
Joe Fernandez
4ba3bc9f01 am 5c37c8e6: am d801a123: am 2b68ab3a: Merge "docs: studio emulator platform update" into lmp-docs automerge: 3548de6 automerge: 95fa882 
automerge: 52c39c2

* commit '52c39c27e9f5fde74e2d326c6a3560334fbea926':
  docs: studio emulator platform update
 2015-01-31 00:33:23 +00:00
Alan Viverette
57a093c770 Merge "Synchronize mutated constant state's drawable constant state" 2015-01-31 00:30:32 +00:00
Joe Fernandez
52c39c27e9 am 5c37c8e6: am d801a123: am 2b68ab3a: Merge "docs: studio emulator platform update" into lmp-docs automerge: 3548de6 
automerge: 95fa882

* commit '95fa88250a1957c7adfbd35d52f62e42cbe03df6':
  docs: studio emulator platform update
 2015-01-31 00:29:37 +00:00
Joe Fernandez
95fa88250a am 5c37c8e6: am d801a123: am 2b68ab3a: Merge "docs: studio emulator platform update" into lmp-docs 
automerge: 3548de6

* commit '3548de60735a79d3e7087c26ae491a7f38da5b4d':
  docs: studio emulator platform update
 2015-01-31 00:25:04 +00:00
Alan Viverette
e426f3b0b2 Merge "Use inherited visibility to set visibility of managed drawables" 2015-01-31 00:21:47 +00:00
Alan Viverette
7d6854a229 Synchronize mutated constant state's drawable constant state 
Mutating InsetDrawable's locally-held drawable alters its constant state,
so we need to update the InsetDrawable's reference to match. This ensures
that any drawables created using getConstantState().newDrawable() will
match the mutated versions.

Bug: 19213175
Change-Id: If9063bcc0942691a8940443e607f2dc722fc6e13
 2015-01-30 16:19:45 -08:00
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