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

164576 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adam Lesinski
ab83c04201 am ac4aee2f: am a196e203: am 98e858b1: am 581dfee1: am 0a6c5ea4: Merge "AAPT: Fix issue with synthesized resource not actually showing up" into lmp-dev 
* commit 'ac4aee2f339047e472ffb653c0d0a8254ed209b3':
  AAPT: Fix issue with synthesized resource not actually showing up
 2014-09-26 15:28:12 +00:00
Adam Powell
209c334152 am e3215536: am d2906536: am 5a6ff09d: am 11133a78: am da7f9bab: Merge "Always show the name of the last used Home app in ResolverActivity" into lmp-dev 
* commit 'e321553613a71178fd5fce1e27e0b9693650d10a':
  Always show the name of the last used Home app in ResolverActivity
 2014-09-26 15:27:46 +00:00
Jinsuk Kim
3fc5ccbb15 am 4db63c80: am 679acfd0: am e802276c: Merge "CEC: Send keys to active routing path" into lmp-mr1-dev 
* commit '4db63c803dfbc0ab7dc98fdd341d9b27e9cbff2f':
  CEC: Send keys to active routing path
 2014-09-26 15:27:41 +00:00
Dianne Hackborn
e0a6244cd5 am c44abd55: am 5a282ae1: am 31940621: am 801fd360: am fcc42e8f: Merge "Fix issue #17661444: Persistent service not automatically restarted" into lmp-dev 
* commit 'c44abd55a506df0a2256282bdda40fc897b89287':
  Fix issue #17661444: Persistent service not automatically restarted
 2014-09-26 15:27:35 +00:00
Svetoslav
5687a6fd03 am 56a87461: am d1f86475: am f6998583: am 37b75fdd: am 48ccf043: Merge "Accessibility in bad state after using SDK tool uiautomatorviewer." into lmp-dev 
* commit '56a87461dfa746df853f508adb6c77124a78dbdf':
  Accessibility in bad state after using SDK tool uiautomatorviewer.
 2014-09-26 15:27:30 +00:00
Junda Liu
823db56f95 am 84bbc2fa: am b7a4acc3: am 4c5747ed: Update api/current.txt to unhide APIs by ag/554960 
* commit '84bbc2fa3e4ee41bb0220097ae9c4c4de44fcdf1':
  Update api/current.txt to unhide APIs by ag/554960
 2014-09-26 15:27:25 +00:00
Tsuwei Chen
e83f5b3401 am 67a4bc5a: am df9e62f0: am f4ada994: am b2ae0d6f: am e6e4b2bf: Merge "Fix an incorrect behavior that failed AT&T privacy test." into lmp-dev 
* commit '67a4bc5a6940cb2a30d10bb6b046adf33f0ae265':
  Fix an incorrect behavior that failed AT&T privacy test.
 2014-09-26 15:27:20 +00:00
Adrian Roos
12ed614541 am a25ef3ab: am b8d22d1c: am f68e624f: am a2e1e2ca: am 05ade73e: Merge "Ensure that setting an empty password clears it" into lmp-dev 
* commit 'a25ef3ab9e091be2dcbbc331f56a1274dae1aecc':
  Ensure that setting an empty password clears it
 2014-09-26 15:27:15 +00:00
Eino-Ville Talvala
e5e1f4c152 am c6b3281c: am 8127c2e7: am 55e3fd8e: am eeb44d4a: am 7b6a4acd: Merge "Camera2 Legacy: Clear JPEG ids when reconfiguring." into lmp-dev 
* commit 'c6b3281c98f354fe241c30f6fb2b39ddb822e685':
  Camera2 Legacy: Clear JPEG ids when reconfiguring.
 2014-09-26 15:27:10 +00:00
Michael Wright
d42c1f4022 am 3f0da0bc: am 7d766833: am b5344ce5: am 57bb094b: am 233bbabf: Merge "Specify a device identifier for keyboard layout notification." into lmp-dev 
* commit '3f0da0bcb07ed1c7a544cc3cd88b084a42044295':
  Specify a device identifier for keyboard layout notification.
 2014-09-26 15:27:05 +00:00
Junda Liu
320ced0674 am 330bdf85: am 65f5ce82: am e069ca2b: Merge "Revert "Hide CarrierPrivilege APIs in TelMgr."" into lmp-mr1-dev 
* commit '330bdf857fffdbf0e1c6d8e47dd36195eaff4f34':
  Revert "Hide CarrierPrivilege APIs in TelMgr."
 2014-09-26 15:26:59 +00:00
