Svetoslav Ganov
a7f38925f7
am d3e5180f: am d07fa6e0: Merge "Prevent out of range magnification scale to be persisted." into jb-mr1-dev
...
* commit 'd3e5180f7cec9df97e983f228aa753efcd193013':
Prevent out of range magnification scale to be persisted.
2012-10-11 17:11:37 -07:00
Jeff Sharkey
e0fec43459
am 1cf5bd2a: am 26e3f3df: Merge "Database cleanup needs to happen for all users." into jb-mr1-dev
...
* commit '1cf5bd2aeb983e09e7e4b664b1380c30b94b4d50':
Database cleanup needs to happen for all users.
2012-10-11 17:11:19 -07:00
Adam Cohen
6879426372
am 2514cbc2: am e60cdf12: Merge "Final keyguard tablet layout integration" into jb-mr1-dev
...
* commit '2514cbc218923cb5e2270ebd9be19d2c9aad356e':
Final keyguard tablet layout integration
2012-10-11 17:11:13 -07:00
Svetoslav Ganov
0294214519
am a1489d30: am 9aefa145: Merge "Send accessibility event for content change upon setting content description." into jb-mr1-dev
...
* commit 'a1489d302289e92e7135452db3fee446e2452535':
Send accessibility event for content change upon setting content description.
2012-10-11 17:11:09 -07:00
Daniel Sandler
8c17d23e41
am 09a4a4c2: am 092ad66a: Merge changes Ic860de75,I8b2d6c7a into jb-mr1-dev
...
* commit '09a4a4c29c42ddb7c515a10911db108f77de2e0c':
Remove notification/quicksettings explanation cling.
Remove the double-swipe to access quick settings on phones.
2012-10-11 17:11:02 -07:00
Dianne Hackborn
fc31380adf
am ff363aa9: am 2a3e1ffd: Merge "More on issue #7318666 : hide developer options from user build" into jb-mr1-dev
...
* commit 'ff363aa967749803cd2e6cf598d4bfaae397a1bb':
More on issue #7318666 : hide developer options from user build
2012-10-11 17:10:54 -07:00
Satoshi Kataoka
95189b9225
am 6a1d4b99: am 8e767115: Merge "Don\'t update the text services locale in the main thread" into jb-mr1-dev
...
* commit '6a1d4b998cb543093b99dcabffaf849686eea656':
Don't update the text services locale in the main thread
2012-10-11 17:10:50 -07:00
Baligh Uddin
31f3d527ba
am bcace62f: am 524dcb7e: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit 'bcace62f72efa7dd1722b86837af2399c9507beb':
Import translations. DO NOT MERGE
2012-10-11 17:10:38 -07:00
Svetoslav Ganov
d3e5180f7c
am d07fa6e0: Merge "Prevent out of range magnification scale to be persisted." into jb-mr1-dev
...
* commit 'd07fa6e0dc8141e5e77ffec6863f81a246bf8384':
Prevent out of range magnification scale to be persisted.
2012-10-11 11:39:36 -07:00
Svetoslav Ganov
d07fa6e0dc
Merge "Prevent out of range magnification scale to be persisted." into jb-mr1-dev
2012-10-11 11:37:33 -07:00
Svetoslav Ganov
ee44fae196
Prevent out of range magnification scale to be persisted.
...
1. If a bad magnification scale is persisted, i.e. it is
not between the min and max, the screen magnifier gets
into a bad state which even a reboot does not fix since
the scale is persisted in settings.
This change ensures that only valid scales are presisted.
In general a bad value should not be attempted to be
persisted but at this point this is the safest change.
bug:7288239
Change-Id: I3e9c7c091772fa64128ab8403c2127ce65cb94b8
2012-10-11 11:17:56 -07:00
Jeff Sharkey
1cf5bd2aeb
am 26e3f3df: Merge "Database cleanup needs to happen for all users." into jb-mr1-dev
...
* commit '26e3f3df8761ee3c75155ca848d29cfe820a2a8c':
Database cleanup needs to happen for all users.
2012-10-11 11:15:33 -07:00
Jeff Sharkey
26e3f3df87
Merge "Database cleanup needs to happen for all users." into jb-mr1-dev
2012-10-11 11:13:30 -07:00
Adam Cohen
2514cbc218
am e60cdf12: Merge "Final keyguard tablet layout integration" into jb-mr1-dev
...
* commit 'e60cdf1291ba01400f7d864ee3501a6762e516bd':
Final keyguard tablet layout integration
2012-10-11 11:10:16 -07:00
Adam Cohen
e60cdf1291
Merge "Final keyguard tablet layout integration" into jb-mr1-dev
2012-10-11 11:08:19 -07:00
Jeff Sharkey
8f55d11298
Database cleanup needs to happen for all users.
...
Bug: 6970084
Change-Id: I9a6f1cbaf095b245ec9707a90c518256e0aa1f5f
2012-10-11 11:00:28 -07:00
Svetoslav Ganov
a1489d3022
am 9aefa145: Merge "Send accessibility event for content change upon setting content description." into jb-mr1-dev
...
* commit '9aefa1457967b52f1865173aa70896db84f111f1':
Send accessibility event for content change upon setting content description.
2012-10-11 11:00:26 -07:00
Svetoslav Ganov
9aefa14579
Merge "Send accessibility event for content change upon setting content description." into jb-mr1-dev
2012-10-11 10:57:41 -07:00
Daniel Sandler
09a4a4c29c
am 092ad66a: Merge changes Ic860de75,I8b2d6c7a into jb-mr1-dev
...
* commit '092ad66a571d95cad20003daeac4c1119352b854':
Remove notification/quicksettings explanation cling.
Remove the double-swipe to access quick settings on phones.
2012-10-11 10:49:43 -07:00
Daniel Sandler
092ad66a57
Merge changes Ic860de75,I8b2d6c7a into jb-mr1-dev
...
* changes:
Remove notification/quicksettings explanation cling.
Remove the double-swipe to access quick settings on phones.
2012-10-11 10:47:12 -07:00
Dianne Hackborn
ff363aa967
am 2a3e1ffd: Merge "More on issue #7318666 : hide developer options from user build" into jb-mr1-dev
...
* commit '2a3e1ffd0f1c369a39f5321a54206d36beab31b9':
More on issue #7318666 : hide developer options from user build
2012-10-11 10:46:34 -07:00
Satoshi Kataoka
6a1d4b998c
am 8e767115: Merge "Don\'t update the text services locale in the main thread" into jb-mr1-dev
...
* commit '8e767115a888b78c5732fe935bd811a7db6bf2e1':
Don't update the text services locale in the main thread
2012-10-11 10:44:55 -07:00
Dianne Hackborn
2a3e1ffd0f
Merge "More on issue #7318666 : hide developer options from user build" into jb-mr1-dev
2012-10-11 10:44:37 -07:00
Satoshi Kataoka
8e767115a8
Merge "Don't update the text services locale in the main thread" into jb-mr1-dev
2012-10-11 10:42:32 -07:00
Baligh Uddin
bcace62f72
am 524dcb7e: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit '524dcb7e5ef636856a67ff0345475a6975a2ca0b':
Import translations. DO NOT MERGE
2012-10-11 10:23:02 -07:00
Baligh Uddin
524dcb7e5e
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
2012-10-11 10:20:03 -07:00
Daniel Sandler
ace0bd7743
Remove notification/quicksettings explanation cling.
...
Bug: 7319756
Change-Id: Ic860de7579079596d0e4c3412cf0fa1ccaadc3e1
2012-10-11 09:56:45 -07:00
Daniel Sandler
efb0faf1c0
Remove the double-swipe to access quick settings on phones.
...
On the plus side, the settings button is back!
Now that we have two buttons on the right-hand side it's
more important than ever that the notification panel header
not allow errant taps to go all the way back to the
notification panel, where they will drag/close it.
Bug: 7319756 // remove double-swipe
Bug: 7217201 // finally make the notification header black
Change-Id: I8b2d6c7a7cfaaed2bfbcd61fb45db9f234cb002d
2012-10-11 09:56:42 -07:00
Satoshi Kataoka
1eac6b7b05
Don't update the text services locale in the main thread
...
This is a revised version of I9f8a81d3c9261a6cfc00292b9f5cb06053b9112d
Bug: 6761326
Change-Id: I43a0a65df6e4b6941bd0dca548c4af20b7e5bf58
2012-10-12 00:58:24 +09:00
Chet Haase
9c6bfbee66
am 0a3f299c: am e1f4ebf5: Merge "Cache wallpaper bitmap to avoid re-loading on rotation" into jb-mr1-dev
...
* commit '0a3f299cf0dc730231b41c02504dd7ae696f1793':
Cache wallpaper bitmap to avoid re-loading on rotation
2012-10-11 08:10:37 -07:00
Chet Haase
0a3f299cf0
am e1f4ebf5: Merge "Cache wallpaper bitmap to avoid re-loading on rotation" into jb-mr1-dev
...
* commit 'e1f4ebf559f7ddbfe19ea9a1823a62f3d8b80d71':
Cache wallpaper bitmap to avoid re-loading on rotation
2012-10-11 08:08:17 -07:00
The Android Open Source Project
964fcb4dc4
Reconcile with jb-mr1-release - do not merge
...
Change-Id: I17a9a881e9530c395b6cafe0997802ade234c969
2012-10-11 08:04:44 -07:00
Chet Haase
e1f4ebf559
Merge "Cache wallpaper bitmap to avoid re-loading on rotation" into jb-mr1-dev
2012-10-11 08:03:04 -07:00
The Android Automerger
454775c92e
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-10-11 07:03:48 -07:00
The Android Open Source Project
4c6176324a
Reconcile with jb-mr1-release - do not merge
...
Change-Id: I1e6cc141f54c37a83b66720ef61af18696a32a6a
2012-10-11 05:57:10 -07:00
Matthew Xie
1c1b02a134
am d8481f96: am a517de36: Donot reset mEnable flag when binding timeout.
...
* commit 'd8481f9665d9073ae739729b8c931a323c6f8f62':
Donot reset mEnable flag when binding timeout.
2012-10-11 01:49:01 -07:00
Matthew Xie
d8481f9665
am a517de36: Donot reset mEnable flag when binding timeout.
...
* commit 'a517de36c44ab8cad5a267315aedf940aefa44cb':
Donot reset mEnable flag when binding timeout.
2012-10-11 01:45:50 -07:00
Matthew Xie
a517de36c4
Donot reset mEnable flag when binding timeout.
...
During start up, binding could take a while. When binding timeout
only reset mBinding but not mEnable.
bug 7328147
Change-Id: I306a84ca53d9e1d05111395642626e68d19e9663
2012-10-11 01:29:02 -07:00
Jeff Brown
aabf7a5940
am d2d7d5c8: am 60fa4617: Merge changes I50eb7dcf,I7ae92ce1,Icb22db1c into jb-mr1-dev
...
* commit 'd2d7d5c8903c7fd6078b16492ee7b21347fce5f2':
Don't enable input dispatch until the screen is visible.
Dejank electron beam.
Don't process UEvents in Dalvik unless they match a pattern.
2012-10-11 00:15:57 -07:00
Jeff Brown
035a0521de
am 51d5a04e: am 3c0081b0: Merge "Use exactly the same timings for the ElectronBeam as JB." into jb-mr1-dev
...
* commit '51d5a04e3da16ac71895e933cc390ea64ec06fcc':
Use exactly the same timings for the ElectronBeam as JB.
2012-10-11 00:15:54 -07:00
Daniel Sandler
3f8037b426
am cd70a4c2: am 6918d9f9: Merge "Remove Dream windows immediately." into jb-mr1-dev
...
* commit 'cd70a4c23cdb9cb318a4b90f3f6c986ba59e979d':
Remove Dream windows immediately.
2012-10-11 00:15:51 -07:00
Daniel Sandler
0f60eddf4f
am 5f9cd5e6: am 6c179ad8: Merge "Dismiss keyguard for brightness QS tile." into jb-mr1-dev
...
* commit '5f9cd5e68a3fb62fa86e36a1cc81cfbb2339a477':
Dismiss keyguard for brightness QS tile.
2012-10-11 00:15:47 -07:00
Jeff Brown
d2d7d5c890
am 60fa4617: Merge changes I50eb7dcf,I7ae92ce1,Icb22db1c into jb-mr1-dev
...
* commit '60fa4617bc4be292a9e0ae10cf259153dec07aa9':
Don't enable input dispatch until the screen is visible.
Dejank electron beam.
Don't process UEvents in Dalvik unless they match a pattern.
2012-10-10 23:26:05 -07:00
Jeff Brown
51d5a04e3d
am 3c0081b0: Merge "Use exactly the same timings for the ElectronBeam as JB." into jb-mr1-dev
...
* commit '3c0081b069acf06912b2497cb93664efc43c52ed':
Use exactly the same timings for the ElectronBeam as JB.
2012-10-10 23:26:01 -07:00
Daniel Sandler
cd70a4c23c
am 6918d9f9: Merge "Remove Dream windows immediately." into jb-mr1-dev
...
* commit '6918d9f970989f1e5ca5a03b04d10a4c890721e9':
Remove Dream windows immediately.
2012-10-10 23:25:58 -07:00
Daniel Sandler
5f9cd5e68a
am 6c179ad8: Merge "Dismiss keyguard for brightness QS tile." into jb-mr1-dev
...
* commit '6c179ad82d45a33389e65d89305ed0919042674f':
Dismiss keyguard for brightness QS tile.
2012-10-10 23:25:54 -07:00
Jeff Brown
60fa4617bc
Merge changes I50eb7dcf,I7ae92ce1,Icb22db1c into jb-mr1-dev
...
* changes:
Don't enable input dispatch until the screen is visible.
Dejank electron beam.
Don't process UEvents in Dalvik unless they match a pattern.
2012-10-10 23:06:15 -07:00
Jeff Brown
3c0081b069
Merge "Use exactly the same timings for the ElectronBeam as JB." into jb-mr1-dev
2012-10-10 23:04:41 -07:00
Daniel Sandler
6918d9f970
Merge "Remove Dream windows immediately." into jb-mr1-dev
2012-10-10 22:58:59 -07:00
Daniel Sandler
6c179ad82d
Merge "Dismiss keyguard for brightness QS tile." into jb-mr1-dev
2012-10-10 22:44:48 -07:00