Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
120,024 Commits 3 Branches 0 Tags
bd686a1e1d3cb8662661cbabcab09b224abf97a2
Commit Graph

33184 Commits

Author SHA1 Message Date
Lajos Molnar
bd686a1e1d am 752926c7: am 1197bc37: am 7e11b16b: VideoView: expand documentation on state save/restore limitations 
* commit '752926c752b9516c05a36f3eed6ab6b77d32b2c6':
  VideoView: expand documentation on state save/restore limitations
 2013-11-13 18:48:09 -08:00
Robert Greenwalt
8bf47a36b6 am 7fdfe28c: am 4c514f2a: am 594eeb08: Merge "Fix for the invalid Global Proxy Setting" into klp-dev 
* commit '7fdfe28c75e103b8a66b559dcb813576fbbf2eb5':
  Fix for the invalid Global Proxy Setting
 2013-11-13 18:47:57 -08:00
Craig Mautner
a3da4623b1 am 1fbb5da2: am 29bbd570: am 1f0f9fa9: Merge "Add null pointer check." into klp-dev 
* commit '1fbb5da29a4ebef1d758dffad9c2704a5932d223':
  Fix a JNI local reference leak in JNIMediaPlayerListener::notify.
  Add null pointer check.
  Import translations. DO NOT MERGE
  Small DocumentsProvider doc improvements.
  Keyguard isn't visible if it hasn't been drawn.
  Enable fast camera transition when launched from navbar
  Reduce camera launch time by about 250ms.
  camera2: Remove prior repeating request when setting.
 2013-11-13 18:47:54 -08:00
Lajos Molnar
752926c752 am 1197bc37: am 7e11b16b: VideoView: expand documentation on state save/restore limitations 
* commit '1197bc37e58fe7cd5ab32278367e53f19f01f784':
  VideoView: expand documentation on state save/restore limitations
 2013-11-13 16:44:55 -08:00
Lajos Molnar
1197bc37e5 am 7e11b16b: VideoView: expand documentation on state save/restore limitations 
* commit '7e11b16b9f8896170d492240a5fd50c8bd04105d':
  VideoView: expand documentation on state save/restore limitations
 2013-11-13 16:40:26 -08:00
Robert Greenwalt
7fdfe28c75 am 4c514f2a: am 594eeb08: Merge "Fix for the invalid Global Proxy Setting" into klp-dev 
* commit '4c514f2a688bdae319c919987092ccfee690f390':
  Fix for the invalid Global Proxy Setting
 2013-11-13 16:29:12 -08:00
Lajos Molnar
7e11b16b9f VideoView: expand documentation on state save/restore limitations 
Change-Id: I46f231d314fc4ae8d9d11389aa62a3e2698122ed
Signed-off-by: Lajos Molnar <lajos@google.com>
Bug: 11412889
 2013-11-13 16:27:30 -08:00
Robert Greenwalt
4c514f2a68 am 594eeb08: Merge "Fix for the invalid Global Proxy Setting" into klp-dev 
* commit '594eeb082e548617ff5092496888c43457593c2b':
  Fix for the invalid Global Proxy Setting
 2013-11-13 16:26:45 -08:00
Raj Mamadgi
92d02491ad Fix for the invalid Global Proxy Setting 
Adding validation for Global Proxy setting before it is
being set.

Proxy is validated at the boot time also to make sure
the value set is valid.

Signed-off-by: Raj Mamadgi <rmamadgi@sta.samsung.com>
bug:11598568

Change-Id: Idff5ae81119d8143da096b5291ecbfbc5875cbd4
 2013-11-14 00:08:21 +00:00
Jeff Sharkey
d596104a32 am 529ba106: am 711d390b: Merge "Small DocumentsProvider doc improvements." into klp-dev 
* commit '529ba10693bbb2d756b2ba6af706accdba64692a':
  Small DocumentsProvider doc improvements.
 2013-11-13 14:39:25 -08:00
Jeff Sharkey
529ba10693 am 711d390b: Merge "Small DocumentsProvider doc improvements." into klp-dev 
* commit '711d390be96531c5dfadb9a17e373f1e92ef16a1':
  Small DocumentsProvider doc improvements.
 2013-11-13 14:34:49 -08:00
