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

153000 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Deepanshu Gupta
941a8f0359 am 0c4893ec: am 2889942f: am bfeeee8e: (-s ours) am ecbe6045: am 6950920f: am 1fce990c: am 04861ed4: am 91043364: am 52be792b: am 27d3b926: Fix error when using list as actionBarNavMode. [DO NOT MERGE] 
* commit '0c4893ece99418842538db496bb8d53b767b335b':
  Fix error when using list as actionBarNavMode. [DO NOT MERGE]
 2014-09-26 05:32:09 +00:00
Deepanshu Gupta
1489862ece am 48d0fd99: (-s ours) am ee41b79c: am 7d23e405: am f1033174: (-s ours) am 93b185e3: am 363f4d4e: am 8bf221bd: Fix error when using list as actionBarNavMode. [DO NOT MERGE] 
* commit '48d0fd99f0a25829f191e7f7ed35cf8d0a2b5902':
  Fix error when using list as actionBarNavMode. [DO NOT MERGE]
 2014-09-26 05:24:06 +00:00
Deepanshu Gupta
0c4893ece9 am 2889942f: am bfeeee8e: (-s ours) am ecbe6045: am 6950920f: am 1fce990c: am 04861ed4: am 91043364: am 52be792b: am 27d3b926: Fix error when using list as actionBarNavMode. [DO NOT MERGE] 
* commit '2889942f4ee7762cdbd097cf3ceea16444f8841a':
  Fix error when using list as actionBarNavMode. [DO NOT MERGE]
 2014-09-26 05:20:48 +00:00
Deepanshu Gupta
48d0fd99f0 am ee41b79c: am 7d23e405: am f1033174: (-s ours) am 93b185e3: am 363f4d4e: am 8bf221bd: Fix error when using list as actionBarNavMode. [DO NOT MERGE] 
* commit 'ee41b79c5735bb3399108bb62de1145fffff3904':
  Fix error when using list as actionBarNavMode. [DO NOT MERGE]
 2014-09-26 05:13:09 +00:00
Deepanshu Gupta
2889942f4e am bfeeee8e: (-s ours) am ecbe6045: am 6950920f: am 1fce990c: am 04861ed4: am 91043364: am 52be792b: am 27d3b926: Fix error when using list as actionBarNavMode. [DO NOT MERGE] 
* commit 'bfeeee8e4a9cf4bf32067c2ca5807cd612564a99':
  Fix error when using list as actionBarNavMode. [DO NOT MERGE]
 2014-09-26 05:09:54 +00:00
Deepanshu Gupta
bfeeee8e4a am ecbe6045: am 6950920f: am 1fce990c: am 04861ed4: am 91043364: am 52be792b: am 27d3b926: Fix error when using list as actionBarNavMode. [DO NOT MERGE] 
* commit 'ecbe6045911ac7c05a1e999b966577ef7b1bdc18':
  Fix error when using list as actionBarNavMode. [DO NOT MERGE]
 2014-09-26 05:02:22 +00:00
Deepanshu Gupta
ee41b79c57 am 7d23e405: am f1033174: (-s ours) am 93b185e3: am 363f4d4e: am 8bf221bd: Fix error when using list as actionBarNavMode. [DO NOT MERGE] 
* commit '7d23e405bd3a18f871bcf9856b5a9bcc0ccb1236':
  Fix error when using list as actionBarNavMode. [DO NOT MERGE]
 2014-09-26 04:57:59 +00:00
Deepanshu Gupta
ecbe604591 am 6950920f: am 1fce990c: am 04861ed4: am 91043364: am 52be792b: am 27d3b926: Fix error when using list as actionBarNavMode. [DO NOT MERGE] 
* commit '6950920f19980a2416e156d2337b93e386b3f8be':
  Fix error when using list as actionBarNavMode. [DO NOT MERGE]
 2014-09-26 04:49:31 +00:00
Deepanshu Gupta
7d23e405bd am f1033174: (-s ours) am 93b185e3: am 363f4d4e: am 8bf221bd: Fix error when using list as actionBarNavMode. [DO NOT MERGE] 
* commit 'f103317499bdb12cbcac1754899756d22acde986':
  Fix error when using list as actionBarNavMode. [DO NOT MERGE]
 2014-09-26 04:40:53 +00:00
