Jeff Brown
e108978db5
am f803ff4f: Merge "Make wifi display state changes more robust." into jb-mr1-dev
...
* commit 'f803ff4f743f63dbbb9382d1e1ef7adc25a88e24':
Make wifi display state changes more robust.
2012-09-20 06:23:43 -07:00
Baligh Uddin
fa5c67d601
am e02acec9: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit 'e02acec9ea52b0f04b891adeb17ad9d5e42f86da':
Import translations. DO NOT MERGE
2012-09-20 06:23:27 -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
Baligh Uddin
819898df2d
am 30ddd69d: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit '30ddd69d07bafc1c9f906cfd176992ebaa58068e':
Import translations. DO NOT MERGE
2012-09-20 06:22:21 -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
Kenny Root
0b4160f3a5
am 55552094: Merge "Update preloaded-classes for JB-MR1" into jb-mr1-dev
...
* commit '55552094a25dd737dc24be94eb0fe5ed0397fcdb':
Update preloaded-classes for JB-MR1
2012-09-20 06:21:02 -07:00
Craig Mautner
86a14de364
am 6704a48b: Merge "Fixes to Starting window and Wallpaper windows." into jb-mr1-dev
...
* commit '6704a48bd06f01d2933f83e9b5eda4ed9846bab7':
Fixes to Starting window and Wallpaper windows.
2012-09-20 06:20:35 -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
Baligh Uddin
cd357b2f87
am f8d618cb: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit 'f8d618cb6e634c158efbbf93dad74edd3090559c':
Import translations. DO NOT MERGE
2012-09-20 06:20:08 -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
Raph Levien
f92f4e2d20
am d79dd344: Merge "Add Roboto Thin and Thin Italic fonts, as sans-serif-thin family" into jb-mr1-dev
...
* commit 'd79dd34482b7a9252485c28ff17aede669f70986':
Add Roboto Thin and Thin Italic fonts, as sans-serif-thin family
2012-09-20 06:19:44 -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
Scott Main
f71e3bde5d
am 5580005c: am 9198495b: am 19a39686: am b79d8ecc: udpate media formats for JB
...
* commit '5580005cc7f333e15326b219a0ff06b7c6eca529':
udpate media formats for JB
2012-09-20 06:19:34 -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
Glenn Kasten
a917eb5cc3
am 549be8be: Merge "New API for querying audio properties" into jb-mr1-dev
...
* commit '549be8beadf5ad2a56b7f4269d419753c0d61be8':
New API for querying audio properties
2012-09-20 06:19:24 -07:00
Baligh Uddin
08e354cc7c
am 7b6ec1f6: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit '7b6ec1f6fd4f2858063d2d441b6118ac22da5569':
Import translations. DO NOT MERGE
2012-09-20 06:18:56 -07:00
Jeff Brown
f803ff4f74
Merge "Make wifi display state changes more robust." into jb-mr1-dev
2012-09-19 23:21:18 -07:00
Jeff Brown
c2b9ea6241
Make wifi display state changes more robust.
...
Bug: 7178216
Change-Id: Icceaeb61730b0b4916cdda44459f4c69553e303c
2012-09-19 23:15:26 -07:00
Baligh Uddin
e02acec9ea
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
2012-09-19 22:41:42 -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
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
Baligh Uddin
30ddd69d07
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
2012-09-19 18:18:54 -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
Baligh Uddin
c8d33ad10e
Import translations. DO NOT MERGE
...
Change-Id: If5bb36909e7536aedb40b72ba0899568dce7264c
Auto-generated-cl: translation import
2012-09-19 16:23:58 -07:00
Baligh Uddin
05cf18e13b
Import translations. DO NOT MERGE
...
Change-Id: I23706cb8f364984ad92ab1ce927b108539c141c6
Auto-generated-cl: translation import
2012-09-19 16:23:03 -07:00
Baligh Uddin
fcccd49ff9
Import translations. DO NOT MERGE
...
Change-Id: I2a8401dcaf19e39bbaedc95071b33c3fc06a3d88
Auto-generated-cl: translation import
2012-09-19 15:52:51 -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
Kenny Root
55552094a2
Merge "Update preloaded-classes for JB-MR1" into jb-mr1-dev
2012-09-19 14:32:21 -07:00
John Reck
55bc7efaf9
Revert "Test aggressive throttling"
...
Bug: 7182109
This reverts commit c7c85b34dad5ee722bd9f14318c1e0e4237d529e.
Change-Id: Ibc8837b97450ec6e77a0e9dd509280ff780bb22b
2012-09-19 14:26:48 -07:00