161400 Commits

Author SHA1 Message Date
Andreas Gampe
bf417b4d38 Merge "Frameworks/base: Update to preloaded-classes" into lmp-dev 2014-10-01 19:46:09 +00:00
Deepanshu Gupta
409bd3d774 Resource resolution bug fix. [DO NOT MERGE]
Fix a bug where "?attr/foo" in framework resources wasn't resolved
properly.

Change-Id: I9a56974f526774fde79685f668f01021136d68f1
(cherry picked from commit 19c7842082d831ad432abe906f4c37c6ed08e414)
2014-10-01 12:45:26 -07:00
Deepanshu Gupta
fea51feb5c Fix Tests after cherry picks. [DO NOT MERGE]
1. Updated the intelliJ run configuration for the layoutlib_create tool.
2. Updated the code to search for the platform.dir.
3. Update tests to use AppTheme and Target SDK 19

Change-Id: I6f1cc6ff2a53e4474c746537029c7f89c6dd6dc1
(cherry picked from commit 8592eeafd01370d1a17e34602290becf7f611c75)
2014-10-01 12:44:24 -07:00
Deepanshu Gupta
98a03e771e Update intelliJ copyright profile [DO NOT MERGE]
Change-Id: Ib9386b686cb24e1f187d0b636b59b4b13d59bbcd
(cherry picked from commit 91fa62ac67a5e294124b5bfb70b35addc7687c34)
2014-10-01 12:44:14 -07:00
Deepanshu Gupta
039d5849ea Build layoutlib create tests as part of sdk build. [DO NOT MERGE]
LayoutLib Create tests are now built whenever LayoutLib create is built.

Change-Id: Id215e8690e435019579dba1734090a0d585f37e1
(cherry picked from commit 4efe6264f1251fa200427f54ea6f5dd4c4d03665)
2014-10-01 12:44:05 -07:00
Deepanshu Gupta
6fb5fdc233 Add layoutlib tests to DIST_DIR [DO NOT MERGE]
Add the layoutlib and layoutlib-create tests to DIST_DIR for sdk
targets. These can be used for continuous testing on the build server.

Change-Id: I747dddcddfd8009937668bec4d75cb99bf63235f
(cherry picked from commit f9c749c9901c459f77ffc6f4fbbc15f4142c6e0a)
2014-10-01 12:43:52 -07:00
Deepanshu Gupta
bd4133133a Build layoutlib_create tests. [DO NOT MERGE]
Change-Id: Ia13a090f8ec29b2b2a107825b6a13d7db77e6d61
(cherry picked from commit 2294f939bc79ce902a40db37def64cc28394d56b)
2014-10-01 12:43:43 -07:00
Deepanshu Gupta
3f0e467a06 Remove ANDROID_BUILD_TOP from intelliJ path variables. [DO NOT MERGE]
The variable is not actually needed and it makes working with different
API levels a lot easier since everything now depends on $PROJECT_DIR$.

This change also makes the tests more robust by improving the way it
tries to find the SDK.

Change-Id: I3502ad4a0ba85fd88b497e47964fddb2a89e520c
(cherry picked from commit 5377695d4ecf3cc6dc1abe59bbfca63f6137b722)
2014-10-01 12:43:32 -07:00
Deepanshu Gupta
2f3715aaaa Get filename from File faster [DO NOT MERGE]
Use the direct call from a File object to get the filename instead of
going through Path which depends on Java 7 making the LayoutLib tests
incompatible with Java 6.

Change-Id: I815895eedbc10245ee09bdb53b11e5548b076aad
(cherry picked from commit 7dbf91fee96790fbeb9858740be1bb375f29ecb5)
2014-10-01 12:43:19 -07:00
Deepanshu Gupta
b6a37d897a Add testing framework to LayoutLib. [DO NOT MERGE]
This change adds an end to end test which loads the framework resources
and a test app and ensures that no exceptions or warnings are thrown.

The change also adds project configuration for intelliJ.

Change-Id: I7b67c0f1a2af2dac95df7f3231cab537b9826d7d
(cherry picked from commit a8e9517470869fa29946ae1fa1ceeb24c7970391)
2014-10-01 12:43:11 -07:00
Deepanshu Gupta
23f09423cb Add tests to the layoutlib eclipse project. [DO NOT MERGE]
Specify the test folder in the layoutlib/bridge eclipse project.

