OSDN Git Service

android-x86/frameworks-base.git
11 years agoam 10786aa1: am a6a8ba84: Merge "Correct a small doc error"
Christopher Tate [Fri, 19 Apr 2013 21:38:42 +0000 (14:38 -0700)]
am 10786aa1: am a6a8ba84: Merge "Correct a small doc error"

* commit '10786aa1d64897f9d1160954d259c81364b10a43':
  Correct a small doc error

11 years agoam 408e6637: am 26a54eca: Merge "Correct algorithm property name and clarify javadoc...
Jeff Tinker [Fri, 19 Apr 2013 21:38:39 +0000 (14:38 -0700)]
am 408e6637: am 26a54eca: Merge "Correct algorithm property name and clarify javadoc description of device unique id property." into jb-mr2-dev

* commit '408e663712b7f807ff1a0859c636e2dc4f53422c':
  Correct algorithm property name and clarify javadoc description of device unique id property.

11 years agoam 1b50e4ea: am ca2a6374: Merge "Environment should only warn when asked." into jb...
Jeff Sharkey [Fri, 19 Apr 2013 21:38:36 +0000 (14:38 -0700)]
am 1b50e4ea: am ca2a6374: Merge "Environment should only warn when asked." into jb-mr2-dev

* commit '1b50e4ead5463f4dcc03f9c5ed64963af0d4d9eb':
  Environment should only warn when asked.

11 years agoresolved conflicts for merge of 7b2ad857 to master
Winson Chung [Fri, 19 Apr 2013 21:25:58 +0000 (14:25 -0700)]
resolved conflicts for merge of 7b2ad857 to master

Change-Id: I72472e56b2303aa6ccabd784fadc7da4eabcb0e8

11 years agoMerge "Call updateUsageStats for all stacks."
Craig Mautner [Fri, 19 Apr 2013 21:00:54 +0000 (21:00 +0000)]
Merge "Call updateUsageStats for all stacks."

11 years agoam a6a8ba84: Merge "Correct a small doc error"
Christopher Tate [Fri, 19 Apr 2013 21:00:47 +0000 (14:00 -0700)]
am a6a8ba84: Merge "Correct a small doc error"

* commit 'a6a8ba844cc47ab4eea204115788f050811f9335':
  Correct a small doc error

11 years agoCall updateUsageStats for all stacks.
Craig Mautner [Fri, 19 Apr 2013 20:57:33 +0000 (13:57 -0700)]
Call updateUsageStats for all stacks.

Was only calling it for the frontmost stack. But if we are going to
or from the home activity then the pausing stack moves to the back.

Fixes bug 8666221.

Change-Id: I1d6d19b49da4aa23414303336fa266362ae5f4b1

11 years agoMerge "Correct a small doc error"
Christopher Tate [Fri, 19 Apr 2013 20:37:31 +0000 (20:37 +0000)]
Merge "Correct a small doc error"

11 years agoam 26a54eca: Merge "Correct algorithm property name and clarify javadoc description...
Jeff Tinker [Fri, 19 Apr 2013 20:35:40 +0000 (13:35 -0700)]
am 26a54eca: Merge "Correct algorithm property name and clarify javadoc description of device unique id property." into jb-mr2-dev

* commit '26a54ecaa556f72086790caa133e5a8d31652d8a':
  Correct algorithm property name and clarify javadoc description of device unique id property.

11 years agoam ca2a6374: Merge "Environment should only warn when asked." into jb-mr2-dev
Jeff Sharkey [Fri, 19 Apr 2013 20:35:37 +0000 (13:35 -0700)]
am ca2a6374: Merge "Environment should only warn when asked." into jb-mr2-dev

* commit 'ca2a6374aadb95ca3f151d4bc2fdd3127f04e5e7':
  Environment should only warn when asked.

11 years agoCorrect a small doc error
Scott Kennedy [Fri, 19 Apr 2013 20:35:16 +0000 (13:35 -0700)]
Correct a small doc error

Change-Id: I2adcc169193452549e55ac10958f0e28216aeb15

11 years agoMerge "Correct algorithm property name and clarify javadoc description of device...
Jeff Tinker [Fri, 19 Apr 2013 20:32:35 +0000 (20:32 +0000)]
Merge "Correct algorithm property name and clarify javadoc description of device unique id property." into jb-mr2-dev

11 years agoMerge "Environment should only warn when asked." into jb-mr2-dev
Jeff Sharkey [Fri, 19 Apr 2013 20:32:25 +0000 (20:32 +0000)]
Merge "Environment should only warn when asked." into jb-mr2-dev

11 years agoam 12a7f76c: Merge "Fix system server crash when uninstalling paid LS widget that...
Adam Cohen [Fri, 19 Apr 2013 20:30:05 +0000 (13:30 -0700)]
am 12a7f76c: Merge "Fix system server crash when uninstalling paid LS widget that has been added (issue 8647398)" into jb-mr2-dev