Jeff Sharkey
711d390be9 Merge "Small DocumentsProvider doc improvements." into klp-dev 2013-11-13 22:31:01 +00:00
Svetoslav
b1c305f9fc am e84f23b5: am 60020252: am 14f30080: Merge "Update the PrintDocumentAdapter docs." into klp-dev 
* commit 'e84f23b5fd72c03ca4c8cbef3bc1fde4eec29f36':
  Update the PrintDocumentAdapter docs.
 2013-11-13 13:42:57 -08:00
Svetoslav
e84f23b5fd am 60020252: am 14f30080: Merge "Update the PrintDocumentAdapter docs." into klp-dev 
* commit '60020252db88825b0c0951de7fef6f07d68786a9':
  Update the PrintDocumentAdapter docs.
 2013-11-13 13:38:21 -08:00
Svetoslav
60020252db am 14f30080: Merge "Update the PrintDocumentAdapter docs." into klp-dev 
* commit '14f300803b7d16a3c9632cb626529e873e4813f1':
  Update the PrintDocumentAdapter docs.
 2013-11-13 13:34:00 -08:00
Jeff Sharkey
3b945405cf Small DocumentsProvider doc improvements. 
Bug: 11670294
Change-Id: I5fb91c7665fc2a4531059ef9f2de0972ebabe1ea
 2013-11-13 13:31:17 -08:00
Svetoslav
14f300803b Merge "Update the PrintDocumentAdapter docs." into klp-dev 2013-11-13 21:30:58 +00:00
Jean Chalard
e1ce53209a am 9ea18d49: am d952ac4c: am 218ecd43: Fix the docs build 
* commit '9ea18d495c4c3d47d279f3f63cb4a24641544f89':
  Fix the docs build
 2013-11-12 22:35:28 -08:00
Jean Chalard
9ea18d495c am d952ac4c: am 218ecd43: Fix the docs build 
* commit 'd952ac4c171780da78a157de73702d60d4737916':
  Fix the docs build
 2013-11-12 22:31:34 -08:00
Jean Chalard
d952ac4c17 am 218ecd43: Fix the docs build 
* commit '218ecd43946001f07b60757db130ef5585d474d3':
  Fix the docs build
 2013-11-12 22:27:47 -08:00
Jean Chalard
218ecd4394 Fix the docs build 
Change-Id: I05f1f39aaa9d72201a7fd06377799246039cd505
 2013-11-13 15:20:58 +09:00
Jean Chalard
cfafb5059d am 45637283: am 383ef79d: am 7d57b7a3: Merge "Improve documentation for InputType and EditorInfo." into klp-dev 
* commit '4563728371520de38445d5758edd3da7538a1934':
  Improve documentation for InputType and EditorInfo.
 2013-11-12 21:27:34 -08:00
Jean Chalard
4563728371 am 383ef79d: am 7d57b7a3: Merge "Improve documentation for InputType and EditorInfo." into klp-dev 
* commit '383ef79d14a64b335d94353e87e824ea2f37ee65':
  Improve documentation for InputType and EditorInfo.
 2013-11-12 21:25:26 -08:00
Jean Chalard
383ef79d14 am 7d57b7a3: Merge "Improve documentation for InputType and EditorInfo." into klp-dev 
* commit '7d57b7a35bd64d271b666f16aa1e85a4c2b99ca7':
  Improve documentation for InputType and EditorInfo.
 2013-11-12 21:22:03 -08:00
Jean Chalard
7d57b7a35b Merge "Improve documentation for InputType and EditorInfo." into klp-dev 2013-11-13 05:19:36 +00:00
Scott Main
72cd81db36 am af623b99: am bb146981: am 29610421: Merge "Revised some text while reading up on traceview. this is what\'s left of this older CL that was left for dead: I5528b476d8110df51d45aaf690d878f72bc75c9f" into klp-docs 
* commit 'af623b99dafbc16effc7b05de833e842654b75e1':
  Revised some text while reading up on traceview. this is what's left of this older CL that was left for dead: I5528b476d8110df51d45aaf690d878f72bc75c9f
 2013-11-12 19:29:11 -08:00
