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

177537 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jorim Jaggi
fa9f1c5d42 am 0d0bd44d: Merge "Update dark mode when notification is updated" into lmp-mr1-dev 
* commit '0d0bd44d649c21cc7368a988a894d221e6731c0d':
  Update dark mode when notification is updated
 2014-12-09 15:18:15 +00:00
Jorim Jaggi
9ba89ad8eb Merge "Make hint text centerred if multiline" into lmp-mr1-dev 2014-12-09 15:11:48 +00:00
Jorim Jaggi
99117c9b11 Merge "Reinspect notification for dark mode when updated" into lmp-mr1-dev 2014-12-09 15:11:23 +00:00
Jorim Jaggi
0d0bd44d64 Merge "Update dark mode when notification is updated" into lmp-mr1-dev 2014-12-09 15:10:52 +00:00
Adrian Roos
3236f3a93a Revert "Fix calculation of overscan insets in WindowState." 
This reverts commit ff778fe450ca2d0e554aa6aee7a9da1cda46d4d5.

Bug: 18659737
Change-Id: I1efc59edfb8ded946cc14f5c4d6f532ac291bd81
 2014-12-09 15:06:40 +00:00
Mathieu Chartier
f9a1f1bb95 am 7a811fc7: (-s ours) am fb5c932d: Merge "Add more -d dalvik details to dumpsys" 
* commit '7a811fc7f23e4375a29ac5e7cfaf88efd657c33f':
  Add more -d dalvik details to dumpsys
 2014-12-09 15:03:12 +00:00
smain@google.com
3bf22c31e8 am 7e5fbc1d: am 8804b2a6: am 4e0575be: am c10acd71: am 9a041f18: am d3c9f2b9: update studio hero image and add section about code editor [CP] 
* commit '7e5fbc1dc03e577ae37bfbc634a2ebb2cd2c5b32':
  update studio hero image and add section about code editor [CP]
 2014-12-09 14:52:16 +00:00
Rich Slogar
036a18bf49 am 85f69e0b: am 6a0e1906: am 8fa02c18: am 08ba05b9: am 6cc5e87d: am 4083327e: docs:build system updates [CP] 
* commit '85f69e0b96844551157db7051c0d98c43c5d7b4a':
  docs:build system updates [CP]
 2014-12-09 14:52:11 +00:00
smain@google.com
54e2e63d7b am 48590173: (-s ours) am 8e29e218: am acd40aa9: am 67fa34e9: am 2d0cf342: am d0c79c4e: fix migrate guide and other studio edits [CP] 
* commit '485901732ecbb549109de1a496058c987c9a8647':
  fix migrate guide and other studio edits [CP]
 2014-12-09 14:52:07 +00:00
smain@google.com
9504b4c5ce am ae3a1d70: (-s ours) am 8dac5b5e: am fedf3943: am c493dd3f: am e9f63a0f: am 5797e272: docs:sdk installing file update [CP] 
* commit 'ae3a1d70e5870847fb5fadcbbd7cc342a4edee18':
  docs:sdk installing file update [CP]
 2014-12-09 14:45:33 +00:00
Dan Sandler
7971db8cfc am c8466327: Squelch chatty log messages. 
* commit 'c846632762f0579d504d90e5b986183779fcf034':
  Squelch chatty log messages.
 2014-12-09 14:45:24 +00:00
Dan Sandler
139619b753 am e912c9cc: Repair wifi/cellular kerning. 
* commit 'e912c9cc39807f95815400981ed27d121e8b293a':
  Repair wifi/cellular kerning.
 2014-12-09 14:45:19 +00:00
Dmitriy Ivanov
5a78571949 am 4fed05b4: am f0070999: Merge "Remove unsed check for simulator" 
* commit '4fed05b4e679276050b5eaad51ce96848ddc561e':
  Remove unsed check for simulator
 2014-12-09 14:40:56 +00:00
smain@google.com
7d7fb8a3a4 am 283a2046: (-s ours) am c5d38e73: am baa56314: am f0eee644: am 521d7277: am 29e13c5a: new Android Studio download page [CP] 
* commit '283a2046d23214f4a5beff9454a2e9781dbccffe':
  new Android Studio download page [CP]
 2014-12-09 14:39:03 +00:00
