Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
87,245 Commits 3 Branches 0 Tags
53cfedca958ccc24dfd003e381a11f720a8e3402
Commit Graph

25582 Commits

Author SHA1 Message Date
Dianne Hackborn
53cfedca95 am f8171e22: am e6f63800: Merge "Fix issue #7196015: system_server deadlock during setup wizard" into jb-mr1-dev 
* commit 'f8171e229bb3036e762bc8545c99e31e1cbfef3b':
  Fix issue #7196015: system_server deadlock during setup wizard
 2012-09-20 15:46:17 -07:00
Dianne Hackborn
e6f6380027 Merge "Fix issue #7196015: system_server deadlock during setup wizard" into jb-mr1-dev 2012-09-20 14:33:50 -07:00
Irfan Sheriff
b42fb03b79 am 6c0fcc96: am 314488b7: Merge "Captive check for both mobile and wifi" into jb-mr1-dev 
* commit '6c0fcc961e1650113947918dc105c2a459ebf40d':
  Captive check for both mobile and wifi
 2012-09-20 13:39:30 -07:00
Irfan Sheriff
314488b791 Merge "Captive check for both mobile and wifi" into jb-mr1-dev 2012-09-20 13:33:52 -07:00
Geremy Condra
d25ce3a8a7 am 50caa25a: am d053554f: Merge "Push dropbox logging into libcore." into jb-mr1-dev 
* commit '50caa25a53efaa6f9338064436599945d6d8d616':
  Push dropbox logging into libcore.
 2012-09-20 13:01:03 -07:00
Eric Laurent
2bb7e677b6 am 13bd3ed4: am f9fac2c5: Merge "Add multi user volume management" into jb-mr1-dev 
* commit '13bd3ed4796fae13f0daaa8ce062fdd8effec737':
  Add multi user volume management
 2012-09-20 13:00:55 -07:00
John Reck
91249ce452 am cfe353ba: am b6610d82: Merge "Fix DPI scaling on TVDPI" into jb-mr1-dev 
* commit 'cfe353bad0e5daed9f2166ce37973f2a6b3d9c54':
  Fix DPI scaling on TVDPI
 2012-09-20 13:00:47 -07:00
Elliott Hughes
dbd0abd6f9 am ce14f217: am 3d5be42e: Merge changes I87c2ab9e,I2dafcc34,I731c96c2 into jb-mr1-dev 
* commit 'ce14f2176028108b649b3b068ac1275b81287b21':
  Fix formatDateRange month names for Farsi.
  Use localized digits for Time formatting.
  Use proper digits in formatElapsedTime and format3339
 2012-09-20 13:00:44 -07:00
Irfan Sheriff
9538bdd3c7 Captive check for both mobile and wifi 
Bug: 7113195
Bug: 7102238
Bug: 7087564

Change-Id: Iac08db9de3935338ad498aa3983d2ca82057dda1
 2012-09-20 12:13:06 -07:00
Geremy Condra
d053554f80 Merge "Push dropbox logging into libcore." into jb-mr1-dev 2012-09-20 11:24:14 -07:00
Eric Laurent
f9fac2c5fe Merge "Add multi user volume management" into jb-mr1-dev 2012-09-20 11:18:17 -07:00
John Reck
b6610d8289 Merge "Fix DPI scaling on TVDPI" into jb-mr1-dev 2012-09-20 10:21:41 -07:00
Elliott Hughes
3d5be42eaa Merge changes I87c2ab9e,I2dafcc34,I731c96c2 into jb-mr1-dev 
* changes:
  Fix formatDateRange month names for Farsi.
  Use localized digits for Time formatting.
  Use proper digits in formatElapsedTime and format3339
 2012-09-20 10:05:44 -07:00
Chris Wren
bddf715092 am 82cab1b5: am 683ab00a: fix underfull content bug in inbox and big text templates. 
* commit '82cab1b51d8e05e358951cf457da51af3fe69afc':
  fix underfull content bug in inbox and big text templates.
 2012-09-20 09:35:40 -07:00
