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

27377 Commits

Author SHA1 Message Date
Irfan Sheriff
917fc95cac am 314488b7: Merge "Captive check for both mobile and wifi" into jb-mr1-dev 
* commit '314488b791d36756504ee593f818f04b4cd24893':
  Captive check for both mobile and wifi
 2012-09-21 13:32:22 -07:00
Lei Zhang
534a076c81 Fix auto-merger error in I74c0644c6938d28c20c42d88d995ffb56a71d703 
Change-Id: If199aa3f01d1a7ea3f298504c0de4aa9a96e7451
 2012-09-21 12:39:39 -07:00
Jason Simmons
f445a77bf3 resolved conflicts for merge of d053554f to jb-mr1-aah-dev 
Change-Id: I8540083f7fd04e252c8879475f247ea6bbde8159
 2012-09-21 10:38:01 -07:00
Justin Koh
b4641b5cd4 Merge "Converts hover touch events to trackball events" into jb-mr1-aah-dev 2012-09-20 18:04:49 -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
Eric Laurent
c08870e946 am f9fac2c5: Merge "Add multi user volume management" into jb-mr1-dev 
* commit 'f9fac2c5fe3f304ee866b1afc3191d36835e96bd':
  Add multi user volume management
 2012-09-20 12:51:05 -07:00
John Reck
18fc6e8493 am b6610d82: Merge "Fix DPI scaling on TVDPI" into jb-mr1-dev 
* commit 'b6610d8289f5c682a7f66d419afcfbd6541d0367':
  Fix DPI scaling on TVDPI
 2012-09-20 12:50:55 -07:00
Elliott Hughes
3a8b3a85e1 am 3d5be42e: Merge changes I87c2ab9e,I2dafcc34,I731c96c2 into jb-mr1-dev 
* commit '3d5be42eaa35914d9b37fe052fa7222dc1992dc0':
  Fix formatDateRange month names for Farsi.
  Use localized digits for Time formatting.
  Use proper digits in formatElapsedTime and format3339
 2012-09-20 12:50:52 -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
fc850997a8 am 683ab00a: fix underfull content bug in inbox and big text templates. 
* commit '683ab00a2ec2e02f8ad1296efb381aa72d364b57':
  fix underfull content bug in inbox and big text templates.
 2012-09-20 08:42:00 -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
5d514eb468 am e0de5bff: Merge "Fire "dreaming started" and "dreaming stopped" broadcasts." into jb-mr1-dev 
* commit 'e0de5bfff2e74ee566ac2d053052de09aa25e54b':
  Fire "dreaming started" and "dreaming stopped" broadcasts.
 2012-09-20 06:24:20 -07:00
Jeff Brown
cf11e2381a am 925ad51b: Merge "Add support for remembering Wifi display devices." into jb-mr1-dev 
* commit '925ad51bd82b34fa26a462a303781c610e635450':
  Add support for remembering Wifi display devices.
 2012-09-20 06:23:20 -07:00
Jim Miller
3945caec4e am d5d853ec: Merge "Update keyguard selector view to match UX design spec - Use new Roboto-Thin font - Add new keyguard-specific date format - Layout tweaks to keyguard selector screen. - Add smart EmergencyButton class - Add selective upper-casing of components on th 
* commit 'd5d853ec48bc4ad3d6f0ec5cdc20821550cbf3f8':
  Update keyguard selector view to match UX design spec - Use new Roboto-Thin font - Add new keyguard-specific date format - Layout tweaks to keyguard selector screen. - Add smart EmergencyButton class - Add selective upper-casing of components on the display to enable later UX decision - Work around SIM state bug
 2012-09-20 06:23:08 -07:00
Romain Guy
a7dfff1109 am 4c97ef90: Merge "Add support for QCOM_tiled_rendering Bug #7186819" into jb-mr1-dev 
* commit '4c97ef9094f7a52dbc983ed12ce5f3b586f2d769':
  Add support for QCOM_tiled_rendering Bug #7186819
 2012-09-20 06:23:04 -07:00
Jeff Sharkey
ef33caf85a am 4e7b551f: Merge "Move HAS_TRANSIENT_STATE flag into a safe area." into jb-mr1-dev 
* commit '4e7b551fbffa6112821ed6cfeedd6128463fccd0':
  Move HAS_TRANSIENT_STATE flag into a safe area.
 2012-09-20 06:22:39 -07:00
Jeff Sharkey
e3981fa8f3 am c3e3311c: Merge "Migrate network stats from removed users." into jb-mr1-dev 
* commit 'c3e3311c050f47a229e1b49f1fdf685669d79d53':
  Migrate network stats from removed users.
 2012-09-20 06:22:35 -07:00
Christopher Tate
40ccfee497 am c575e007: Merge "setShowGTalkServiceStatus() is deprecated but tested by CTS" into jb-mr1-dev 
* commit 'c575e007e59e00db7c1f3f2b2ea57cc24dd7c2de':
  setShowGTalkServiceStatus() is deprecated but tested by CTS
 2012-09-20 06:22:26 -07:00