Also add the sourcepath for layoutlib-api-prebuilt.jar

Change-Id: I194ed182618e564388d6df645e2de7f59897fa1e
(cherry picked from commit 36acf8baebc9ab72b3b5fe75d865399ddf7b0132)
2014-10-01 12:42:49 -07:00
John Spurlock
0b99ea94f0 Doze: Route volume keys to music only while pulsing.
Avoid waking up the device on hw vol key presses during a doze
pulse.  Instead, behave as if the screen was off for these keys,
namely forwarding them over to the session manager.

Bug:17672775
Change-Id: I566b93f0bdea79253ac3eca41d3876b271c61306
2014-10-01 15:32:22 -04:00
John Reck
f408656a73 am 8786a962: Merge "Re-allow suppressing onDetachedFromWindow" into lmp-dev
* commit '8786a962f0aa9991e0bc668eb7d9eae45645409e':
  Re-allow suppressing onDetachedFromWindow
2014-10-01 19:16:07 +00:00
John Reck
8786a962f0 Merge "Re-allow suppressing onDetachedFromWindow" into lmp-dev 2014-10-01 19:11:04 +00:00
Craig Mautner
8a33674bed am 3867e4d0: am 9ab8fbbc: am 245645ca: Merge "Don\'t clear visible-behind activity if it is top" into lmp-dev
* commit '3867e4d0c08ad74ee16dfde70e81c77f09e0e0ff':
  Don't clear visible-behind activity if it is top
2014-10-01 18:57:26 +00:00
Selim Cinek
1e5e35ef62 am 1c061d48: am cdbda3e9: am 15b2202b: Merge "Adapting translation length for a string in a dialog" into lmp-dev
* commit '1c061d4862cf541757c3932abc382ec4f9f5620f':
  Adapting translation length for a string in a dialog
2014-10-01 18:56:40 +00:00
Baligh Uddin
940d3dd055 am f7ade46c: (-s ours) am 7249a8bb: (-s ours) am ff99ff98: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit 'f7ade46cc5edb1f2f369ae22070b786729754932':
  Import translations. DO NOT MERGE
2014-10-01 18:56:37 +00:00
John Spurlock
7e67011f15 am 394f29e7: am cd98a559: am c909e1b2: Zen: Fix new event category check.
* commit '394f29e7618952fb6eee7ca53f434b418bbd3ded':
  Zen: Fix new event category check.
2014-10-01 18:56:33 +00:00
Baligh Uddin
861978f7de am b8cbdcb6: (-s ours) am 4aa820ce: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
* commit 'b8cbdcb6f6ed9831ba04c3b8dc81f4ec4cd90a26':
  Import translations. DO NOT MERGE
2014-10-01 18:56:30 +00:00
Adam Powell
b226d2951c am c6a06d43: Merge "Revert "Fix issue with using locally defined attrs in a shared lib"" into lmp-dev
* commit 'c6a06d437cf2ee7926a01b2f8ee685555bfb3d81':
  Revert "Fix issue with using locally defined attrs in a shared lib"
2014-10-01 18:35:52 +00:00
Hui Shu
9cd616e067 am aee5c9e7: Merge "Remove WebView DRP Setting from Developer Settings" into lmp-dev
* commit 'aee5c9e7c1f61126c61722a957daedf57cf26e7e':
  Remove WebView DRP Setting from Developer Settings
2014-10-01 18:35:49 +00:00
Dan Albert
0de19adc80 Use std::sort instead of qsort_r wrapper.
The HAVE_(BSD|GNU)_QSORT_R in AndroidConfig.h has never worked, and we
should just be using something standard anyway.

Change-Id: I784d6212f6c890a11c4af2f83d1ce2d279708652
2014-10-01 11:34:17 -07:00
Adam Powell
c6a06d437c Merge "Revert "Fix issue with using locally defined attrs in a shared lib"" into lmp-dev 2014-10-01 18:31:56 +00:00
Hui Shu
aee5c9e7c1 Merge "Remove WebView DRP Setting from Developer Settings" into lmp-dev 2014-10-01 18:28:57 +00:00
Adam Powell
908c748096 Revert "Fix issue with using locally defined attrs in a shared lib"
This reverts commit 5069dd69898bd0d9c69ba2bbd37239ec8d1c9dc6.