Chris Wren
683ab00a2e fix underfull content bug in inbox and big text templates. 
Bug: 7172721
Change-Id: I22019009eec31ca18b54eec5f6ed5b626cee1540
 2012-09-20 10:54:40 -04:00
John Spurlock
1b03ae850c am 03b80dc8: am e0de5bff: Merge "Fire "dreaming started" and "dreaming stopped" broadcasts." into jb-mr1-dev 
* commit '03b80dc8e914f1651ea60f7b6172e8293ac765c5':
  Fire "dreaming started" and "dreaming stopped" broadcasts.
 2012-09-20 06:18:10 -07:00
Jeff Brown
3e41fefa84 am f271c1ec: am 925ad51b: Merge "Add support for remembering Wifi display devices." into jb-mr1-dev 
* commit 'f271c1ecb9fab2c62f1461026b5c4f7a7152140b':
  Add support for remembering Wifi display devices.
 2012-09-20 06:17:53 -07:00
Romain Guy
f53b3cfa0c am 3c117db2: am 4c97ef90: Merge "Add support for QCOM_tiled_rendering Bug #7186819" into jb-mr1-dev 
* commit '3c117db2aaac083a2802b62bb8ce15f87cd788c2':
  Add support for QCOM_tiled_rendering Bug #7186819
 2012-09-20 06:17:46 -07:00
Jeff Sharkey
7e5b586a26 am 4747d052: am 4e7b551f: Merge "Move HAS_TRANSIENT_STATE flag into a safe area." into jb-mr1-dev 
* commit '4747d0520035dab151e71d839fee898c3f8dd8ae':
  Move HAS_TRANSIENT_STATE flag into a safe area.
 2012-09-20 06:17:42 -07:00
Jeff Sharkey
9424b68a5e am 116e0ed0: am c3e3311c: Merge "Migrate network stats from removed users." into jb-mr1-dev 
* commit '116e0ed0ed1fee530f32932be7145d64316dce9b':
  Migrate network stats from removed users.
 2012-09-20 06:17:38 -07:00
Christopher Tate
eb8a3c3638 am 1d8941b6: am c575e007: Merge "setShowGTalkServiceStatus() is deprecated but tested by CTS" into jb-mr1-dev 
* commit '1d8941b6e4bf21d9fbbf2a1b62cb657ce52b51ea':
  setShowGTalkServiceStatus() is deprecated but tested by CTS
 2012-09-20 06:17:35 -07:00
John Reck
6ec3d51280 am 76eac735: am 4be07ade: Merge "Revert "Test aggressive throttling"" into jb-mr1-dev 
* commit '76eac7353edc30fa7b09da2bfd89eadf04af14bc':
  Revert "Test aggressive throttling"
 2012-09-20 06:17:28 -07:00
Jeff Sharkey
b017b04b64 am 4cebb2da: am 4046e012: Merge "Migrate UI to supportsMultipleUsers()." into jb-mr1-dev 
* commit '4cebb2da151d820bc889d94e1d5797d9f33e60cc':
  Migrate UI to supportsMultipleUsers().
 2012-09-20 06:17:24 -07:00
Chet Haase
971405797f Handle requestLayout() calls during layout 
Calling requestLayout() during a layout pass is inadvisable, but
happens often enough in applications (especially when it occurs in
very indirect means that the application may not easily be able to
control) that we need to handle the situation without breaking. In particular,
applications that have run across this problem have had artifacts which are
difficult to debug (like things just not showing up on the screen) and
also difficult to fix. One of the side-effects of the problem is that it
leaves the view hiearchy in an unpredictable state where some views have
requested layout and are waiting to be layed out while the root view has
not received those requests, so it is never calling layout on those views.

The fix is to try to do the 'right' thing, while avoiding getting into
an inifinite loop (which could result from calling layout, which calls requestLayout(),
which causes another layout, which ...). The solution is two-tier: we handle
all requests that happen during layout by delaying them until after the current
layout is done. We then process those requests and call layout again.
If we receive more requests during that second layout, we post them to the
next frame, to allow us to finish the current one.

