drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
87,600 Commits 1 Branch 0 Tags
Commit Graph

87600 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chris Wren
a35f8ce39f am 061a4de8: Merge "resolve conflicting assumptions from the merge." into jb-mr1-dev 
* commit '061a4de86d79d3ead3f297fa3fde4692446af5e4':
  resolve conflicting assumptions from the merge.
 2012-10-11 13:08:28 -07:00
Chris Wren
061a4de86d Merge "resolve conflicting assumptions from the merge." into jb-mr1-dev 2012-10-11 13:05:36 -07:00
Dave Burke
950407d09e am a2f7ca7d: Merge "Add new ringtones/notifications for Occam." into jb-mr1-dev 
* commit 'a2f7ca7db1f797d7897dc66840d1ec64d1b2a6a1':
  Add new ringtones/notifications for Occam.
 2012-10-11 12:55:46 -07:00
Dave Burke
a2f7ca7db1 Merge "Add new ringtones/notifications for Occam." into jb-mr1-dev 2012-10-11 12:53:02 -07:00
Winson Chung
ada86cba3c Ignore dying users when testing for number of users on device. (Bug 7332248) 
Change-Id: Id5cc0aacba716db5c2306fd72a51ac7cffc4149e
 2012-10-11 12:49:02 -07:00
Winson Chung
596b1850f3 Skip merge and assign RemoteViews directly if updateAppWidget() has not been called. (Bug 7214731) 
Change-Id: Ie19b629deea9133800df265a2cebedc8bcb2a74d
 2012-10-11 12:46:54 -07:00
Svetoslav Ganov
0ea16037c7 Screen magnification does not auto-pan when fragment dialog pops up. 
1. We auto pan when certain type of window pop up to make sure the user
   knows about the context change. This does not happen however for
   fragment dialog since its window type is not in the list of one
   we auto pan for. Updating the window type list.

bug:7332090

Change-Id: I9b097c57df929d2e4e807a948c3a0540f4092a76
 2012-10-11 12:40:58 -07:00
Dave Burke
2882fc0f02 Add new ringtones/notifications for Occam. 
Bug: 7312457
Change-Id: Id3a3a25d412b4f1441067e0d86d2bf30e10dd1b7
 2012-10-11 12:10:41 -07:00
Danielle Millett
85a4ac9281 am 8f89e6f8: Merge "Face Unlock is shown correctly during a phone call - fix b/7271718" into jb-mr1-dev 
* commit '8f89e6f8e66ab445cca16e5426a126d3798f09d9':
  Face Unlock is shown correctly during a phone call - fix b/7271718
 2012-10-11 12:10:02 -07:00
Danielle Millett
8f89e6f8e6 Merge "Face Unlock is shown correctly during a phone call - fix b/7271718" into jb-mr1-dev 2012-10-11 12:07:38 -07:00
Daniel Sandler
22cc5c76d0 am ff97e6e8: Merge "New icon for quick settings button." into jb-mr1-dev 
* commit 'ff97e6e8412d9985938e715fcd1030adba328d4b':
  New icon for quick settings button.
 2012-10-11 11:53:05 -07:00
Daniel Sandler
ff97e6e841 Merge "New icon for quick settings button." into jb-mr1-dev 2012-10-11 11:50:22 -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
Daniel Sandler
e6a69ddc67 New icon for quick settings button. 
Bug: 7319756
Change-Id: I864cc7938f94c87f5d7e18657fb6ac5f083e15d9
 2012-10-11 14:05:12 -04: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
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
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
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
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
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