* commit '12a7f76c8687053d139d670631e7cef7031f8c48':
  Fix system server crash when uninstalling paid LS widget that has been added (issue 8647398)

11 years agoEnvironment should only warn when asked.
Jeff Sharkey [Fri, 19 Apr 2013 20:25:04 +0000 (13:25 -0700)]
Environment should only warn when asked.

Instead of warning on Process.SYSTEM_UID, which is also used by the
Settings app, change to have the parent process explicitly ask for
warnings.

Bug: 8667286
Change-Id: Ib26676694a4041ff4e6d3ffdcc14055b7eba13c7

11 years agoMerge "Fix system server crash when uninstalling paid LS widget that has been added...
Adam Cohen [Fri, 19 Apr 2013 20:26:02 +0000 (20:26 +0000)]
Merge "Fix system server crash when uninstalling paid LS widget that has been added (issue 8647398)" into jb-mr2-dev

11 years agoam dd240d9a: am 0935f258: Merge "Updating API based on feedback" into jb-mr2-dev
Jason Sams [Fri, 19 Apr 2013 20:17:10 +0000 (13:17 -0700)]
am dd240d9a: am 0935f258: Merge "Updating API based on feedback" into jb-mr2-dev

* commit 'dd240d9a30578930bbf63b6bd9998e940dd16160':
  Updating API based on feedback

11 years agoam 0935f258: Merge "Updating API based on feedback" into jb-mr2-dev
Jason Sams [Fri, 19 Apr 2013 20:13:18 +0000 (13:13 -0700)]
am 0935f258: Merge "Updating API based on feedback" into jb-mr2-dev

* commit '0935f258dc2fd1eeadf9d502abbd1e409f68ac67':
  Updating API based on feedback

11 years agoMerge "Updating API based on feedback" into jb-mr2-dev
Jason Sams [Fri, 19 Apr 2013 20:09:55 +0000 (20:09 +0000)]
Merge "Updating API based on feedback" into jb-mr2-dev

11 years agoam a53a44bf: am 80b16639: am b20a943a: am 7c0523d0: am 22881a14: am 3ef011d1: am...
Scott Main [Fri, 19 Apr 2013 20:08:32 +0000 (13:08 -0700)]
am a53a44bf: am 80b16639: am b20a943a: am 7c0523d0: am 22881a14: am 3ef011d1: am 9ffe5dff: add email links for android branding bug:8666523

* commit 'a53a44bf1620e36b8f8286461f9646698e1f1003':
  add email links for android branding bug:8666523

11 years agoam 1e76254d: am 3b4f85b7: am e397020d: am 102e9e5a: am 1b95cc41: am 653a00e2: am...
Scott Main [Fri, 19 Apr 2013 20:08:29 +0000 (13:08 -0700)]
am 1e76254d: am 3b4f85b7: am e397020d: am 102e9e5a: am 1b95cc41: am 653a00e2: am 6afeb0e5: search suggest tags for google service docs and exclude a whole bunch from suggestions

* commit '1e76254d6243b66921444342af33a87fa410d4bf':
  search suggest tags for google service docs and exclude a whole bunch from suggestions

11 years agoam 80b16639: am b20a943a: am 7c0523d0: am 22881a14: am 3ef011d1: am 9ffe5dff: add...
Scott Main [Fri, 19 Apr 2013 20:05:45 +0000 (13:05 -0700)]
am 80b16639: am b20a943a: am 7c0523d0: am 22881a14: am 3ef011d1: am 9ffe5dff: add email links for android branding bug:8666523

* commit '80b1663937462d8ade4eb0187325fb01cc77df3f':
  add email links for android branding bug:8666523

11 years agoam 3b4f85b7: am e397020d: am 102e9e5a: am 1b95cc41: am 653a00e2: am 6afeb0e5: search...
Scott Main [Fri, 19 Apr 2013 20:05:42 +0000 (13:05 -0700)]
am 3b4f85b7: am e397020d: am 102e9e5a: am 1b95cc41: am 653a00e2: am 6afeb0e5: search suggest tags for google service docs and exclude a whole bunch from suggestions

* commit '3b4f85b715399dc044fbaafda37ce74863d55370':
  search suggest tags for google service docs and exclude a whole bunch from suggestions

11 years agoam b20a943a: am 7c0523d0: am 22881a14: am 3ef011d1: am 9ffe5dff: add email links...
Scott Main [Fri, 19 Apr 2013 20:03:12 +0000 (13:03 -0700)]
am b20a943a: am 7c0523d0: am 22881a14: am 3ef011d1: am 9ffe5dff: add email links for android branding bug:8666523

* commit 'b20a943a4e389d8f95e39712ec5acc9c07bcdc47':
  add email links for android branding bug:8666523

11 years agoam e397020d: am 102e9e5a: am 1b95cc41: am 653a00e2: am 6afeb0e5: search suggest tags...
Scott Main [Fri, 19 Apr 2013 20:03:04 +0000 (13:03 -0700)]
am e397020d: am 102e9e5a: am 1b95cc41: am 653a00e2: am 6afeb0e5: search suggest tags for google service docs and exclude a whole bunch from suggestions

