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

105217 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Winson Chung
6168317f31 resolved conflicts for merge of 7b2ad857 to master 
Change-Id: I72472e56b2303aa6ccabd784fadc7da4eabcb0e8
 2013-04-19 14:25:58 -07:00
Craig Mautner
8fbe05fb86 Merge "Call updateUsageStats for all stacks." 2013-04-19 21:00:55 +00:00
Craig Mautner
7d9eaa435d 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
 2013-04-19 13:57:33 -07:00
Adam Cohen
7b2ad857a8 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)
 2013-04-19 13:30:05 -07:00
Adam Cohen
12a7f76c86 Merge "Fix system server crash when uninstalling paid LS widget that has been added (issue 8647398)" into jb-mr2-dev 2013-04-19 20:26:02 +00:00
Jason Sams
6a341fc793 am dd240d9a: am 0935f258: Merge "Updating API based on feedback" into jb-mr2-dev 
* commit 'dd240d9a30578930bbf63b6bd9998e940dd16160':
  Updating API based on feedback
 2013-04-19 13:17:10 -07:00
Jason Sams
dd240d9a30 am 0935f258: Merge "Updating API based on feedback" into jb-mr2-dev 
* commit '0935f258dc2fd1eeadf9d502abbd1e409f68ac67':
  Updating API based on feedback
 2013-04-19 13:13:18 -07:00
Jason Sams
0935f258dc Merge "Updating API based on feedback" into jb-mr2-dev 2013-04-19 20:09:55 +00:00
Scott Main
14ee0eead6 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
 2013-04-19 13:08:32 -07:00
Scott Main
ef5d6ab55d 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
 2013-04-19 13:08:29 -07:00
Scott Main
a53a44bf16 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
 2013-04-19 13:05:45 -07:00
Scott Main
1e76254d62 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
 2013-04-19 13:05:42 -07:00
Scott Main
80b1663937 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
 2013-04-19 13:03:12 -07:00
Scott Main
3b4f85b715 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
 2013-04-19 13:03:04 -07:00
Scott Main
b20a943a4e 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
 2013-04-19 12:58:54 -07:00
Scott Main
e397020d4d 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
 2013-04-19 12:58:51 -07:00
Jason Sams
f64cca905c 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
 2013-04-19 12:56:37 -07:00
Scott Main
7c0523d099 am 22881a14: am 3ef011d1: am 9ffe5dff: add email links for android branding bug:8666523 
* commit '22881a1479d172f8896ab1707453c9cc16abd986':
  add email links for android branding bug:8666523
 2013-04-19 12:55:35 -07:00
Scott Main
102e9e5adf 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
 2013-04-19 12:55:32 -07:00
Scott Main
22881a1479 am 3ef011d1: am 9ffe5dff: add email links for android branding bug:8666523 
* commit '3ef011d18557d41964bb47b67d5526fc27d30295':
  add email links for android branding bug:8666523
 2013-04-19 12:51:18 -07:00
Scott Main
1b95cc41d0 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
 2013-04-19 12:51:15 -07:00
Irfan Sheriff
4b6909c9ce am d87bb312: am 4a1d9513: Merge "Fix NPE issues seen by CTS" into jb-mr2-dev 
* commit 'd87bb3124659edbc9d63988855f0caaa00817ebd':
  Fix NPE issues seen by CTS
 2013-04-19 12:49:44 -07:00
Amith Yamasani
8dc25e0680 am ba567014: am e37c8f78: Merge "Improve API and documentation" into jb-mr2-dev 
* commit 'ba56701493ede3f5f338a03173da0327a215b223':
  Improve API and documentation
 2013-04-19 12:49:40 -07:00
Carlos Valdivia
3aefa11119 am f2c12911: am 58156b41: Merge "Fix NPE when restarting ChooseTypeAndAccountActiivty." into jb-mr2-dev 
* commit 'f2c12911fb8ef9f40d8e90fe29fef0129edc8553':
  Fix NPE when restarting ChooseTypeAndAccountActiivty.
 2013-04-19 12:49:38 -07:00
Jeff Sharkey
50474f91e3 am dde9559b: am 24b55f25: Merge "Deprecate StatFs methods returning small values." into jb-mr2-dev 
* commit 'dde9559b78a93344ec0b568c2bac7329621de31f':
  Deprecate StatFs methods returning small values.
 2013-04-19 12:49:34 -07:00
Scott Main
3ef011d185 am 9ffe5dff: add email links for android branding bug:8666523 
* commit '9ffe5dff76704dbd64ee101f12f32d07e69f95f4':
  add email links for android branding bug:8666523
 2013-04-19 12:47:29 -07:00
Scott Main
653a00e240 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
 2013-04-19 12:47:26 -07:00