Craig Mautner
b12eb71c4f Merge commit 'bf581034' into manualmerge 
Conflicts:
	tools/layoutlib/bridge/src/android/view/IWindowManagerImpl.java

Change-Id: I9fd35ea9166ec73ce1f9f6154aa4ec87e79e20cb
 2013-11-12 19:17:06 -08:00
Scott Main
af623b99da am bb146981: am 29610421: Merge "Revised some text while reading up on traceview. this is what\'s left of this older CL that was left for dead: I5528b476d8110df51d45aaf690d878f72bc75c9f" into klp-docs 
* commit 'bb1469816451aeb24eb8208fac1f2596f528aa80':
  Revised some text while reading up on traceview. this is what's left of this older CL that was left for dead: I5528b476d8110df51d45aaf690d878f72bc75c9f
 2013-11-12 18:58:13 -08:00
Scott Main
bb14698164 am 29610421: Merge "Revised some text while reading up on traceview. this is what\'s left of this older CL that was left for dead: I5528b476d8110df51d45aaf690d878f72bc75c9f" into klp-docs 
* commit '29610421a32501661d6c20136c76ec426d6500fb':
  Revised some text while reading up on traceview. this is what's left of this older CL that was left for dead: I5528b476d8110df51d45aaf690d878f72bc75c9f
 2013-11-13 02:53:40 +00:00
Scott Main
29610421a3 Merge "Revised some text while reading up on traceview. this is what's left of this older CL that was left for dead: I5528b476d8110df51d45aaf690d878f72bc75c9f" into klp-docs 2013-11-13 02:50:50 +00:00
Scott Main
c468240c1a Revised some text while reading up on traceview. 
this is what's left of this older CL that was left for dead:
I5528b476d8110df51d45aaf690d878f72bc75c9f

Change-Id: I42f784d693c0a2a2e2e8ed4c582cbc10180191e7
 2013-11-12 18:49:21 -08:00
Svetoslav
57b296f5a9 Update the PrintDocumentAdapter docs. 
This change adds some clarification when a cancellation will be
requested during a layout or write. It also clarifies from which
thread the layout and write callbacks can be invoked.

Change-Id: Id20ff04c6fca8315849ed4a6c329da1b12bb6836
 2013-11-12 16:21:00 -08:00
Craig Mautner
bf581034f9 am 679ba4e8: am 6cd206b2: Merge "Relayout windows that handle their own config change." into klp-dev 
* commit '679ba4e86e4fecb6dbfe48d6c49205c32f995a1c':
  Relayout windows that handle their own config change.
 2013-11-12 16:00:54 -08:00
Craig Mautner
679ba4e86e am 6cd206b2: Merge "Relayout windows that handle their own config change." into klp-dev 
* commit '6cd206b2aa0039c215fc0a4cc487471c4b3f1496':
  Relayout windows that handle their own config change.
 2013-11-12 15:58:28 -08:00
Craig Mautner
6cd206b2aa Merge "Relayout windows that handle their own config change." into klp-dev 2013-11-12 23:56:21 +00:00
Craig Mautner
5d9f547720 Relayout windows that handle their own config change. 
If a window claims to handle its own configuration change then we
won't destroy and recreate its window on a configuration change.
Normally that recreation triggers the first layout following
orientation change because mHaveFrame is false. Windows that handle
their own configuration changes never got a relayout pass following a
change in orientation.

This change passes the configuration changes that an application
handles into the AppWindowToken. If the app says it handles
orientation or screen size changes then a relayout will occur when the
configuration has changed.

Fixes bug 11647107.

Change-Id: Ie8d49fd050442ebbdcf0b805087894e3a2fc4be9
 2013-11-12 14:02:52 -08:00
Fabrice Di Meglio
43983c7bd9 am d303549b: am db976ea0: am 3f183a23: Merge "Fix bug #11586041 Regression: text truncation in Clock" into klp-dev 
* commit 'd303549b5175d3e589ca656c5e01a88b55bf373a':
  Fix bug #11586041 Regression: text truncation in Clock
 2013-11-12 11:15:15 -08:00