Dan Sandler
c846632762 Squelch chatty log messages. 
Bug: 18666850
Change-Id: I0f9fe4fd0143b5668f66bd0a9c407a5018876b44
 2014-12-09 14:37:29 +00:00
Dan Sandler
e912c9cc39 Repair wifi/cellular kerning. 
The wifi spacer should only be shown if the first mobile
network has a data type indicator.

Bug: 18665813
Change-Id: Ifcd3a61ebc8cdb76d134baa23b22f1291edadd28
 2014-12-09 14:36:46 +00:00
Rich Slogar
7eb81b7033 am b2b89de6: (-s ours) am d0a96b67: am cd13e657: am ca61ce33: am e1136835: am 5d9d7610: docs: publishing with studio [CP] 
* commit 'b2b89de6079bb5471dc396637cc7ef4e1cb8a0fd':
  docs: publishing with studio [CP]
 2014-12-09 14:29:39 +00:00
smain@google.com
44e93561d1 am 2153969c: (-s ours) am d1ffd1e3: am 139c7def: am 53513e9e: am 5962474c: am fc64b70a: docs: new Eclipse menu [CP] 
* commit '2153969c199ecda6ff4f19bf2d6a34a9bbbe8a59':
  docs: new Eclipse menu [CP]
 2014-12-09 13:57:58 +00:00
Rich Slogar
d5fab09929 am 3d368a16: (-s ours) am 2e3daaa6: am 6bbb5ed1: am 43304cfc: am 9e6ad10b: am e3fe9382: docs: studio basics v2 [CP] 
* commit '3d368a16d8bb7849abd36ba9b337a6576040111d':
  docs: studio basics v2 [CP]
 2014-12-09 13:38:23 +00:00
Rich Slogar
024b3555a8 am a5155276: (-s ours) am e20c9496: am 0b52c5b3: am 88546c85: am 47a19d5d: am fdeb27f9: docs:download updates for studio [CP] 
* commit 'a51552768bfab83b68f1e7310c3660ec905d16c3':
  docs:download updates for studio [CP]
 2014-12-09 13:21:38 +00:00
Rich Slogar
da66b8fb2c am da5184e2: (-s ours) am 7593c6ce: am bcb57c70: am 05d1ba69: am 84f7d62b: am 153c8287: docs:revision updates 
* commit 'da5184e2dc44b04fb54619b487e56f8b9bdb8638':
  docs:revision updates
 2014-12-09 11:30:05 +00:00
Lajos Molnar
77d3489ac7 am 3547de2f: am 9d6fa062: Merge "media: fix isSupportedFormat for integer frame rate" 
* commit '3547de2f15310c266ab0cc35736cfc5a11950f60':
  media: fix isSupportedFormat for integer frame rate
 2014-12-09 11:25:28 +00:00
Lajos Molnar
bbd58d88f0 am f5375fbd: am 38935e6e: Merge "media: allow full range of Vorbis sampling rates" 
* commit 'f5375fbd8ef47f9c285ec2ccf857d673ed15d30d':
  media: allow full range of Vorbis sampling rates
 2014-12-09 11:25:22 +00:00
Narayan Kamath
8ff1a5ee0d am 56206042: am bdc6cde7: Merge "Fix PhoneStateListener constructor javadoc." 
* commit '5620604261a24419bb87a4540f1a4ff333d32a3f':
  Fix PhoneStateListener constructor javadoc.
 2014-12-09 11:25:04 +00:00
Przemyslaw Szczepaniak
735c31c344 Merge "Add UtteranceProgressListener#onStop callback" 2014-12-09 11:13:44 +00:00
Wonsik Kim
6573fd535e am a565716a: am 14965d0e: am 2abd2dd1: Merge "TIF: TvInputHardwareManager to listen to volume changes" into lmp-mr1-dev 
* commit 'a565716a2a26c7522dabfb28f646508cc1928053':
  TIF: TvInputHardwareManager to listen to volume changes
 2014-12-09 11:06:16 +00:00