Eino-Ville Talvala
b34e4ce0eb am 5945282c: am 040b417f: am 4b168708: am 9ceeb831: am 93f0b612: Camera2 legacy: Improve robustness to camera service crashes 
* commit '5945282cc522af359b4518d4ad14f1e85c198812':
  Camera2 legacy: Improve robustness to camera service crashes
 2014-09-26 15:26:46 +00:00
Alan Viverette
3a6932f484 am fc505081: am b02f1a0a: am e76f1b82: am a9517205: am 21662c96: Merge "Cut ripple background alpha in half" into lmp-dev 
* commit 'fc505081716104526b938e720baef8d0c90e2e55':
  Cut ripple background alpha in half
 2014-09-26 15:26:42 +00:00
Alan Viverette
d002e4f95a am 7bf1b7bc: am 889422bb: am df6e14c8: am c1b3b21e: am 00660f66: Merge "Fix "Always apply window insets to action modes"" into lmp-dev 
* commit '7bf1b7bcebeca32028cacb199c0ad1be4de1dcf3':
  Fix "Always apply window insets to action modes"
 2014-09-26 15:26:37 +00:00
Svetoslav
cef0213407 am ecb94737: am d46e5c59: am 5ec87159: am 09b81193: am 85daf4f0: Merge "Accessibility events may be fired even if no services observe them." into lmp-dev 
* commit 'ecb94737efdf8e503328ec07d7ed1f293493abee':
  Accessibility events may be fired even if no services observe them.
 2014-09-26 15:26:32 +00:00
Chris Wren
33e77adb5c am ac74baf6: am 7182e206: am 1f270a93: am cf9ee933: am 2eb3b974: Merge "Allow longer translations in the notification actions." into lmp-dev 
* commit 'ac74baf6f263a883501f06fdb78116280e6290c8':
  Allow longer translations in the notification actions.
 2014-09-26 15:26:26 +00:00
Ruben Brunk
5a3657c484 am 3e917517: am 5e312018: am be8900a9: am 4754428d: am e76ce25f: Merge "camera2: Fix null check in PictureCallback." into lmp-dev 
* commit '3e917517882931896a6a979cbc5fbe39f99374a7':
  camera2: Fix null check in PictureCallback.
 2014-09-26 15:26:21 +00:00
Amith Yamasani
bf3fabfcea am f5490452: am d3399218: am 89d8d175: am 158c51f3: am 95548b39: Merge "Fix GPS icon not showing for secondary users" into lmp-dev 
* commit 'f54904522055303fcfafa3fff7f0e77ee6de635e':
  Fix GPS icon not showing for secondary users
 2014-09-26 15:26:16 +00:00
John Spurlock
1456dce817 am c7b2a793: am 1a0aba91: am b1e369bc: am 37c874d0: am 0dccf597: Merge "Supertoast when user changes zen mode." into lmp-dev 
* commit 'c7b2a793d61312cb235b36c47ce7a3915bdd74c0':
  Supertoast when user changes zen mode.
 2014-09-26 15:26:11 +00:00
Paul Lawrence
ca38911533 am 342d9c5f: am 98a18468: am 433d70d3: am 7c4b9413: am 56a38862: Merge "Fix pause when setting pin/pattern/password" into lmp-dev 
* commit '342d9c5f8f79b3189e803b19a148da9e6bd5c44a':
  Fix pause when setting pin/pattern/password
 2014-09-26 15:26:05 +00:00
RoboErik
f5085b518c am 90b89adb: am 7df93654: am 54218f6b: am 10a7dfea: am 504752fb: Merge "Ensure MediaBrowser state is set to connecting after a reconnect" into lmp-dev 
* commit '90b89adb01087fbaae7ac6499b95dc085b02a531':
  Ensure MediaBrowser state is set to connecting after a reconnect
 2014-09-26 15:26:00 +00:00
RoboErik
4932877113 am 00cbb751: am 5e8f023d: am a59c7f03: am dff59b8b: am 23df1c46: Merge "Allow null queues to be set in MediaSession" into lmp-dev 
* commit '00cbb751533bf683480ba80f0c450c59c6ca96a1':
  Allow null queues to be set in MediaSession
 2014-09-26 15:25:55 +00:00
Ye Wen
2255f771f0 am 933ddd11: am f0df354b: am 272f2321: am a0945b40: resolved conflicts for merge of 13ff7c17 to lmp-sprout-dev 
* commit '933ddd112f22d3f3de2b1297dcf418287d8d0643':
  Hide carrier app intents in Telephony (1/2)
 2014-09-26 15:25:49 +00:00
Junda Liu
5c65836f58 am 85764048: am 73d72b60: am 8e61b503: am 63f0b87e: am 96c54879: Merge "Hide CarrierPrivilege APIs in TelMgr." into lmp-dev 
* commit '8576404876fe609d74c26945fa4b5beb9a0edf96':
  Hide CarrierPrivilege APIs in TelMgr.
 2014-09-26 15:25:43 +00:00