Deepanshu Gupta
6950920f19 am 1fce990c: am 04861ed4: am 91043364: am 52be792b: am 27d3b926: Fix error when using list as actionBarNavMode. [DO NOT MERGE] 
* commit '1fce990ce9098afe96e75ec1583c771826c50637':
  Fix error when using list as actionBarNavMode. [DO NOT MERGE]
 2014-09-26 04:37:23 +00:00
Deepanshu Gupta
1fce990ce9 am 04861ed4: am 91043364: am 52be792b: am 27d3b926: Fix error when using list as actionBarNavMode. [DO NOT MERGE] 
* commit '04861ed488f5aaa62acbaf903e359ea9edd8e9f9':
  Fix error when using list as actionBarNavMode. [DO NOT MERGE]
 2014-09-26 04:22:39 +00:00
Deepanshu Gupta
a7045a43ca am eb31708e: am 83951615: am 467aea17: am a39b3b25: (-s ours) am 08523e68: am 43214e0c: Fix error when using list as actionBarNavMode. [DO NOT MERGE] 
* commit 'eb31708e7d14db1a54bf0f38452149c7d984517f':
  Fix error when using list as actionBarNavMode. [DO NOT MERGE]
 2014-09-26 03:12:42 +00:00
Deepanshu Gupta
eb31708e7d am 83951615: am 467aea17: am a39b3b25: (-s ours) am 08523e68: am 43214e0c: Fix error when using list as actionBarNavMode. [DO NOT MERGE] 
* commit '83951615f564521d542da00d3bf60a372787aced':
  Fix error when using list as actionBarNavMode. [DO NOT MERGE]
 2014-09-26 03:00:29 +00:00
Deepanshu Gupta
83951615f5 am 467aea17: am a39b3b25: (-s ours) am 08523e68: am 43214e0c: Fix error when using list as actionBarNavMode. [DO NOT MERGE] 
* commit '467aea1722f5cd73d0874502447d947bccd13c99':
  Fix error when using list as actionBarNavMode. [DO NOT MERGE]
 2014-09-26 02:49:04 +00:00
John Spurlock
870f153583 Avoid dozing in car mode. 
Ensure we do not begin dozing in car mode, and end dozing when
entering car mode.

Bug:17658724
Change-Id: I572b0d6163d2ece3b93d86981fd6cad832f96b99
 2014-09-25 22:08:18 -04:00
Deepanshu Gupta
467aea1722 am a39b3b25: (-s ours) am 08523e68: am 43214e0c: Fix error when using list as actionBarNavMode. [DO NOT MERGE] 
* commit 'a39b3b25b947d6c1ab49c08fdcd6f5149f037b20':
  Fix error when using list as actionBarNavMode. [DO NOT MERGE]
 2014-09-26 02:07:42 +00:00
Svetoslav
75d7874edc am 9ec435dc: Merge "Using wrong virtual view id When prefetching accessibility nodes." into lmp-dev 
* commit '9ec435dca7296db68b19e03300ff814e34f84c16':
  Using wrong virtual view id When prefetching accessibility nodes.
 2014-09-26 01:58:29 +00:00
xinhe
e9f1640b6b Support multiple SIM/Subscription on telephony registration 
During calling telephony registry call back API, we force the call back will be
triggered if the registered subId is Default Sub ID. This is due to some risk
condition. Please refer to Issue 17472622 and its fix. This fix is ok for single
SIM/Subscription. However, on multiple SIM/subscription, there is potential problem
on wrong notifications.

Bug:17613629
Change-Id: I3f41e03f37424bcc82a71090d4f4142b4c5ba922
 2014-09-25 18:52:58 -07:00
Svetoslav
a8181a9a0b Merge "Using wrong virtual view id When prefetching accessibility nodes." into lmp-dev 2014-09-26 01:51:54 +00:00
John Spurlock
01f9ac9ec7 am cfc1a5ee: Merge "Shorten the zen supertoast visible duration." into lmp-dev 
* commit 'cfc1a5eec4bb331e22f0492c1a9b7a7f898b8960':
  Shorten the zen supertoast visible duration.
 2014-09-26 01:48:10 +00:00
Dianne Hackborn
1f9743dcd7 am 34b63d50: Merge "Fix issue #17574819: Chrome browser process is killed..." into lmp-dev 
* commit '34b63d50c6e9e999eb8d5349084c12e907fb2d2d':
  Fix issue #17574819: Chrome browser process is killed...
 2014-09-26 01:48:06 +00:00
