Geremy Condra
d053554f80
Merge "Push dropbox logging into libcore." into jb-mr1-dev
2012-09-20 11:24:14 -07:00
Geremy Condra
f6e24d62b6
Merge "Remove pointless exception supression." into jb-mr1-dev
2012-09-20 11:22:14 -07:00
Eric Laurent
f9fac2c5fe
Merge "Add multi user volume management" into jb-mr1-dev
2012-09-20 11:18:17 -07:00
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
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
93941683c2
am 8908034d: am 95cd451e: Merge "add cleanspec." into jb-mr1-dev
...
* commit '8908034dcea1ae3e2a69d4690fd90dea8ccf6339':
add cleanspec.
2012-09-20 09:35:55 -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
Jason Sams
8908034dce
am 95cd451e: Merge "add cleanspec." into jb-mr1-dev
...
* commit '95cd451ef1b1c7390ec08da730f6bf0b268ed833':
add cleanspec.
2012-09-20 09:24:12 -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
82cab1b51d
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:40:49 -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
Jason Sams
e44050e011
am 9fc94c86: am 8e356e08: Merge "Cleanup blur test, remove deprecated functions." into jb-mr1-dev
...
* commit '9fc94c86de038c3657bd814599ba44b966f560e3':
Cleanup blur test, remove deprecated functions.
2012-09-20 06:18:06 -07:00
Jeff Brown
d6466128a4
am c6493e39: am f803ff4f: Merge "Make wifi display state changes more robust." into jb-mr1-dev
...
* commit 'c6493e39204faab2a1326274f0b927e418339fcc':
Make wifi display state changes more robust.
2012-09-20 06:18:01 -07:00
Baligh Uddin
21196ee44b
am d2812e12: (-s ours) am e02acec9: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit 'd2812e123f7bb593d30d17c2b3b5a51b361e3c20':
Import translations. DO NOT MERGE
2012-09-20 06:17:57 -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
Jim Miller
ea74b79028
am 57f42e85: 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 com
...
* commit '57f42e855038e802c2cea4200a7cd170ea6cbf63':
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:17:49 -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
Baligh Uddin
d2cbbfdc54
am 6073a8aa: (-s ours) am 30ddd69d: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit '6073a8aa8096ac7816ebb8a05a4166deea459db5':
Import translations. DO NOT MERGE
2012-09-20 06:17:31 -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
Kenny Root
e8514f50a6
am 1259f9b1: am 55552094: Merge "Update preloaded-classes for JB-MR1" into jb-mr1-dev
...
* commit '1259f9b12c8db969011b352248925d101c6bd53a':
Update preloaded-classes for JB-MR1
2012-09-20 06:17:21 -07:00
John Spurlock
03b80dc8e9
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:10:37 -07:00
Jason Sams
9fc94c86de
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:10:14 -07:00
Jeff Brown
c6493e3920
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:10:03 -07:00
Baligh Uddin
d2812e123f
am e02acec9: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit 'e02acec9ea52b0f04b891adeb17ad9d5e42f86da':
Import translations. DO NOT MERGE
2012-09-20 06:09:50 -07:00
Jeff Brown
f271c1ecb9
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:09:42 -07:00
Jim Miller
57f42e8550
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:09:30 -07:00
Romain Guy
3c117db2aa
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:09:27 -07:00
Jeff Sharkey
4747d05200
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:09:04 -07:00
Jeff Sharkey
116e0ed0ed
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:09:01 -07:00
Christopher Tate
1d8941b6e4
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:08:45 -07:00
Baligh Uddin
6073a8aa80
am 30ddd69d: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit '30ddd69d07bafc1c9f906cfd176992ebaa58068e':
Import translations. DO NOT MERGE
2012-09-20 06:08:37 -07:00
John Reck
76eac7353e
am 4be07ade: Merge "Revert "Test aggressive throttling"" into jb-mr1-dev
...
* commit '4be07ade3658da9345067780520ddbd266900ee4':
Revert "Test aggressive throttling"
2012-09-20 06:08:17 -07:00
Jeff Sharkey
4cebb2da15
am 4046e012: Merge "Migrate UI to supportsMultipleUsers()." into jb-mr1-dev
...
* commit '4046e012887fff1f36dfd3eddc6f354d4c2497fc':
Migrate UI to supportsMultipleUsers().
2012-09-20 06:07:37 -07:00
Kenny Root
1259f9b12c
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:07:05 -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
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