* commit 'e397020d4d9144583d4dc05e1ed8ded254b21162':
  search suggest tags for google service docs and exclude a whole bunch from suggestions

11 years agoam 7c0523d0: am 22881a14: am 3ef011d1: am 9ffe5dff: add email links for android brand...
Scott Main [Fri, 19 Apr 2013 19:58:54 +0000 (12:58 -0700)]
am 7c0523d0: am 22881a14: am 3ef011d1: am 9ffe5dff: add email links for android branding bug:8666523

* commit '7c0523d099f9b27c2b1bbdc2ad9a770efd12e629':
  add email links for android branding bug:8666523

11 years agoam 102e9e5a: am 1b95cc41: am 653a00e2: am 6afeb0e5: search suggest tags for google...
Scott Main [Fri, 19 Apr 2013 19:58:51 +0000 (12:58 -0700)]
am 102e9e5a: am 1b95cc41: am 653a00e2: am 6afeb0e5: search suggest tags for google service docs and exclude a whole bunch from suggestions

* commit '102e9e5adf6004dcd503b0ca331c1c2298a4e784':
  search suggest tags for google service docs and exclude a whole bunch from suggestions

11 years agoUpdating API based on feedback
Jason Sams [Fri, 19 Apr 2013 19:56:37 +0000 (12:56 -0700)]
Updating API based on feedback

bug 8656887

This hides the methods used to support Camera
Fixes the oversight in LaunchControl
Documents some missing functions

Change-Id: I5b19b65dd5ddf9917100192c180bb63d89c80679

11 years agoam 22881a14: am 3ef011d1: am 9ffe5dff: add email links for android branding bug:8666523
Scott Main [Fri, 19 Apr 2013 19:55:35 +0000 (12:55 -0700)]
am 22881a14: am 3ef011d1: am 9ffe5dff: add email links for android branding bug:8666523

* commit '22881a1479d172f8896ab1707453c9cc16abd986':
  add email links for android branding bug:8666523

11 years agoam 1b95cc41: am 653a00e2: am 6afeb0e5: search suggest tags for google service docs...
Scott Main [Fri, 19 Apr 2013 19:55:32 +0000 (12:55 -0700)]
am 1b95cc41: am 653a00e2: am 6afeb0e5: search suggest tags for google service docs and exclude a whole bunch from suggestions

* commit '1b95cc41d097d4a1e070b949f46eb13e2fec887a':
  search suggest tags for google service docs and exclude a whole bunch from suggestions

11 years agoam 3ef011d1: am 9ffe5dff: add email links for android branding bug:8666523
Scott Main [Fri, 19 Apr 2013 19:51:18 +0000 (12:51 -0700)]
am 3ef011d1: am 9ffe5dff: add email links for android branding bug:8666523

* commit '3ef011d18557d41964bb47b67d5526fc27d30295':
  add email links for android branding bug:8666523

11 years agoam 653a00e2: am 6afeb0e5: search suggest tags for google service docs and exclude...
Scott Main [Fri, 19 Apr 2013 19:51:15 +0000 (12:51 -0700)]
am 653a00e2: am 6afeb0e5: search suggest tags for google service docs and exclude a whole bunch from suggestions

* commit '653a00e240c618897932c3103dff49c5dbdfb196':
  search suggest tags for google service docs and exclude a whole bunch from suggestions

11 years agoam d87bb312: am 4a1d9513: Merge "Fix NPE issues seen by CTS" into jb-mr2-dev
Irfan Sheriff [Fri, 19 Apr 2013 19:49:44 +0000 (12:49 -0700)]
am d87bb312: am 4a1d9513: Merge "Fix NPE issues seen by CTS" into jb-mr2-dev

* commit 'd87bb3124659edbc9d63988855f0caaa00817ebd':
  Fix NPE issues seen by CTS

11 years agoam ba567014: am e37c8f78: Merge "Improve API and documentation" into jb-mr2-dev
Amith Yamasani [Fri, 19 Apr 2013 19:49:40 +0000 (12:49 -0700)]
am ba567014: am e37c8f78: Merge "Improve API and documentation" into jb-mr2-dev

* commit 'ba56701493ede3f5f338a03173da0327a215b223':
  Improve API and documentation

11 years agoam f2c12911: am 58156b41: Merge "Fix NPE when restarting ChooseTypeAndAccountActiivty...
Carlos Valdivia [Fri, 19 Apr 2013 19:49:38 +0000 (12:49 -0700)]
am f2c12911: am 58156b41: Merge "Fix NPE when restarting ChooseTypeAndAccountActiivty." into jb-mr2-dev

* commit 'f2c12911fb8ef9f40d8e90fe29fef0129edc8553':
  Fix NPE when restarting ChooseTypeAndAccountActiivty.

