Zhihai Xu
a3ae439425
ISSUE 6849488 Bluedroid stack, remove system/bluetooth.
...
remove system/bluetooth stuff.
bug 6849488
Change-Id: I9ea87c9cd60d5ecfa0d58d28301554e716cd2893
2012-09-20 10:47:06 -07:00
Geremy Condra
4dd3c37970
Merge "Remove logging for old version mismatches." into jb-mr1-dev
2012-09-20 10:33:03 -07:00
Baligh Uddin
2bdc3ca533
Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
2012-09-20 10:24:37 -07:00
John Reck
b6610d8289
Merge "Fix DPI scaling on TVDPI" into jb-mr1-dev
2012-09-20 10:21:41 -07:00
Wink Saville
a12a7b3d3d
Suppress location information for non-active users.
...
Specifically, don't allow call backs for LISTEN_CELL_LOCATION and
LISTEN_CELL_INFO.
Bug: 7087342
Change-Id: Ida7f60b5bde3f28264dcb454b38fcfb1f1616d11
2012-09-20 10:09:45 -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
Stephen Hines
5ca88a103c
Merge "Add tests for pass-by-value kernels." into jb-mr1-dev
2012-09-20 09:55:25 -07:00
Jason Sams
6205af4cfa
am 95cd451e: Merge "add cleanspec." into jb-mr1-dev
...
* commit '95cd451ef1b1c7390ec08da730f6bf0b268ed833':
add cleanspec.
2012-09-20 09:26:28 -07:00
Jason Sams
95cd451ef1
Merge "add cleanspec." into jb-mr1-dev
2012-09-20 09:21:39 -07:00
Jason Sams
1dd273a7df
add cleanspec.
...
Change-Id: I5aa58efa7c48809d1f05c8ad48332508597b9869
2012-09-20 09:12:43 -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
Jason Sams
3009f0f616
am 8e356e08: Merge "Cleanup blur test, remove deprecated functions." into jb-mr1-dev
...
* commit '8e356e089d4b9cf1cd0f31ceead666f8e75d4c28':
Cleanup blur test, remove deprecated functions.
2012-09-20 06:23:51 -07:00
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
John Spurlock
e0de5bfff2
Merge "Fire "dreaming started" and "dreaming stopped" broadcasts." into jb-mr1-dev
2012-09-20 05:45:54 -07:00
Geremy Condra
350bb15ac7
Remove pointless exception supression.
...
Bug: 7198235
Change-Id: I3371403a79fd3e01d46678d58129d36eb921d10a
2012-09-20 01:40:03 -07:00
Jason Sams
8e356e089d
Merge "Cleanup blur test, remove deprecated functions." into jb-mr1-dev
2012-09-20 01:09:49 -07:00
Jason Sams
97e9ee2ea8
Cleanup blur test, remove deprecated functions.
...
Change-Id: I4136110692fdba8a644806fe8c92bfaacc930ca6
2012-09-20 01:07:35 -07:00
Jim Miller
48b9b0d068
Make DPM API for disabling keyguard widgets more generic
...
This change renames the widget-specific API to be more generic
to allow further disabling of keyguard-specific customizations
in the future. Currently only allows disabling widgets and the
secure camera but can now easily be extended to disable other
features we add.
Fixes bug: 7021368
Change-Id: I3934cc2e7c64e0c6d511efb86980fc38a849708d
2012-09-19 23:44:45 -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