Jesse Hall
1ff18bec6d am 7fa90f6a: Merge "bootanimation: allow animation to specify background color" into lmp-dev 
* commit '7fa90f6ae5c04d96b3210a45898d1e7a8f5ef8e6':
  bootanimation: allow animation to specify background color
 2014-09-26 01:48:01 +00:00
Svetoslav
c569d35945 Using wrong virtual view id When prefetching accessibility nodes. 
When getting an accessibility node info we also prefetch its predecessors,
siblings and descendants up to fifty. If a view has a node provider, i.e.
virtual descendants, and the id of the virtual descendant is not specified
we use a speacial constant to refer that the provider should create a node
for its hosting view. The bug was that we were not using the correct constant
when calling into the provider.

bug:17664111

Change-Id: I4f6b2333e1e7e3e2bb6b164c0752613417c60d16
 2014-09-25 18:46:33 -07:00
John Spurlock
bec9f45b63 Merge "Shorten the zen supertoast visible duration." into lmp-dev 2014-09-26 01:44:03 +00:00
Justin Koh
1c487938c4 am 04c6d73f: Revert "DO NOT MERGE Fix race condition between binder deaths" 
* commit '04c6d73fd0e4472505275688ef8497bc6697647c':
  Revert "DO NOT MERGE Fix race condition between binder deaths"
 2014-09-26 01:41:55 +00:00
Dianne Hackborn
2d1cc18763 Merge "Fix issue #17574819: Chrome browser process is killed..." into lmp-dev 2014-09-26 01:41:54 +00:00
Jesse Hall
fbe3d39dd5 Merge "bootanimation: allow animation to specify background color" into lmp-dev 2014-09-26 01:38:04 +00:00
Svetoslav
479eb79985 am 5d5ee54e: Merge "Invalid active window if temporary disabling accessibility for test tools." into lmp-dev 
* commit '5d5ee54ee25cadca06afb7ebf738bc88b7d20d9a':
  Invalid active window if temporary disabling accessibility for test tools.
 2014-09-26 01:36:21 +00:00
Dianne Hackborn
cd97c96734 Fix issue #17574819: Chrome browser process is killed... 
...in background due to dying renderer process

Completely turn this off, for now.

Change-Id: I028eefc9b7e627d29569ef72d9ab940ac5960c7c
 2014-09-25 18:34:02 -07:00
Dianne Hackborn
0f129c7959 am 0b1eb9d4: Merge "Work on issue #17656716: Unhandled exception in Window Manager" into lmp-dev 
* commit '0b1eb9d4ae339629fbbf226160896a917cad4d0d':
  Work on issue #17656716: Unhandled exception in Window Manager
 2014-09-26 01:30:47 +00:00
Alan Viverette
52128ecd61 am a9ac89a3: Merge "Correctly advertise accessibility scrolling actions" into lmp-dev 
* commit 'a9ac89a3fa9291553edb72f4557dcff9e77863ae':
  Correctly advertise accessibility scrolling actions
 2014-09-26 01:30:43 +00:00
Justin Koh
04c6d73fd0 Revert "DO NOT MERGE Fix race condition between binder deaths" 
This reverts commit 8828d86e79424fc1c7b7d1f908e3450879d5cea0.

Change-Id: I211f7b78a286868d8441323ff3c9cf4d7482fb61
 2014-09-26 01:29:17 +00:00
Svetoslav
54b0a05b00 Merge "Invalid active window if temporary disabling accessibility for test tools." into lmp-dev 2014-09-26 01:28:36 +00:00
Craig Mautner
6ae7ea942f am 8828d86e: DO NOT MERGE Fix race condition between binder deaths 
* commit '8828d86e79424fc1c7b7d1f908e3450879d5cea0':
  DO NOT MERGE Fix race condition between binder deaths
 2014-09-26 01:20:54 +00:00
Dianne Hackborn
a7b1595c25 Merge "Work on issue #17656716: Unhandled exception in Window Manager" into lmp-dev 2014-09-26 01:15:02 +00:00
Alan Viverette
80c0bbe82c Merge "Correctly advertise accessibility scrolling actions" into lmp-dev 2014-09-26 01:13:13 +00:00
Sailesh Nepal
9bcda32475 am 7461b5a0: Merge "Adding support for Cdma conference calling." into lmp-dev 
* commit '7461b5a019dca6e02f1ddba0f75a6548e40fb632':
  Adding support for Cdma conference calling.
 2014-09-26 01:06:11 +00:00