John Reck
28aba6e9d4 am 4be07ade: Merge "Revert "Test aggressive throttling"" into jb-mr1-dev 
* commit '4be07ade3658da9345067780520ddbd266900ee4':
  Revert "Test aggressive throttling"
 2012-09-20 06:22:05 -07:00
Jeff Sharkey
4d6ce59c5c am 4046e012: Merge "Migrate UI to supportsMultipleUsers()." into jb-mr1-dev 
* commit '4046e012887fff1f36dfd3eddc6f354d4c2497fc':
  Migrate UI to supportsMultipleUsers().
 2012-09-20 06:21:27 -07:00
Dianne Hackborn
78ca366a7f am 52716deb: Merge "Fix deadlock in LockPatternUtils by using local id." into jb-mr1-dev 
* commit '52716deb4008da1d566dfd711edc0a9c6de5f79f':
  Fix deadlock in LockPatternUtils by using local id.
 2012-09-20 06:20:31 -07:00
Craig Mautner
404dc595e3 am 8f301e66: Merge "Add debug for b/7094175." into jb-mr1-dev 
* commit '8f301e666873e4a9feaace38a0b184a5f3ce7003':
  Add debug for b/7094175.
 2012-09-20 06:20:25 -07:00
Christopher Tate
0d2d123336 am a1c46636: Merge "Disable content observer cross-user permission checks..." into jb-mr1-dev 
* commit 'a1c46636dd533e889e1f3b3326fa0d851928df4f':
  Disable content observer cross-user permission checks...
 2012-09-20 06:20:17 -07:00
Dianne Hackborn
ba78386f79 am 390392ff: Merge "Changes to support side-loading of apps from other users." into jb-mr1-dev 
* commit '390392ff3ef0114544eab3db4093c1c7aba825da':
  Changes to support side-loading of apps from other users.
 2012-09-20 06:20:13 -07:00
Adam Powell
41cb2840e1 am 10bd4106: am baed0a8f: am 56fd88d8: am ab12f0f7: Merge "Implement resolving of icon attributes to resIds in AlertController" 
* commit '10bd4106efc22efd57875a2fb914110475c91856':
  Implement resolving of icon attributes to resIds in AlertController
 2012-09-20 06:20:00 -07:00
Fabrice Di Meglio
db7bb39b4c am 072533e9: Merge "Fix bug #7146516 Padding can be "over" resolved" into jb-mr1-dev 
* commit '072533e934e759b95228ba61152e7d958b641b96':
  Fix bug #7146516 Padding can be "over" resolved
 2012-09-20 06:19:55 -07:00
Fabrice Di Meglio
a84d8ad3ba am efa56852: Merge "Fix some typos in Javadoc for Accessibility APIs" into jb-mr1-dev 
* commit 'efa568525fc7755ac49e44e75246b2be1ef5269f':
  Fix some typos in Javadoc for Accessibility APIs
 2012-09-20 06:19:52 -07:00
Dianne Hackborn
1ed950d0cd am 09ad0832: Merge "Switch to showing top-most thumbnail of recent apps." into jb-mr1-dev 
* commit '09ad0832e0c28fa43a2e2bf53bef87df39bd4416':
  Switch to showing top-most thumbnail of recent apps.
 2012-09-20 06:19:39 -07:00
Jeff Sharkey
ea59a8367e am a490bddc: Merge changes I4513afbd,I20e2194c into jb-mr1-dev 
* commit 'a490bddc8bf0812973dee34ead5c04c87e7ecb15':
  Make getMediaStorageDirectory() user-aware.
  Lockdown should only augment connected networks.
 2012-09-20 06:19:30 -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
Jim Miller
d5d853ec48 Merge "Update keyguard selector view to match UX design spec - Use new Roboto-Thin font - Add new keyguard-specific date format - Layout tweaks to keyguard selector screen. - Add smart EmergencyButton class - Add selective upper-casing of components on the display to enable later UX decision - Work around SIM state bug" into jb-mr1-dev 2012-09-19 21:26:51 -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
Jim Miller
109f1fd80c Update keyguard selector view to match UX design spec 
- Use new Roboto-Thin font
- Add new keyguard-specific date format
- Layout tweaks to keyguard selector screen.
- Add smart EmergencyButton class
- Add selective upper-casing of components on the display to enable later UX decision
- Work around SIM state bug

Bug: 7094419
Change-Id: Ic7e0f30697c14d4946372509d98ad81bf6a23c92
 2012-09-19 20:47:37 -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
Jeff Sharkey
daa57e8d18 Migrate network stats from removed users. 
When a user is removed, migrate all network stats belonging to that
user into special UID_REMOVED bucket.  Also removes those stats from
kernel to avoid double-counting if another user is created.

Bug: 7194784
Change-Id: I03f1d660fe3754566326b7749cae8068fc224ea9
 2012-09-19 14:54:05 -07:00
Jeff Sharkey
4046e01288 Merge "Migrate UI to supportsMultipleUsers()." into jb-mr1-dev 2012-09-19 14:52:34 -07:00