Fabrice Di Meglio
d303549b51 am db976ea0: am 3f183a23: Merge "Fix bug #11586041 Regression: text truncation in Clock" into klp-dev 
* commit 'db976ea0fc4f21b94666f0c91b7369c45ed1dd80':
  Fix bug #11586041 Regression: text truncation in Clock
 2013-11-12 11:10:18 -08:00
Fabrice Di Meglio
db976ea0fc am 3f183a23: Merge "Fix bug #11586041 Regression: text truncation in Clock" into klp-dev 
* commit '3f183a234bef643080d4f9dce44bcaa68e5d4694':
  Fix bug #11586041 Regression: text truncation in Clock
 2013-11-12 11:06:47 -08:00
Fabrice Di Meglio
3f183a234b Merge "Fix bug #11586041 Regression: text truncation in Clock" into klp-dev 2013-11-12 19:03:48 +00:00
Eino-Ville Talvala
07177de6c7 am e7d825d8: am ed676b21: am 4d12d8be: Merge "Camera2: Add support for partial result metadata quirk" into klp-dev 
* commit 'e7d825d8b2a256ec6303f26318387538964c79f6':
  Camera2: Add support for partial result metadata quirk
 2013-11-12 10:34:28 -08:00
Eino-Ville Talvala
e7d825d8b2 am ed676b21: am 4d12d8be: Merge "Camera2: Add support for partial result metadata quirk" into klp-dev 
* commit 'ed676b219704fe2cd1b14814bf79e231142978f8':
  Camera2: Add support for partial result metadata quirk
 2013-11-12 10:31:45 -08:00
Eino-Ville Talvala
ed676b2197 am 4d12d8be: Merge "Camera2: Add support for partial result metadata quirk" into klp-dev 
* commit '4d12d8bef6d04c16fc18f10437ffc49bcdfabf9b':
  Camera2: Add support for partial result metadata quirk
 2013-11-12 10:29:18 -08:00
Eino-Ville Talvala
4d12d8bef6 Merge "Camera2: Add support for partial result metadata quirk" into klp-dev 2013-11-12 18:27:06 +00:00
Scott Main
4ee6d87e16 am 3c95033a: am 7774d8e7: am 44895333: clarify that ANDROID_ID is unique for each user in multi-user environment. bug: 8073630 
* commit '3c95033a3854c6d569a8c8849e06298fc842498d':
  clarify that ANDROID_ID is unique for each user in multi-user environment. bug: 8073630
 2013-11-12 10:05:30 -08:00
Scott Main
3c95033a38 am 7774d8e7: am 44895333: clarify that ANDROID_ID is unique for each user in multi-user environment. bug: 8073630 
* commit '7774d8e723774d8523435f34d821a6eff2c1391f':
  clarify that ANDROID_ID is unique for each user in multi-user environment. bug: 8073630
 2013-11-12 10:00:02 -08:00
Scott Main
7774d8e723 am 44895333: clarify that ANDROID_ID is unique for each user in multi-user environment. bug: 8073630 
* commit '44895333dad66be0ab5350b039d828f3da2a1b73':
  clarify that ANDROID_ID is unique for each user in multi-user environment. bug: 8073630
 2013-11-12 17:56:03 +00:00
Amith Yamasani
2d3fa418e7 Merge "Move some system services to their own sub package." 2013-11-12 17:51:09 +00:00
Scott Main
44895333da clarify that ANDROID_ID is unique for each user in multi-user environment. 
bug: 8073630

Change-Id: Iff18e892a1e0422a85edd83f97ba4285f2171f74
 2013-11-12 09:23:13 -08:00
Amith Yamasani
30f8eb472e Move some system services to their own sub package. 
As a next step they can be moved into separate directories to be
built as separate modules that may or may not be included in a
particular configuration.

Moves AppWidgetService, BackupManagerService, ClipboardService, DevicePolicyMS,
and WallpaperMS.

Change-Id: I33e48d070f38186819d3a1d7a4dc3984b75a9eda
 2013-11-12 09:06:42 -08:00