Issue #7155974 handle requestLayout() during layout more robustly

Change-Id: I9d13c405be28a19c86add22210e69817ddddaf8b
 2012-09-20 06:05:05 -07:00
John Spurlock
e0de5bfff2 Merge "Fire "dreaming started" and "dreaming stopped" broadcasts." into jb-mr1-dev 2012-09-20 05:45:54 -07:00
Jeff Brown
925ad51bd8 Merge "Add support for remembering Wifi display devices." into jb-mr1-dev 2012-09-19 22:14:02 -07:00
Jeff Brown
89d5546d7f Add support for remembering Wifi display devices. 
Add a setting to globally disable Wifi display.

Fixed a bug where the wifi display broadcast receiver
was running on the wrong thread.

Removed the wifi-display QuickSettings dialog, all functionality
has been moved to Settings.

Bug: 7178216
Bug: 7192799
Change-Id: I9796baac8245d664cf28fa147b9ed978d81d8ab9
 2012-09-19 22:04:44 -07:00
Geremy Condra
b7faaf4c40 Push dropbox logging into libcore. 
Change-Id: I74c0644c6938d28c20c42d88d995ffb56a71d703
 2012-09-19 21:39:55 -07:00
Romain Guy
4c97ef9094 Merge "Add support for QCOM_tiled_rendering Bug #7186819" into jb-mr1-dev 2012-09-19 21:12:19 -07:00
Romain Guy
2b7028eaba Add support for QCOM_tiled_rendering 
Bug #7186819

This optional OpenGL extension can be used by tiled renderers to optimize
copies from main memory to tiles memory.

Change-Id: Id4a5d64e61ad17f50e773e8104b9bf584bb65077
 2012-09-19 21:10:09 -07:00
Jeff Sharkey
4e7b551fbf Merge "Move HAS_TRANSIENT_STATE flag into a safe area." into jb-mr1-dev 2012-09-19 19:16:24 -07:00
Jeff Sharkey
36901b6c60 Move HAS_TRANSIENT_STATE flag into a safe area. 
Previously, this flag conflicted with other text direction flags,
which can cause weird interactions across the View hierarchy,
specifically with ListView.

Also adds dumpFlags() utility to dump values of all know flags for
documentation and sanity checking.

Bug: 7189738
Change-Id: Iceb2f93f68a800e19a5889ced93abcce4932b067
 2012-09-19 19:07:34 -07:00
Jeff Sharkey
c3e3311c05 Merge "Migrate network stats from removed users." into jb-mr1-dev 2012-09-19 18:58:07 -07:00
Christopher Tate
c575e007e5 Merge "setShowGTalkServiceStatus() is deprecated but tested by CTS" into jb-mr1-dev 2012-09-19 18:35:08 -07:00
John Reck
6013d8c25b Fix DPI scaling on TVDPI 
Bug: 6891214
 tvdpi has a density of 1.3312501 which we fail on as we assume
 you can take density and multiply by 100, cast to an int, and
 divide by 100f to get back to the original density. Force this
 assumption to be true by truncating density

Change-Id: I0caeb7768ee002f935b41c77a5579ffeed491f82
 2012-09-19 18:33:38 -07:00
Christopher Tate
c8c083862f setShowGTalkServiceStatus() is deprecated but tested by CTS 
So its implementation has to hang around on that basis.

Bug 7164713

Change-Id: Ibb59932b3b6d275d8ac8e091774b08256a258db1
 2012-09-19 17:18:18 -07:00
John Reck
4be07ade36 Merge "Revert "Test aggressive throttling"" into jb-mr1-dev 2012-09-19 17:06:50 -07:00
Dianne Hackborn
73c14161ec Fix issue #7196015: system_server deadlock during setup wizard 
Can't aquire the providers lock while holding the main activity thead
lock, because we call into the activity manager with that lock held.

Change-Id: If27326a2caa46480d0f1b98608be9e8a862febe0
 2012-09-19 16:46:54 -07:00
