89466 Commits

Author SHA1 Message Date
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
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
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
Amith Yamasani
4e69679c5b am c97332cb: am 31cee479: Merge "Fix a runtime restart when cycling between 4 users" into jb-mr1-dev
* commit 'c97332cb8751356d2fa5ecf8a92cea73d277cadc':
  Fix a runtime restart when cycling between 4 users
2012-10-10 22:43:42 -07:00
Amith Yamasani
c97332cb87 am 31cee479: Merge "Fix a runtime restart when cycling between 4 users" into jb-mr1-dev
* commit '31cee479fc43fc422b481f6360fa499a7b4fc70a':
  Fix a runtime restart when cycling between 4 users
2012-10-10 22:40:01 -07:00
Amith Yamasani
31cee479fc Merge "Fix a runtime restart when cycling between 4 users" into jb-mr1-dev 2012-10-10 22:38:31 -07:00
Amith Yamasani
9535c915b6 Fix a runtime restart when cycling between 4 users
Some refactoring in Sync Manager caused mUserManager to be initialized too late.
Make sure this is initialized in the constructor now.

Bug: 7328386
Change-Id: Ic67915e172c3b8ef368852147667287e38c0213b
2012-10-10 21:48:33 -07:00
Jeff Brown
4fc452795f Don't enable input dispatch until the screen is visible.
When we defer making the screen visible (waiting for the lock screen
to be ready) the screen may actually be on but covered by a black
surface.  We need to make sure to ignore any touches on the screen
during this time until the black surface is about to be removed.

Bug: 7318962
Change-Id: I50eb7dcf05295cd276925625240996c4b80c5fe2
2012-10-10 21:46:56 -07:00
Jeff Brown
78eb122450 Dejank electron beam.
On some devices it can take hundreds of milliseconds to get a
brand new EGL surface performing in tip-top shape.  To get it
ready make it do a few pushups before the show begins.

Bug: 7318962
Change-Id: I7ae92ce100c368327042a29ffa65faee9b567c8d
2012-10-10 21:46:55 -07:00
Jeff Brown
9cf36b7a77 Don't process UEvents in Dalvik unless they match a pattern.
On some devices, vsync is delivered from the kernel to userspace
over a netlink socket via UEvent.  The result is that a thread wakes
up, reads a message, creates a new String then searches it for matches
against a pattern on every single frame.

Reduce the overhead by performing the initial pattern matching in
native code.

Bug: 7326329
Change-Id: Icb22db1c38330694207bec1153840e0c06f502d6
2012-10-10 21:46:55 -07:00
Baligh Uddin
d5a37aa936 am 61dd08e4: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
* commit '61dd08e4d39600a49d1c9dfc07ae726ca805b1e9':
  Import translations. DO NOT MERGE
2012-10-10 21:28:56 -07:00
Baligh Uddin
61dd08e4d3 Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 2012-10-10 21:26:35 -07:00
Baligh Uddin
ba83e536a5 am caff48e3: am eb214524: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit 'caff48e3b1b2747d878c4f9562ffdcbe2c4555f8':
  Import translations. DO NOT MERGE
2012-10-10 21:21:04 -07:00
Baligh Uddin
6cbaf15465 am c77a2594: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
* commit 'c77a2594c79a280173874a37143d70b2391e3233':
  Import translations. DO NOT MERGE
2012-10-10 21:21:04 -07:00
Baligh Uddin
caff48e3b1 am eb214524: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit 'eb214524be8b41a246b4e544cf5cbf30b16497f2':
  Import translations. DO NOT MERGE
2012-10-10 21:19:27 -07:00
Baligh Uddin
eb214524be Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-10-10 21:16:53 -07:00
Baligh Uddin
c77a2594c7 Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 2012-10-10 21:07:49 -07:00
Jeff Brown
3c584f20ac Use exactly the same timings for the ElectronBeam as JB.
Bug: 7318962
Change-Id: Ic04bac5b07ec64fed84a6381ee1916ddeed01255
2012-10-10 19:47:18 -07:00
Dianne Hackborn
8d866e52b2 More on issue #7318666: hide developer options from user build
The action to launch the developer settings panel is now required
by the platform.

Add a new hidden API to LauncherActivity so I can better integrate
these into the existing Dev Tools app.

Change-Id: I9c082622fd4c8f4a5be51cabb664741a3782ece1
2012-10-10 18:39:45 -07:00
Fabrice Di Meglio
ce6e952cd2 am 91622961: am f6215e55: Fix the build
* commit '91622961171c5710a36a4123e2c8f406b026f51a':
  Fix the build
2012-10-10 18:29:44 -07:00
Fabrice Di Meglio
9162296117 am f6215e55: Fix the build
* commit 'f6215e55df1ab4f6cda33dd081c0a91062a1be63':
  Fix the build
2012-10-10 18:28:02 -07:00
Fabrice Di Meglio
f6215e55df Fix the build
Change-Id: I9c79677ee4f68d6fc82b754d08e701229725c2a6
2012-10-10 18:23:00 -07:00