11 years agoam dde9559b: am 24b55f25: Merge "Deprecate StatFs methods returning small values...
Jeff Sharkey [Fri, 19 Apr 2013 19:49:34 +0000 (12:49 -0700)]
am dde9559b: am 24b55f25: Merge "Deprecate StatFs methods returning small values." into jb-mr2-dev

* commit 'dde9559b78a93344ec0b568c2bac7329621de31f':
  Deprecate StatFs methods returning small values.

11 years agoam 9ffe5dff: add email links for android branding bug:8666523
Scott Main [Fri, 19 Apr 2013 19:47:29 +0000 (12:47 -0700)]
am 9ffe5dff: add email links for android branding bug:8666523

* commit '9ffe5dff76704dbd64ee101f12f32d07e69f95f4':
  add email links for android branding bug:8666523

11 years agoam 6afeb0e5: search suggest tags for google service docs and exclude a whole bunch...
Scott Main [Fri, 19 Apr 2013 19:47:26 +0000 (12:47 -0700)]
am 6afeb0e5: search suggest tags for google service docs and exclude a whole bunch from suggestions

* commit '6afeb0e5e7343bcafd9620bfc04c21cad9f08edb':
  search suggest tags for google service docs and exclude a whole bunch from suggestions

11 years agoam 4a1d9513: Merge "Fix NPE issues seen by CTS" into jb-mr2-dev
Irfan Sheriff [Fri, 19 Apr 2013 19:47:05 +0000 (12:47 -0700)]
am 4a1d9513: Merge "Fix NPE issues seen by CTS" into jb-mr2-dev

* commit '4a1d95139a57b8726fb168b08a5c54b9a134c8df':
  Fix NPE issues seen by CTS

11 years agoam e37c8f78: Merge "Improve API and documentation" into jb-mr2-dev
Amith Yamasani [Fri, 19 Apr 2013 19:47:01 +0000 (12:47 -0700)]
am e37c8f78: Merge "Improve API and documentation" into jb-mr2-dev

* commit 'e37c8f781abb045ec4a0b872e5e6afe48eee021a':
  Improve API and documentation

11 years agoam 58156b41: Merge "Fix NPE when restarting ChooseTypeAndAccountActiivty." into jb...
Carlos Valdivia [Fri, 19 Apr 2013 19:46:59 +0000 (12:46 -0700)]
am 58156b41: Merge "Fix NPE when restarting ChooseTypeAndAccountActiivty." into jb-mr2-dev

* commit '58156b4123acf92f2a03885136a3b6859801f000':
  Fix NPE when restarting ChooseTypeAndAccountActiivty.

11 years agoam 24b55f25: Merge "Deprecate StatFs methods returning small values." into jb-mr2-dev
Jeff Sharkey [Fri, 19 Apr 2013 19:46:56 +0000 (12:46 -0700)]
am 24b55f25: Merge "Deprecate StatFs methods returning small values." into jb-mr2-dev

* commit '24b55f25c18fbed6b5d10ed33ddaab269cf1a01e':
  Deprecate StatFs methods returning small values.

11 years agoMerge "Fix NPE issues seen by CTS" into jb-mr2-dev
Irfan Sheriff [Fri, 19 Apr 2013 19:43:46 +0000 (19:43 +0000)]
Merge "Fix NPE issues seen by CTS" into jb-mr2-dev

11 years agoMerge "Improve API and documentation" into jb-mr2-dev
Amith Yamasani [Fri, 19 Apr 2013 19:10:02 +0000 (19:10 +0000)]
Merge "Improve API and documentation" into jb-mr2-dev

11 years agoImprove API and documentation
Amith Yamasani [Fri, 19 Apr 2013 01:40:07 +0000 (18:40 -0700)]
Improve API and documentation

API for querying accounts visible to a specific package.

Improve API and docs for device owner.

Bug: 8657158
Change-Id: I01b8701534f64b383391508a49ae93ed21f22ae0

11 years agoadd email links for android branding
Scott Main [Fri, 19 Apr 2013 18:40:48 +0000 (11:40 -0700)]
add email links for android branding
bug:8666523

Change-Id: Iee2fe78d7b9ab46723cc3407b9a8eede822b359c

11 years agoMerge "Fix NPE when restarting ChooseTypeAndAccountActiivty." into jb-mr2-dev
Carlos Valdivia [Fri, 19 Apr 2013 18:38:33 +0000 (18:38 +0000)]
Merge "Fix NPE when restarting ChooseTypeAndAccountActiivty." into jb-mr2-dev

11 years agoMerge "Deprecate StatFs methods returning small values." into jb-mr2-dev
Jeff Sharkey [Fri, 19 Apr 2013 18:21:08 +0000 (18:21 +0000)]
Merge "Deprecate StatFs methods returning small values." into jb-mr2-dev

11 years agoam b0efef2f: am f535c820: Merge "Restore dock home support for car docks." into jb...
Daniel Sandler [Fri, 19 Apr 2013 18:10:23 +0000 (11:10 -0700)]
am b0efef2f: am f535c820: Merge "Restore dock home support for car docks." into jb-mr2-dev