Chris Wren
60772b487d am 18fc9f40: am 969cb2db: am cad81c3e: am 3c7f1aac: am 15653a91: Merge "getCurrentInterruptionFilter should return the filter value, not the hints." into lmp-dev 
* commit '18fc9f40a61e90feb6154702db91cd25c4a4f752':
  getCurrentInterruptionFilter should return the filter value, not the hints.
 2014-09-26 15:25:37 +00:00
Kenny Guy
d865bb8a07 am 6667168a: am 07f86bcb: am fbe543fd: am e50eceb1: am 19acab1f: Merge "Ignore badly formed ComponentNames when loading device_owner.xml" into lmp-dev 
* commit '6667168ab0330cf74b016df89210150d1a517ac5':
  Ignore badly formed ComponentNames when loading device_owner.xml
 2014-09-26 15:25:32 +00:00
Philip Nowell
32ab32c85e am 571730b4: Merge "Corrects a typo that identified XXXHIGH as 560 dpi instead of 640." into lmp-dev 
* commit '571730b4d1a438fadfdb2c6951483f00f6276518':
  Corrects a typo that identified XXXHIGH as 560 dpi instead of 640.
 2014-09-26 15:10:46 +00:00
Philip Nowell
31a141af13 Merge "Corrects a typo that identified XXXHIGH as 560 dpi instead of 640." into lmp-dev 2014-09-26 15:00:22 +00:00
Przemyslaw Szczepaniak
f2366fa873 am 32c73663: am e8b3a391: am 8924617d: am f0a7c767: Merge "Fix ambiguous TTS#playSilence method." into lmp-dev 
* commit '32c736638dd0ffc0fbe9b9523916ba3fb71bce15':
  Fix ambiguous TTS#playSilence method.
 2014-09-26 09:49:53 +00:00
Przemyslaw Szczepaniak
b46f369d23 am e8b3a391: am 8924617d: am f0a7c767: Merge "Fix ambiguous TTS#playSilence method." into lmp-dev 
* commit 'e8b3a3919451faca4d0b1a3420de8d854607e65f':
  Fix ambiguous TTS#playSilence method.
 2014-09-26 09:38:45 +00:00
Przemyslaw Szczepaniak
16f5ec1207 am 8924617d: am f0a7c767: Merge "Fix ambiguous TTS#playSilence method." into lmp-dev 
* commit '8924617dd13785fa6285d5f9eb6fd20423077a73':
  Fix ambiguous TTS#playSilence method.
 2014-09-26 09:31:04 +00:00
Przemyslaw Szczepaniak
d95788bf85 am f0a7c767: Merge "Fix ambiguous TTS#playSilence method." into lmp-dev 
* commit 'f0a7c7672f158bc85ce400c1f59ec7fd973855d2':
  Fix ambiguous TTS#playSilence method.
 2014-09-26 09:17:53 +00:00
Przemyslaw Szczepaniak
759962ab6d Merge "Fix ambiguous TTS#playSilence method." into lmp-dev 2014-09-26 08:11:23 +00:00
Sailesh Nepal
67a25e3586 am 7043d948: am bdf84f29: Merge "Run update-api to fix build" into lmp-mr1-dev 
* commit '7043d94873714ad092aea6577c93082d930fcaec':
  Run update-api to fix build
 2014-09-26 06:26:41 +00:00
Sailesh Nepal
23a9ba9732 am bdf84f29: Merge "Run update-api to fix build" into lmp-mr1-dev 
* commit 'bdf84f29d05930a2208539da6135ca90b6bd3dba':
  Run update-api to fix build
 2014-09-26 06:15:51 +00:00
Sailesh Nepal
f46a7b1ddd Merge "Run update-api to fix build" into lmp-mr1-dev 2014-09-26 06:07:33 +00:00
Svetoslav
143a6fafff am c9a230f4: am bcc4f1bc: am b14c7e04: am 9ec435dc: Merge "Using wrong virtual view id When prefetching accessibility nodes." into lmp-dev 
* commit 'c9a230f4d23e9e8b98b354f7758443701bee9bbc':
  Using wrong virtual view id When prefetching accessibility nodes.
 2014-09-26 05:04:25 +00:00
John Spurlock
9f808a01d4 am 25dbdb2f: am b66ad6c0: am 57dc3887: am cfc1a5ee: Merge "Shorten the zen supertoast visible duration." into lmp-dev 
* commit '25dbdb2f784c7c66703d3161d1e89356ce15e007':
  Shorten the zen supertoast visible duration.
 2014-09-26 05:04:20 +00:00