Jean-Michel Trivi
b3f390fe86 am 83d0c86b: am d14f98fd: am 8638877f: Merge "Support collaborative audio focus handling" into lmp-mr1-dev 
* commit '83d0c86b869fe84b3172028a5598ebd87ce7745b':
  Support collaborative audio focus handling
 2014-12-09 11:06:11 +00:00
Rich Slogar
404f602fa7 am 458a3b8a: am 1ce435cb: am 13a69707: am 1e51b3ae: am 14864414: am f7f20a45: docs:building your first app [CP] 
* commit '458a3b8afdd0f152902d4930f9fa22bf226b6227':
  docs:building your first app [CP]
 2014-12-09 11:06:07 +00:00
Przemyslaw Szczepaniak
4b73867a12 Add UtteranceProgressListener#onStop callback 
New UtteranceProgressListener callback that allows
to detect a call to TextToSpeech#stop() (or QUEUE_FLUSH usage)
from the same client, or a QUEUE_DESTROY usage from any other
client (Talkback uses it to preempt other users of TextToSpeech
queue). This change is required for seamless Books read aloud
feature+Talkback usage.

+ Fixes for broken tests/TtsTests

Bug: 17901521

Change-Id: I30d2f297bb7c8d05cbeb16f63e85c1be0cca5c84
 2014-12-09 11:06:06 +00:00
smain@google.com
e856fb7ae4 am 6eef2c3a: am 6d3b6ff4: am fe3aabda: am bb642586: am 9fd7804b: am 377604af: docs: project updates [CP] 
* commit '6eef2c3a44017069c5d50a469549cd1fce0c447c':
  docs: project updates [CP]
 2014-12-09 11:06:02 +00:00
smain@google.com
9a573a430a am 7e6713fc: am 13b29519: am 382040d4: am 5b2cac58: am f5fa25ec: am 9dd6a07f: docs: setup-virtual-device [CP] 
* commit '7e6713fc080d70721cd33d088f23fa66afcde12f':
  docs: setup-virtual-device [CP]
 2014-12-09 11:05:56 +00:00
Rich Slogar
8e1bd15a7c am b5c81893: am bc683297: am 70d5341c: am 5b440be7: am d4c89098: am f592a587: docs support library updates [CP] 
* commit 'b5c81893e781aa8e11d59b027f2fa4884b700ad6':
  docs support library updates [CP]
 2014-12-09 11:05:51 +00:00
Rich Slogar
067736807e am cdad9919: am 2bba0c94: am 892577b0: am 86db5b43: am ff88ac5e: am 7a69c2de: docs: debugging studio [CP] 
* commit 'cdad9919ced52b1f7bd00ee442ee97e9c0fd397b':
  docs: debugging studio [CP]
 2014-12-09 11:05:44 +00:00
Rich Slogar
650d4df87b am 059b6ef3: am 46150b5f: am 51ffc634: am bf96a239: am 5aac6042: am cc4d08b4: docs:setting up hardware devices [CP] 
* commit '059b6ef35c90706ba2a37b69f77abff200b97243':
  docs:setting up hardware devices [CP]
 2014-12-09 11:05:39 +00:00
Rich Slogar
acee3b63a4 am 44176d92: am 5da1430e: am a402fa5f: am f26726b1: am 63d5c3e1: am d16db79e: docs: workflow index [CP] 
* commit '44176d92e0b65a9cc88a4a4d3d7b52278a22a73c':
  docs: workflow index [CP]
 2014-12-09 11:05:34 +00:00
Rich Slogar
36595d2628 am 0622234b: am 359e5597: am d5b6d08e: am 8fbb3f6e: am cf516099: am 5e8d9a02: docs: tools help update [CP] 
* commit '0622234bcc5ec27d3f57b674f98f607c101d9f4a':
  docs: tools help update [CP]
 2014-12-09 11:05:29 +00:00
Scott Rowe
3e885e3fa0 am 46f7dcf1: (-s ours) am 43883b11: am 044a7802: am 4bc2c3bd: am 1efca60b: am e829d8fc: docs: Training refactor for Android Studio [CP] 
* commit '46f7dcf1e41c1f4fa8477b184dd3d775070220a0':
  docs: Training refactor for Android Studio [CP]
 2014-12-09 11:05:24 +00:00