* commit 'b0efef2f73533c8d434c47d014f66e1171b19277':
  Restore dock home support for car docks.

11 years agoam 07fedf58: am b08aa235: Merge "Improve fix for bug #8159072 Spinner widget should...
Fabrice Di Meglio [Fri, 19 Apr 2013 18:10:20 +0000 (11:10 -0700)]
am 07fedf58: am b08aa235: Merge "Improve fix for bug #8159072 Spinner widget should be RTL\'ized" into jb-mr2-dev

* commit '07fedf58dd6d6e4759f7dbe7a492e5318f1655cb':
  Improve fix for bug #8159072 Spinner widget should be RTL'ized

11 years agoam f535c820: Merge "Restore dock home support for car docks." into jb-mr2-dev
Daniel Sandler [Fri, 19 Apr 2013 18:03:31 +0000 (11:03 -0700)]
am f535c820: Merge "Restore dock home support for car docks." into jb-mr2-dev

* commit 'f535c820c428d4eefffcb224f2572a9c5b9965ea':
  Restore dock home support for car docks.

11 years agoam b08aa235: Merge "Improve fix for bug #8159072 Spinner widget should be RTL\'ized...
Fabrice Di Meglio [Fri, 19 Apr 2013 18:03:28 +0000 (11:03 -0700)]
am b08aa235: Merge "Improve fix for bug #8159072 Spinner widget should be RTL\'ized" into jb-mr2-dev

* commit 'b08aa2354ff3b1bd1c7d705b82a7c1e62674ee50':
  Improve fix for bug #8159072 Spinner widget should be RTL'ized

11 years agoam 78017d2e: am eddb9c89: Merge "Rename API AndroidKey* -> Key*" into jb-mr2-dev
Kenny Root [Fri, 19 Apr 2013 18:03:21 +0000 (11:03 -0700)]
am 78017d2e: am eddb9c89: Merge "Rename API AndroidKey* -> Key*" into jb-mr2-dev

* commit '78017d2e0fc81d1b07b26b358fe24b9af1d7d490':
  Rename API AndroidKey* -> Key*

11 years agoam 68757ef6: am 63e550f2: Merge "Add getters and private constructor" into jb-mr2-dev
Irfan Sheriff [Fri, 19 Apr 2013 18:03:18 +0000 (11:03 -0700)]
am 68757ef6: am 63e550f2: Merge "Add getters and private constructor" into jb-mr2-dev

* commit '68757ef6bcee725f983fd4c793d7be11fbdd3cd6':
  Add getters and private constructor

11 years agoam 1c6e609b: am 2623a24f: Merge "Fix bug #8654490 android:paddingStart doesn\'t overr...
Fabrice Di Meglio [Fri, 19 Apr 2013 18:03:15 +0000 (11:03 -0700)]
am 1c6e609b: am 2623a24f: Merge "Fix bug #8654490 android:paddingStart doesn\'t override android:paddingLeft" into jb-mr2-dev

* commit '1c6e609b2b5409b34d5928f506306ed9ad21adb7':
  Fix bug #8654490 android:paddingStart doesn't override android:paddingLeft

11 years agoMerge "Restore dock home support for car docks." into jb-mr2-dev
Daniel Sandler [Fri, 19 Apr 2013 18:00:17 +0000 (18:00 +0000)]
Merge "Restore dock home support for car docks." into jb-mr2-dev

11 years agoam eddb9c89: Merge "Rename API AndroidKey* -> Key*" into jb-mr2-dev
Kenny Root [Fri, 19 Apr 2013 17:59:57 +0000 (10:59 -0700)]
am eddb9c89: Merge "Rename API AndroidKey* -> Key*" into jb-mr2-dev

* commit 'eddb9c891619c39f459d10b200eddb1f2932c96b':
  Rename API AndroidKey* -> Key*

11 years agoam 63e550f2: Merge "Add getters and private constructor" into jb-mr2-dev
Irfan Sheriff [Fri, 19 Apr 2013 17:59:54 +0000 (10:59 -0700)]
am 63e550f2: Merge "Add getters and private constructor" into jb-mr2-dev

* commit '63e550f2026e749e7be5ab03655f0a5105457b9e':
  Add getters and private constructor

11 years agoam 2623a24f: Merge "Fix bug #8654490 android:paddingStart doesn\'t override android...
Fabrice Di Meglio [Fri, 19 Apr 2013 17:59:51 +0000 (10:59 -0700)]
am 2623a24f: Merge "Fix bug #8654490 android:paddingStart doesn\'t override android:paddingLeft" into jb-mr2-dev

* commit '2623a24ffa4d75206757684b12b06318167f8788':
  Fix bug #8654490 android:paddingStart doesn't override android:paddingLeft