Irfan Sheriff
d87bb31246 am 4a1d9513: Merge "Fix NPE issues seen by CTS" into jb-mr2-dev 
* commit '4a1d95139a57b8726fb168b08a5c54b9a134c8df':
  Fix NPE issues seen by CTS
 2013-04-19 12:47:05 -07:00
Amith Yamasani
ba56701493 am e37c8f78: Merge "Improve API and documentation" into jb-mr2-dev 
* commit 'e37c8f781abb045ec4a0b872e5e6afe48eee021a':
  Improve API and documentation
 2013-04-19 12:47:01 -07:00
Carlos Valdivia
f2c12911fb am 58156b41: Merge "Fix NPE when restarting ChooseTypeAndAccountActiivty." into jb-mr2-dev 
* commit '58156b4123acf92f2a03885136a3b6859801f000':
  Fix NPE when restarting ChooseTypeAndAccountActiivty.
 2013-04-19 12:46:59 -07:00
Jeff Sharkey
dde9559b78 am 24b55f25: Merge "Deprecate StatFs methods returning small values." into jb-mr2-dev 
* commit '24b55f25c18fbed6b5d10ed33ddaab269cf1a01e':
  Deprecate StatFs methods returning small values.
 2013-04-19 12:46:56 -07:00
Irfan Sheriff
4a1d95139a Merge "Fix NPE issues seen by CTS" into jb-mr2-dev 2013-04-19 19:43:46 +00:00
Amith Yamasani
e37c8f781a Merge "Improve API and documentation" into jb-mr2-dev 2013-04-19 19:10:02 +00:00
Amith Yamasani
3b458ad9ee 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
 2013-04-19 12:07:46 -07:00
Scott Main
9ffe5dff76 add email links for android branding 
bug:8666523

Change-Id: Iee2fe78d7b9ab46723cc3407b9a8eede822b359c
 2013-04-19 11:52:35 -07:00
Carlos Valdivia
58156b4123 Merge "Fix NPE when restarting ChooseTypeAndAccountActiivty." into jb-mr2-dev 2013-04-19 18:38:34 +00:00
Jeff Sharkey
24b55f25c1 Merge "Deprecate StatFs methods returning small values." into jb-mr2-dev 2013-04-19 18:21:09 +00:00
Daniel Sandler
8e251dc6da 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.
 2013-04-19 11:10:23 -07:00
Fabrice Di Meglio
789ac6c975 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
 2013-04-19 11:10:20 -07:00
Daniel Sandler
b0efef2f73 am f535c820: Merge "Restore dock home support for car docks." into jb-mr2-dev 
* commit 'f535c820c428d4eefffcb224f2572a9c5b9965ea':
  Restore dock home support for car docks.
 2013-04-19 11:03:31 -07:00
Fabrice Di Meglio
07fedf58dd 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
 2013-04-19 11:03:28 -07:00
Kenny Root
4696f85aad am 78017d2e: am eddb9c89: Merge "Rename API AndroidKey* -> Key*" into jb-mr2-dev 
* commit '78017d2e0fc81d1b07b26b358fe24b9af1d7d490':
  Rename API AndroidKey* -> Key*
 2013-04-19 11:03:21 -07:00
Irfan Sheriff
dd03fcc713 am 68757ef6: am 63e550f2: Merge "Add getters and private constructor" into jb-mr2-dev 
* commit '68757ef6bcee725f983fd4c793d7be11fbdd3cd6':
  Add getters and private constructor
 2013-04-19 11:03:18 -07:00
Fabrice Di Meglio
7ed5180df7 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
 2013-04-19 11:03:15 -07:00
Daniel Sandler
f535c820c4 Merge "Restore dock home support for car docks." into jb-mr2-dev 2013-04-19 18:00:17 +00:00
Kenny Root
78017d2e0f am eddb9c89: Merge "Rename API AndroidKey* -> Key*" into jb-mr2-dev 
* commit 'eddb9c891619c39f459d10b200eddb1f2932c96b':
  Rename API AndroidKey* -> Key*
 2013-04-19 10:59:57 -07:00
Irfan Sheriff
68757ef6bc am 63e550f2: Merge "Add getters and private constructor" into jb-mr2-dev 
* commit '63e550f2026e749e7be5ab03655f0a5105457b9e':
  Add getters and private constructor
 2013-04-19 10:59:54 -07:00
Fabrice Di Meglio
1c6e609b2b 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
 2013-04-19 10:59:51 -07:00
Philip Milne
1027ea4743 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."
 2013-04-19 10:59:43 -07:00
Fabrice Di Meglio
b08aa2354f Merge "Improve fix for bug #8159072 Spinner widget should be RTL'ized" into jb-mr2-dev 2013-04-19 17:58:47 +00:00