Dianne Hackborn
94d8db6465 am 941a19d2: am 265b2320: am c656d219: am 34b63d50: Merge "Fix issue #17574819: Chrome browser process is killed..." into lmp-dev 
* commit '941a19d269bc36a986d238bbbd0ff85372a700cf':
  Fix issue #17574819: Chrome browser process is killed...
 2014-09-26 05:04:16 +00:00
Jesse Hall
66474027c2 am f295b675: am 9a2eafc1: am 12297705: am 7fa90f6a: Merge "bootanimation: allow animation to specify background color" into lmp-dev 
* commit 'f295b675239892c8637d3ad48777226314be2de1':
  bootanimation: allow animation to specify background color
 2014-09-26 05:04:11 +00:00
Svetoslav
35b096bccf am c89120c5: am ab8e31e2: am 58be3b36: am 5d5ee54e: Merge "Invalid active window if temporary disabling accessibility for test tools." into lmp-dev 
* commit 'c89120c557aa69c141e1af70e355f88d6b17ce2b':
  Invalid active window if temporary disabling accessibility for test tools.
 2014-09-26 05:04:07 +00:00
Dianne Hackborn
a15dcc3fa1 am 6b9b8a03: am 27429ba1: am 24ecbc4f: am 0b1eb9d4: Merge "Work on issue #17656716: Unhandled exception in Window Manager" into lmp-dev 
* commit '6b9b8a03847a190e1f3c9cf50fc3989a572d7534':
  Work on issue #17656716: Unhandled exception in Window Manager
 2014-09-26 05:04:02 +00:00
Alan Viverette
cc4c6e3db7 am 28a845c0: am 5bf925d9: am 5a99c276: am a9ac89a3: Merge "Correctly advertise accessibility scrolling actions" into lmp-dev 
* commit '28a845c017c2990b339a50afe57f11f22d8b730b':
  Correctly advertise accessibility scrolling actions
 2014-09-26 05:03:58 +00:00
Sailesh Nepal
e1a67e6f72 am 587e65b1: am 848718a0: am 5926650d: am 7461b5a0: Merge "Adding support for Cdma conference calling." into lmp-dev 
* commit '587e65b1712817a0f5c9086aa7f63e5f7e5a7acc':
  Adding support for Cdma conference calling.
 2014-09-26 05:03:53 +00:00
Adam Lesinski
61b8bfa5d3 am a196e203: am 98e858b1: am 581dfee1: am 0a6c5ea4: Merge "AAPT: Fix issue with synthesized resource not actually showing up" into lmp-dev 
* commit 'a196e203076cb810a21a702b41f6a1d82d029318':
  AAPT: Fix issue with synthesized resource not actually showing up
 2014-09-26 05:03:49 +00:00
Svetoslav
a0bda69340 am bcc4f1bc: am b14c7e04: am 9ec435dc: Merge "Using wrong virtual view id When prefetching accessibility nodes." into lmp-dev 
* commit 'bcc4f1bc2dcc386f3ab752a90e270bac79491646':
  Using wrong virtual view id When prefetching accessibility nodes.
 2014-09-26 04:55:55 +00:00
John Spurlock
f45411f50d am b66ad6c0: am 57dc3887: am cfc1a5ee: Merge "Shorten the zen supertoast visible duration." into lmp-dev 
* commit 'b66ad6c09dbd4ba87d6188af7661aec827923348':
  Shorten the zen supertoast visible duration.
 2014-09-26 04:55:51 +00:00
Dianne Hackborn
d2fdd006bd am 265b2320: am c656d219: am 34b63d50: Merge "Fix issue #17574819: Chrome browser process is killed..." into lmp-dev 
* commit '265b2320450ea08ba075b3cbffb34b71d355f1a3':
  Fix issue #17574819: Chrome browser process is killed...
 2014-09-26 04:55:47 +00:00
Jesse Hall
ad667371b1 am 9a2eafc1: am 12297705: am 7fa90f6a: Merge "bootanimation: allow animation to specify background color" into lmp-dev 
* commit '9a2eafc18b9d7b8a98fba28970bb3cca7d0f3380':
  bootanimation: allow animation to specify background color
 2014-09-26 04:55:43 +00:00
Svetoslav
ae48539dc0 am ab8e31e2: am 58be3b36: am 5d5ee54e: Merge "Invalid active window if temporary disabling accessibility for test tools." into lmp-dev 
* commit 'ab8e31e21662775a9df0293bffa7682f5e3e0426':
  Invalid active window if temporary disabling accessibility for test tools.
 2014-09-26 04:55:40 +00:00