Sebastien Hertz
70acd9b36a resolved conflicts for merge of beb84982 to lmp-mr1-dev-plus-aosp 
Change-Id: Ib420549f3e20c149c15966dfece980b4f150177d
 2014-12-09 10:16:46 +01:00
Mark Lu
4b5a9a09e5 [ActivityManager] fix NPE in ActivityStack.resetTargetTaskIfNeededLocked. 
Symptom:
in .ActivityStack.resetTargetTaskIfNeededLocked,  "allowTaskReparenting" if case will call setTask
to remove activities from task, that will caused numActivities in main for-loop not consist with task.mActivities size.
caused NPE will happend in finish activities for-loop due to get null object from activities when clearWhenTaskReset" as true case.

Root Cause:
when clearWhenTaskReset as true, will set "end" variable as numActivities -1, but if calling setTask to remove activities from task,
end value will out of date & not same with task.mActivities size.

Solution:
use activities.size() - 1 to assign end value.

Change-Id: I5d7fe22e1df2fc61738db23402e7c42cf6d8c4cc
 2014-12-09 06:48:21 +00:00
Elliott Hughes
0adcf15ad8 Fix typo. 
Bug: https://code.google.com/p/android/issues/detail?id=78422
Change-Id: I0dfbb74334e126062660831a4e01817dde068b56
 2014-12-08 20:50:00 -08:00
smain@google.com
5d3ea8af3c am fe4b4009: am a111eb84: Merge "clarify release notes pages with more specific titles and new links to related docs." into lmp-docs 
* commit 'fe4b4009dab1b8de1c1eca6ee0f39f3b0786f45b':
  clarify release notes pages with more specific titles and new links to related docs.
 2014-12-09 03:05:03 +00:00
smain@google.com
fe4b4009da am a111eb84: Merge "clarify release notes pages with more specific titles and new links to related docs." into lmp-docs 
* commit 'a111eb840bd85c74bf77efca4fce0213b56ff1bd':
  clarify release notes pages with more specific titles and new links to related docs.
 2014-12-09 02:56:33 +00:00
smain@google.com
a111eb840b Merge "clarify release notes pages with more specific titles and new links to related docs." into lmp-docs 2014-12-09 02:48:50 +00:00
Mike Lockwood
ae13230b87 Merge "MIDI: API changes to support multiple ports per device" 2014-12-09 02:37:40 +00:00
Mathieu Chartier
7a811fc7f2 am fb5c932d: Merge "Add more -d dalvik details to dumpsys" 
* commit 'fb5c932dbbe2e7fc3ed4f0af71dc8ac76f22df57':
  Add more -d dalvik details to dumpsys
 2014-12-09 02:25:45 +00:00
Mathieu Chartier
fb5c932dbb Merge "Add more -d dalvik details to dumpsys" 2014-12-09 02:05:45 +00:00
Dianne Hackborn
beb84982a1 am 8b33cf4d: Merge "Work on issue #18640385: Add procstats test mode" into lmp-mr1-dev 
* commit '8b33cf4d34a9ea75e1121ee2f1d829b21f3cb5d6':
  Work on issue #18640385: Add procstats test mode
 2014-12-09 01:57:26 +00:00
Dianne Hackborn
8b33cf4d34 Merge "Work on issue #18640385: Add procstats test mode" into lmp-mr1-dev 2014-12-09 01:53:37 +00:00
Dianne Hackborn
1a4b5a4f02 Work on issue #18640385: Add procstats test mode 
You can now do "adb shell dumpsys procstats --start-testing" to
enable high frequency pss sampling.

Also improved the low on RAM mem reporting to separate out RAM
from memtrack, in case the data we are getting from that is bad.

And fixed meminfo --oom to work correctly again.

Change-Id: I7af17eab110a82298bd7b0ce381f8fa5c96c1f6a
 2014-12-08 17:43:31 -08:00
Mathieu Chartier
e417db6d57 am 4ec1bdf5: am 52070f81: Merge "Add more -d dalvik details to dumpsys" into lmp-mr1-dev 
* commit '4ec1bdf52f5c0d48fd13571796644feddc5a815b':
  Add more -d dalvik details to dumpsys
 2014-12-09 01:43:00 +00:00