The reverted commit caused issues loading resources supplied by static libraries.

Bug 17748356

Change-Id: I860a4f31451ee7c03c02974826472a67226b029f
2014-10-01 18:11:18 +00:00
kmccormick
af0dca00c2 am 04e50c47: am d1ba4c13: am ae3bd63b: am a1572ffc: Merge "Doc update: Update preprod (staging) instructions." into klp-modular-docs
* commit '04e50c474ce5b6aa2e366bc057a29a16467a66bd':
  Doc update: Update preprod (staging) instructions.
2014-10-01 18:02:36 +00:00
Justin Koh
bf6f081cda am 37185d90: Merge "DO NOT MERGE Hide the volume panel for watches for now" into klp-modular-dev
* commit '37185d90a2036ece55991f416fcf7948a2198d97':
  DO NOT MERGE Hide the volume panel for watches for now
2014-10-01 18:00:45 +00:00
Craig Mautner
3867e4d0c0 am 9ab8fbbc: am 245645ca: Merge "Don\'t clear visible-behind activity if it is top" into lmp-dev
* commit '9ab8fbbc60588b204d362bdab45d892e8274382b':
  Don't clear visible-behind activity if it is top
2014-10-01 17:58:34 +00:00
Justin Koh
37185d90a2 Merge "DO NOT MERGE Hide the volume panel for watches for now" into klp-modular-dev 2014-10-01 17:58:01 +00:00
Ihab Awad
ead63f0200 am 24199873: Merge "Refine implementation of GSM conferences (1/3)" into lmp-dev
* commit '24199873ca3297555909914f92e3cab97169b057':
  Refine implementation of GSM conferences (1/3)
2014-10-01 17:57:24 +00:00
kmccormick
04e50c474c am d1ba4c13: am ae3bd63b: am a1572ffc: Merge "Doc update: Update preprod (staging) instructions." into klp-modular-docs
* commit 'd1ba4c13d0928d10c467bd7fd5992186925e1a5a':
  Doc update: Update preprod (staging) instructions.
2014-10-01 17:55:43 +00:00
Justin Koh
0beee08646 DO NOT MERGE Hide the volume panel for watches for now
Hide the volume panel: it's not usable. Need new design in a future release.

Bug: 17753651
Change-Id: I6f7b0683908407b2c1457379cc6641d25adc5c83
2014-10-01 10:55:40 -07:00
Craig Mautner
9ab8fbbc60 am 245645ca: Merge "Don\'t clear visible-behind activity if it is top" into lmp-dev
* commit '245645ca460150b4030d84c88faa931345a90a50':
  Don't clear visible-behind activity if it is top
2014-10-01 17:52:57 +00:00
Ihab Awad
24199873ca Merge "Refine implementation of GSM conferences (1/3)" into lmp-dev 2014-10-01 17:50:49 +00:00
Craig Mautner
245645ca46 Merge "Don't clear visible-behind activity if it is top" into lmp-dev 2014-10-01 17:48:14 +00:00
Winson Chung
9cb5c4e385 Ensure that we don't show excluded tasks when we are not in that task (Bug 17657618)
- Fix regression with launching an affiliated task due to clipping changes (Bug 17755902)
- Tweaking previous changes to home transition
- Disable the debug mode option
2014-10-01 17:48:05 +00:00
John Reck
77e4a5250f Re-allow suppressing onDetachedFromWindow
Bug: 17578553

Games seem to be doing this to prevent destruction of their
GL contexts, and they assume it works even if it doesn't. However,
GLSurfaceView is clunky here, so while the app is doing something
questionable we don't really offer a better way. For now revert
back to kitkat behavior.

Change-Id: Icfa9e496279b9cfa47f9bc7f6848d9313caed0d5
2014-10-01 10:38:07 -07:00
kmccormick
d1ba4c13d0 am ae3bd63b: am a1572ffc: Merge "Doc update: Update preprod (staging) instructions." into klp-modular-docs
* commit 'ae3bd63bc5ef8106a0d1c2ac15d872517bded5c3':
  Doc update: Update preprod (staging) instructions.