11 years agoam 696b15e5: am 68711f93: Merge "Revert "Simple MVC based binding mechanism for andro...
Philip Milne [Fri, 19 Apr 2013 17:59:43 +0000 (10:59 -0700)]
am 696b15e5: am 68711f93: Merge "Revert "Simple MVC based binding mechanism for android controls."" into jb-mr2-dev

* commit '696b15e52659abdf8852dc60f09fe79edba435e0':
  Revert "Simple MVC based binding mechanism for android controls."

11 years agoMerge "Improve fix for bug #8159072 Spinner widget should be RTL'ized" into jb-mr2-dev
Fabrice Di Meglio [Fri, 19 Apr 2013 17:58:46 +0000 (17:58 +0000)]
Merge "Improve fix for bug #8159072 Spinner widget should be RTL'ized" into jb-mr2-dev

11 years agoMerge "Rename API AndroidKey* -> Key*" into jb-mr2-dev
Kenny Root [Fri, 19 Apr 2013 17:58:00 +0000 (17:58 +0000)]
Merge "Rename API AndroidKey* -> Key*" into jb-mr2-dev

11 years agoMerge "Add getters and private constructor" into jb-mr2-dev
Irfan Sheriff [Fri, 19 Apr 2013 17:56:34 +0000 (17:56 +0000)]
Merge "Add getters and private constructor" into jb-mr2-dev

11 years agoam 68711f93: Merge "Revert "Simple MVC based binding mechanism for android controls...
Philip Milne [Fri, 19 Apr 2013 17:56:22 +0000 (10:56 -0700)]
am 68711f93: Merge "Revert "Simple MVC based binding mechanism for android controls."" into jb-mr2-dev

* commit '68711f936381310fad783f2500e59dc2f272618a':
  Revert "Simple MVC based binding mechanism for android controls."

11 years agoMerge "Fix bug #8654490 android:paddingStart doesn't override android:paddingLeft...
Fabrice Di Meglio [Fri, 19 Apr 2013 17:56:22 +0000 (17:56 +0000)]
Merge "Fix bug #8654490 android:paddingStart doesn't override android:paddingLeft" into jb-mr2-dev

11 years agoFix NPE issues seen by CTS
Irfan Sheriff [Fri, 19 Apr 2013 17:43:40 +0000 (10:43 -0700)]
Fix NPE issues seen by CTS

Bug: 8646305
Change-Id: Ief90c76d63f60aee9a3da080cd43dd9610f3f4fc

11 years agoMerge "Revert "Simple MVC based binding mechanism for android controls."" into jb...
Philip Milne [Fri, 19 Apr 2013 17:53:23 +0000 (17:53 +0000)]
Merge "Revert "Simple MVC based binding mechanism for android controls."" into jb-mr2-dev

11 years agoDeprecate StatFs methods returning small values.
Jeff Sharkey [Thu, 18 Apr 2013 23:00:04 +0000 (16:00 -0700)]
Deprecate StatFs methods returning small values.

Bug: 8656794
Change-Id: Ic904bd1bc016ef48b5a304b7c68250afe23e98bc

11 years agoam 0460cb9e: am 88cec86e: Remove STOPSHIP and defer removal.
Robert Greenwalt [Fri, 19 Apr 2013 17:20:35 +0000 (10:20 -0700)]
am 0460cb9e: am 88cec86e: Remove STOPSHIP and defer removal.

* commit '0460cb9ed68bbd612c46c52b5f17e58d31cc5125':
  Remove STOPSHIP and defer removal.

11 years agoam 88cec86e: Remove STOPSHIP and defer removal.
Robert Greenwalt [Fri, 19 Apr 2013 17:17:41 +0000 (10:17 -0700)]
am 88cec86e: Remove STOPSHIP and defer removal.

* commit '88cec86e882e27a9e35315553cc05fdf7f281a4e':
  Remove STOPSHIP and defer removal.

11 years agoCorrect algorithm property name and clarify javadoc description of
Jeff Tinker [Fri, 19 Apr 2013 17:04:17 +0000 (10:04 -0700)]
Correct algorithm property name and clarify javadoc description of
device unique id property.

bug: 8603279
Change-Id: If56d568072b3c09e5f63901e285d0eaa3c77ff7a

11 years agoAdd getters and private constructor
Irfan Sheriff [Fri, 19 Apr 2013 16:29:34 +0000 (09:29 -0700)]
Add getters and private constructor

Address API feedback

Bug: 8656930
Change-Id: Idc3dd8d8a7e633449329864e41cab58a6b193b5a

11 years agoRemove STOPSHIP and defer removal.
Robert Greenwalt [Fri, 19 Apr 2013 16:31:24 +0000 (09:31 -0700)]
Remove STOPSHIP and defer removal.

bug:8657300
Change-Id: Ia855fdc0db7a33502838648ee002d4929b224960

11 years agoam 28230f8b: am 9b3ebb12: Merge "Update API" into jb-mr2-dev
Irfan Sheriff [Fri, 19 Apr 2013 16:10:57 +0000 (09:10 -0700)]
am 28230f8b: am 9b3ebb12: Merge "Update API" into jb-mr2-dev