Adam Lesinski
9c235eaa35 am 0a6c5ea4: Merge "AAPT: Fix issue with synthesized resource not actually showing up" into lmp-dev 
* commit '0a6c5ea412bc1e49aa1e98a6a3fe268081883d4a':
  AAPT: Fix issue with synthesized resource not actually showing up
 2014-09-26 01:06:06 +00:00
Martijn Coenen
56a3e67433 Add hidden API to disable NFC (optional persist). 
Bug: 17298769
Change-Id: I1fa59592a34f1207731dc75d2e548b3e614d94f5
 2014-09-25 18:02:27 -07:00
Craig Mautner
8828d86e79 DO NOT MERGE Fix race condition between binder deaths 
If a Binder dies there is a race between activity manager and window
manager to see who can handle the binderDied call first. If the
activity manager wins the race it will remove the activity and task
but leave the windows around. Until the WindowState.binderDied call
is made and all animation is complete the windows will try to access
the task that they were associated with.

This fix removes the windows of an activity when the activity is
removed. It also defers removal of the activity and task until
exiting windows have completed their animation.

Fixes bug 17031518.

Change-Id: Idf52f55c5feb0cad4e3664ef2eae5b7e95bbf490
(cherry picked from commit 5acd163b828d5b26408eb3a7904d750a1570239e)
 2014-09-26 01:01:42 +00:00
Deepanshu Gupta
04861ed488 am 91043364: am 52be792b: am 27d3b926: Fix error when using list as actionBarNavMode. [DO NOT MERGE] 
* commit '91043364b95fe58225437e2220d497ef6e33edf6':
  Fix error when using list as actionBarNavMode. [DO NOT MERGE]
 2014-09-26 00:59:08 +00:00
Deepanshu Gupta
f103317499 am 93b185e3: am 363f4d4e: am 8bf221bd: Fix error when using list as actionBarNavMode. [DO NOT MERGE] 
* commit '93b185e39c5e6a90d413ffa5a2eea740feb7364b':
  Fix error when using list as actionBarNavMode. [DO NOT MERGE]
 2014-09-26 00:58:23 +00:00
Deepanshu Gupta
9fcacf52d0 am a6e2f226: am 14ffff15: am c8cbff8b: Fix error when using list as actionBarNavMode. [DO NOT MERGE] 
* commit 'a6e2f22666db39df527cf6698abc2420c208f02c':
  Fix error when using list as actionBarNavMode. [DO NOT MERGE]
 2014-09-26 00:58:18 +00:00
Sailesh Nepal
e6ae3fde43 Merge "Adding support for Cdma conference calling." into lmp-dev 2014-09-26 00:56:10 +00:00
Philip Nowell
d561913798 Corrects a typo that identified XXXHIGH as 560 dpi instead of 640. 
Change-Id: I8b5ac84431d378f0e43be8d19920fd6ba335ebc6
 2014-09-26 00:54:32 +00:00
Adam Lesinski
663a52d68a Merge "AAPT: Fix issue with synthesized resource not actually showing up" into lmp-dev 2014-09-26 00:51:36 +00:00
Dianne Hackborn
017c6a28be Work on issue #17656716: Unhandled exception in Window Manager 
Create descriptive errors when sending unreasonably large
parcels through IPC.

Change-Id: Ie93b5372a8ed87541db282876c4eeeae69a1e8bd
 2014-09-25 17:48:44 -07:00
Deepanshu Gupta
a39b3b25b9 am 08523e68: am 43214e0c: Fix error when using list as actionBarNavMode. [DO NOT MERGE] 
* commit '08523e680e1ec1e4ec521c7e732e60fd85f553a4':
  Fix error when using list as actionBarNavMode. [DO NOT MERGE]
 2014-09-26 00:48:26 +00:00
Deepanshu Gupta
a6e2f22666 am 14ffff15: am c8cbff8b: Fix error when using list as actionBarNavMode. [DO NOT MERGE] 
* commit '14ffff154f974bb169b3449ad24c508c836c670c':
  Fix error when using list as actionBarNavMode. [DO NOT MERGE]
 2014-09-26 00:47:02 +00:00
Deepanshu Gupta
91043364b9 am 52be792b: am 27d3b926: Fix error when using list as actionBarNavMode. [DO NOT MERGE] 
* commit '52be792bad7cbd059daab02a23e28ef1df61f2ce':
  Fix error when using list as actionBarNavMode. [DO NOT MERGE]
 2014-09-26 00:46:07 +00:00