2014-10-01 17:25:38 +00:00
Selim Cinek
1c061d4862 am cdbda3e9: am 15b2202b: Merge "Adapting translation length for a string in a dialog" into lmp-dev
* commit 'cdbda3e989c640aade8c9164b12b51f452792c29':
  Adapting translation length for a string in a dialog
2014-10-01 17:20:37 +00:00
Baligh Uddin
f7ade46cc5 am 7249a8bb: (-s ours) am ff99ff98: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '7249a8bba9fed353c18c94fbe44cf24fba024620':
  Import translations. DO NOT MERGE
2014-10-01 17:20:34 +00:00
John Spurlock
394f29e761 am cd98a559: am c909e1b2: Zen: Fix new event category check.
* commit 'cd98a55956a251aad1cafb8c55d2e683037b8b97':
  Zen: Fix new event category check.
2014-10-01 17:20:30 +00:00
Baligh Uddin
b8cbdcb6f6 am 4aa820ce: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
* commit '4aa820ce58eca124b36d8684b2d01e086786b855':
  Import translations. DO NOT MERGE
2014-10-01 17:20:26 +00:00
Craig Mautner
64ccb70867 Don't clear visible-behind activity if it is top
Previously if an activity requested to keep running behind
translucent activities (Activity.requestVisibleBehind()) and then
converted itself to opaque (Activity.convertFromTranslucent()), we
would clear the visible-behind activity. This change tests to see
if the top activity is the visible-behind activity and does not
clear it in that case.

This change also clears the visible-behind activity whenever it
comes back to the front. That forces the activity to call
requestVisibleBehind() each time it is resumed.

Fixes bug 17648436.

Change-Id: Id0fc4d7e2a2b907675305d98bad1b08cb610919e
2014-10-01 10:14:53 -07:00
Amit Mahajan
7ed7afb51e am 7f630ae7: am c9ab6f12: am f9a67cf9: am 496aeb1a: Merge "Roaming blacklist" into lmp-dev
* commit '7f630ae708927e5d76d8a198834ae2233ab3cca9':
  Roaming blacklist
2014-10-01 17:11:14 +00:00
Adam Lesinski
7923da5f5d am 06f380e9: am 95731abe: am bb7b5197: am cd8e7381: Merge "Fix issue with using locally defined attrs in a shared lib" into lmp-dev
* commit '06f380e9efa4698c223077cacaa2df80a704ef96':
  Fix issue with using locally defined attrs in a shared lib
2014-10-01 17:11:10 +00:00
Alan Viverette
e5ee1dec2c am 999a1ca9: am 5c35f2a4: am e5bed12b: am c2379e00: Merge "Add activated text colors, update Material preference header" into lmp-dev
* commit '999a1ca984ec0877c795433e6f1baa6cd5853aac':
  Add activated text colors, update Material preference header
2014-10-01 17:11:06 +00:00
Alan Viverette
eb659ee3b4 am c6daadb5: am cf2b684f: am d292220f: am 191807e3: Merge "Remove baked-in shadow insets from Material dialog minHeight" into lmp-dev
* commit 'c6daadb5be5fd5d244db370e4d61dd67b62a9774':
  Remove baked-in shadow insets from Material dialog minHeight
2014-10-01 17:11:01 +00:00
Vineeta Srivastava
323807f483 am a42d17c5: am 3cc41b8e: am 533c9461: am ab1e241d: Merge "Show one name if both plmn and spn are equal" into lmp-dev
* commit 'a42d17c5233b60c6f4460bd1679f788d334fea16':
  Show one name if both plmn and spn are equal
2014-10-01 17:10:57 +00:00
Vineeta Srivastava
a098449bc2 am 70f7d14a: am f5e52703: am 0d4d8b19: am 575bf7e6: Merge "Correct MTU size for Bell" into lmp-dev
* commit '70f7d14a6b3f6ebc0a20c56b3b9a949e8a273dfd':
  Correct MTU size for Bell
2014-10-01 17:10:52 +00:00
Eino-Ville Talvala
93ac1c08ac am ef7bf5f0: am bf1184e8: am 4ddacc46: am 0a62ab70: Merge "Camera2 Legacy: Set a default thumbnail size" into lmp-dev
* commit 'ef7bf5f0d82cd2d898c35b17b00d1ca4b59ec02a':
  Camera2 Legacy: Set a default thumbnail size
2014-10-01 17:10:48 +00:00