* commit '28230f8b270d28b9628e41722d846a4cccbcb994':
  Update API

11 years agoam 9b3ebb12: Merge "Update API" into jb-mr2-dev
Irfan Sheriff [Fri, 19 Apr 2013 16:08:26 +0000 (09:08 -0700)]
am 9b3ebb12: Merge "Update API" into jb-mr2-dev

* commit '9b3ebb124eba3d9f80ae299e0cbcfcd9c0a8653d':
  Update API

11 years agoMerge "Update API" into jb-mr2-dev
Irfan Sheriff [Fri, 19 Apr 2013 16:05:15 +0000 (16:05 +0000)]
Merge "Update API" into jb-mr2-dev

11 years agoUpdate API
Irfan Sheriff [Fri, 19 Apr 2013 16:03:00 +0000 (09:03 -0700)]
Update API

Bug: 8656932
Change-Id: I09a8018f488d4e8ca3eb8c2a798669ebe016dfc8

11 years agoam 3fe5e2a1: am ba1311a3: Merge "Fix API name" into jb-mr2-dev
Irfan Sheriff [Fri, 19 Apr 2013 16:00:16 +0000 (09:00 -0700)]
am 3fe5e2a1: am ba1311a3: Merge "Fix API name" into jb-mr2-dev

* commit '3fe5e2a13508ba12f3757619732f0810d1750dc2':
  Fix API name

11 years agoam 0068e00d: am 91695a0c: Merge "Anti-drift in RCC playback position" into jb-mr2-dev
Jean-Michel Trivi [Fri, 19 Apr 2013 16:00:12 +0000 (09:00 -0700)]
am 0068e00d: am 91695a0c: Merge "Anti-drift in RCC playback position" into jb-mr2-dev

* commit '0068e00ddc625280ea230ca3fb819e901595c03d':
  Anti-drift in RCC playback position

11 years agoam ba1311a3: Merge "Fix API name" into jb-mr2-dev
Irfan Sheriff [Fri, 19 Apr 2013 15:57:45 +0000 (08:57 -0700)]
am ba1311a3: Merge "Fix API name" into jb-mr2-dev

* commit 'ba1311a3f64efc9f22dea1ab5477002751e478dc':
  Fix API name

11 years agoam 91695a0c: Merge "Anti-drift in RCC playback position" into jb-mr2-dev
Jean-Michel Trivi [Fri, 19 Apr 2013 15:57:43 +0000 (08:57 -0700)]
am 91695a0c: Merge "Anti-drift in RCC playback position" into jb-mr2-dev

* commit '91695a0cdc0aaab3d3f939d9adb8855938b4f69d':
  Anti-drift in RCC playback position

11 years agoMerge "Fix API name" into jb-mr2-dev
Irfan Sheriff [Fri, 19 Apr 2013 15:56:10 +0000 (15:56 +0000)]
Merge "Fix API name" into jb-mr2-dev

11 years agoMerge "Anti-drift in RCC playback position" into jb-mr2-dev
Jean-Michel Trivi [Fri, 19 Apr 2013 15:55:28 +0000 (15:55 +0000)]
Merge "Anti-drift in RCC playback position" into jb-mr2-dev

11 years agoam 747847fa: am 56af4f21: Merge "AudioService: SCO audio backward compatibility"...
Eric Laurent [Fri, 19 Apr 2013 15:45:13 +0000 (08:45 -0700)]
am 747847fa: am 56af4f21: Merge "AudioService: SCO audio backward compatibility" into jb-mr2-dev

* commit '747847fa128ebda5aab1afe15f64a2997cbb0cce':
  AudioService: SCO audio backward compatibility

11 years agoam 56af4f21: Merge "AudioService: SCO audio backward compatibility" into jb-mr2-dev
Eric Laurent [Fri, 19 Apr 2013 15:42:42 +0000 (08:42 -0700)]
am 56af4f21: Merge "AudioService: SCO audio backward compatibility" into jb-mr2-dev

* commit '56af4f212a21fe08b54de10322e023b09fa125aa':
  AudioService: SCO audio backward compatibility

11 years agoFix API name
Irfan Sheriff [Fri, 19 Apr 2013 15:39:53 +0000 (08:39 -0700)]
Fix API name

Address council feedback

Bug: 8656932
Change-Id: I92972fc3672afbc38cdeee628c04b639053f7cf3

11 years agoam dbc26a86: am 6ead6cca: Merge "Add some documentation to MediaCodecInfo" into jb...
Andreas Huber [Fri, 19 Apr 2013 15:39:36 +0000 (08:39 -0700)]
am dbc26a86: am 6ead6cca: Merge "Add some documentation to MediaCodecInfo" into jb-mr2-dev

* commit 'dbc26a867d0a90319b0b016f9d658d9e754d6cb2':
  Add some documentation to MediaCodecInfo