Dianne Hackborn
4786223a08 am 7788b759: am 52716deb: Merge "Fix deadlock in LockPatternUtils by using local id." into jb-mr1-dev 
* commit '7788b759726f4c3c004075ac5c5977f6e4c82fe0':
  Fix deadlock in LockPatternUtils by using local id.
 2012-09-19 15:21:35 -07:00
Craig Mautner
b74d9f8285 am 18f42668: am 8f301e66: Merge "Add debug for b/7094175." into jb-mr1-dev 
* commit '18f42668e44edf75f4cbf096966943b4a1b267b2':
  Add debug for b/7094175.
 2012-09-19 15:21:31 -07:00
Christopher Tate
7d295bdae4 am 43b69c75: am a1c46636: Merge "Disable content observer cross-user permission checks..." into jb-mr1-dev 
* commit '43b69c7580169851ef1fe84af23674ed3b54ca1a':
  Disable content observer cross-user permission checks...
 2012-09-19 15:21:28 -07:00
Dianne Hackborn
1a30458a0b am a553eeaf: am 390392ff: Merge "Changes to support side-loading of apps from other users." into jb-mr1-dev 
* commit 'a553eeaf877457cdacceb401529201a40223e64c':
  Changes to support side-loading of apps from other users.
 2012-09-19 15:21:17 -07:00
Fabrice Di Meglio
6f7f916ae6 am d02341d0: am 072533e9: Merge "Fix bug #7146516 Padding can be "over" resolved" into jb-mr1-dev 
* commit 'd02341d0bd4a7a36bc7b9c991ed47d6f98a756ee':
  Fix bug #7146516 Padding can be "over" resolved
 2012-09-19 15:21:00 -07:00
Fabrice Di Meglio
ea19ae20db am eebe7df2: am efa56852: Merge "Fix some typos in Javadoc for Accessibility APIs" into jb-mr1-dev 
* commit 'eebe7df2a37520bc97f9fc8025827d46fb22b32b':
  Fix some typos in Javadoc for Accessibility APIs
 2012-09-19 15:20:57 -07:00
Dianne Hackborn
79c8c7a4ff am 9b4d528d: am 09ad0832: Merge "Switch to showing top-most thumbnail of recent apps." into jb-mr1-dev 
* commit '9b4d528d7edf3d55a925b79ab7ba7664a9cb7a5e':
  Switch to showing top-most thumbnail of recent apps.
 2012-09-19 15:20:41 -07:00
Jeff Sharkey
d3800acea5 am f40a2ba1: am a490bddc: Merge changes I4513afbd,I20e2194c into jb-mr1-dev 
* commit 'f40a2ba1469304b44097d40c526f1bc9500ded93':
  Make getMediaStorageDirectory() user-aware.
  Lockdown should only augment connected networks.
 2012-09-19 15:20:32 -07:00
Narayan Kamath
ec0e97fe7a am 40c5a7a6: am 5d1a870a: Merge "Add APIs to enable SNI and session tickets on sockets." into jb-mr1-dev 
* commit '40c5a7a6e14447bbe66e6daeca7e992bcf200012':
  Add APIs to enable SNI and session tickets on sockets.
 2012-09-19 15:19:38 -07:00
Irfan Sheriff
6ad0da54a8 am 74f4997c: am 5d4206a5: Merge "Get strings in" into jb-mr1-dev 
* commit '74f4997ca467bda930e1c270f82731e66666999c':
  Get strings in
 2012-09-19 15:19:08 -07:00
Amith Yamasani
dc5b1dd508 am 728f3193: am 4adb9d34: Merge "DevicePolicyManager per user" into jb-mr1-dev 
* commit '728f3193efbdacc81442f7cdcfc49d3c8804e5ee':
  DevicePolicyManager per user
 2012-09-19 15:18:46 -07:00
Adam Powell
5b76cede6b am 3179154c: am 98c370e7: Merge "Make invalidateOptionsMenu asynchronous" into jb-mr1-dev 
* commit '3179154c367ace1deb56340a641a7ebc53ba5e82':
  Make invalidateOptionsMenu asynchronous
 2012-09-19 15:18:17 -07:00