11 years agoMerge "AudioService: SCO audio backward compatibility" into jb-mr2-dev
Eric Laurent [Fri, 19 Apr 2013 15:39:22 +0000 (15:39 +0000)]
Merge "AudioService: SCO audio backward compatibility" into jb-mr2-dev

11 years agoam 6ead6cca: Merge "Add some documentation to MediaCodecInfo" into jb-mr2-dev
Andreas Huber [Fri, 19 Apr 2013 15:37:04 +0000 (08:37 -0700)]
am 6ead6cca: Merge "Add some documentation to MediaCodecInfo" into jb-mr2-dev

* commit '6ead6ccac9727993559c9f09f1e8da3c69ee3313':
  Add some documentation to MediaCodecInfo

11 years agoMerge "Add some documentation to MediaCodecInfo" into jb-mr2-dev
Andreas Huber [Fri, 19 Apr 2013 15:34:15 +0000 (15:34 +0000)]
Merge "Add some documentation to MediaCodecInfo" into jb-mr2-dev

11 years agoFix NPE when restarting ChooseTypeAndAccountActiivty.
Carlos Valdivia [Fri, 19 Apr 2013 08:07:12 +0000 (01:07 -0700)]
Fix NPE when restarting ChooseTypeAndAccountActiivty.

Note that this change still leaves things in an imperfect state. Now instead
of ANR with an NPE it will reshow the Choose account activity and then on the
second back, it will go away. So the user isn't hosed. But it is still a sloppy
experience.  Basically the bug fix reveals another not quite as bad bug
(see https://b/8661942).

Bug: 8151602
Change-Id: I44b188f5940d464c2dd81dd0b6b7cae3c189becd

11 years agoFix build.
Ying Wang [Fri, 19 Apr 2013 04:52:08 +0000 (21:52 -0700)]
Fix build.

By "make update-api"

Change-Id: I57dec463747ad99fb57ee3e94b70364edcccaedf

11 years agoRevert "Simple MVC based binding mechanism for android controls."
Philip Milne [Fri, 19 Apr 2013 03:53:38 +0000 (03:53 +0000)]
Revert "Simple MVC based binding mechanism for android controls."

Fix for bug 8656899 API REVIEW:
android.util.PropertyValueModel/ValueModel,
android.widget.ValueEditor etc

Revert the change that added this API to remove it outright.

This reverts commit 989709a973448980f36dacd587b0a58f89ffa11e

Change-Id: I9018cd8dadb1b1a54ad8749c816bd02bb7e7a38b

11 years agoam 9454a9b3: am 4e0eb22f: Fix doc build.
Ying Wang [Fri, 19 Apr 2013 03:47:44 +0000 (20:47 -0700)]
am 9454a9b3: am 4e0eb22f: Fix doc build.

* commit '9454a9b3037dfdd172e08d621a23df182bf942b4':
  Fix doc build.

11 years agoam 4e0eb22f: Fix doc build.
Ying Wang [Fri, 19 Apr 2013 03:44:28 +0000 (20:44 -0700)]
am 4e0eb22f: Fix doc build.

* commit '4e0eb22fdf56b8f3fd1bff09c4064b35b80751c1':
  Fix doc build.

11 years agoFix doc build.
Ying Wang [Fri, 19 Apr 2013 03:39:48 +0000 (20:39 -0700)]
Fix doc build.

Change-Id: Ibf0d998721a2851c31529d5b44bf86b1b3df5791

11 years agoImprove fix for bug #8159072 Spinner widget should be RTL'ized
Fabrice Di Meglio [Mon, 15 Apr 2013 21:05:30 +0000 (14:05 -0700)]
Improve fix for bug #8159072 Spinner widget should be RTL'ized

- populate the preloaded drawable cache with only LTR drawables
when the layout direction during preloading is LTR. Populate
the cache with only RTL drawables when the layout direction during
preloading is RTL
- only preload drawables that dont have a dual LTR/RTL version

Change-Id: I7807bdc031b99102609efda75042a9500d96065c

11 years agoMerge "Handle app dying."
Craig Mautner [Fri, 19 Apr 2013 02:27:38 +0000 (02:27 +0000)]
Merge "Handle app dying."

11 years agoHandle app dying.
Craig Mautner [Fri, 19 Apr 2013 02:25:12 +0000 (19:25 -0700)]
Handle app dying.

Fix bugs related to handleAppDied.
Fixes bug 8658744.

Change-Id: I0ba2466ffac5e465e803e97a781810c34a6de371

11 years agoam 31ae3908: am 8adf5d2b: Merge "Undeprecate old UsbDeviceConnection methods." into...
Jeff Brown [Fri, 19 Apr 2013 02:22:33 +0000 (19:22 -0700)]
am 31ae3908: am 8adf5d2b: Merge "Undeprecate old UsbDeviceConnection methods." into jb-mr2-dev

* commit '31ae3908fb6d4eccc04920ddaff557b76110fe30':
  Undeprecate old UsbDeviceConnection methods.