Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
176,611 Commits 3 Branches 0 Tags
c56cd34dcafe0d854a3a2b234a32cf859708f1df
Commit Graph

176611 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nancy Chen
6a44c194e7 am e1678ddf: Merge "Handle MMI for multi-SIM (1/3)" into lmp-mr1-dev 
automerge: 346f907

* commit '346f9070a45798d3edf38b4abaf39600630dd403':
  Handle MMI for multi-SIM (1/3)
 2014-10-31 22:11:59 +00:00
Nancy Chen
346f9070a4 am e1678ddf: Merge "Handle MMI for multi-SIM (1/3)" into lmp-mr1-dev 
* commit 'e1678ddf7a8311c79ccba5a6b6183f9484fa1f1f':
  Handle MMI for multi-SIM (1/3)
 2014-10-31 22:10:47 +00:00
Christopher Lane
c56a9d10f7 am be36ebc2: Merge "Add convenience method for getting the complex unit type" into lmp-mr1-dev 
automerge: 38d6cf9

* commit '38d6cf9cbee98b3fe66e6ccda223b3c4c01a0815':
  Add convenience method for getting the complex unit type
 2014-10-31 22:07:30 +00:00
Nancy Chen
e1678ddf7a Merge "Handle MMI for multi-SIM (1/3)" into lmp-mr1-dev 2014-10-31 22:06:28 +00:00
Christopher Lane
38d6cf9cbe am be36ebc2: Merge "Add convenience method for getting the complex unit type" into lmp-mr1-dev 
* commit 'be36ebc28dd1f86da521401266fd03ca0b59825c':
  Add convenience method for getting the complex unit type
 2014-10-31 22:06:04 +00:00
Christopher Lane
be36ebc28d Merge "Add convenience method for getting the complex unit type" into lmp-mr1-dev 2014-10-31 22:01:35 +00:00
Tsuwei Chen
d3ef8e264b Reject SUPL connection when data is disbaled by user. 
b/18127920

Change-Id: I6209d7c48bb7c9a81fd3fd9323275e1f6a38d8db
 2014-10-31 14:58:44 -07:00
Scott Rowe
067fbaa8e3 docs: b/15180738 - invalid urls in badge generator 
Change-Id: Ifb7ab1ad1b860c7fb7faec624b7d3ad4244fee36
 2014-10-31 14:52:32 -07:00
Christopher Lane
9f357ae9f0 Add convenience method for getting the complex unit type 
Bug: 18193912
Change-Id: Ida29c12c6c3f07ac0657e70d2ab07f2fc4f2cb20
 2014-10-31 14:52:06 -07:00
Santos Cordon
2ef87ee728 Split Telecom PhoneAccount registration permissions. 
Bug: 18106506
Change-Id: Ic825b44c2dc42709073a3990f6a7ca8e372025e9
 2014-10-31 14:44:30 -07:00
George Mount
486384ef46 am 0d6624d3: am fa21e757: Merge "Ensure views are attached prior to starting enter transition." into lmp-mr1-dev automerge: 7bce500 
* commit '0d6624d35af7c7623cf97084753255079b01fbdf':
  Ensure views are attached prior to starting enter transition.
 2014-10-31 21:43:21 +00:00
George Mount
0d6624d35a am fa21e757: Merge "Ensure views are attached prior to starting enter transition." into lmp-mr1-dev 
automerge: 7bce500

* commit '7bce5007d2b2b218d11514a3df8e7109e37d9e7c':
  Ensure views are attached prior to starting enter transition.
 2014-10-31 21:38:13 +00:00
George Mount
7bce5007d2 am fa21e757: Merge "Ensure views are attached prior to starting enter transition." into lmp-mr1-dev 
* commit 'fa21e75734878a9718f85c7d3f28c5946f15d01d':
  Ensure views are attached prior to starting enter transition.
 2014-10-31 21:35:30 +00:00
George Mount
fa21e75734 Merge "Ensure views are attached prior to starting enter transition." into lmp-mr1-dev 2014-10-31 21:30:20 +00:00
Adam Powell
42c63290f7 AlertDialog metrics and measurement fixes 
Bug 17930997

Change-Id: If7b641d4e2d80f7bf44c6f0a996faff53ee403bc
 2014-10-31 14:13:32 -07:00
destradaa
a62050d42c Mark Gps Raw related APIs as System APIs. 
b/16727892

Change-Id: I29d78d45aef7829c3321ae4e7c26549e46fa39f9
 2014-10-31 14:05:27 -07:00
destradaa
6568d709e7 Add support for GPS measurement/navigation message capabilities. 
b/16727892
b/16815124

The listeners are changed to receive statuses asynchronously, this is required because GPS HAL,
requires time to be notified of the capabilities it supports.

Change-Id: Ie69fdd629d8680341386a2c736bc851632dd2bda
 2014-10-31 14:03:20 -07:00
Adam Powell
311506afbb Don't update OverScroller fling state if no time has passed since start 
If no time has passed when we try to update fling state, skip the
update computation since there is nothing to do.

Fixes a bug where we could return NaN from
OverScroller#getCurrentVelocity.

Bug 17700698

Change-Id: I65042d4d26a29593f66781b58456c2d1e85381c6
 2014-10-31 14:03:01 -07:00
destradaa
df11984011 Fix reference leak in GPS measurement JNI layer. 
b/16727892
b/17075171

Change-Id: I5f41c6db114078b927e56a7614fa7c09a288e2b2
 2014-10-31 13:59:17 -07:00
Adam Powell
3bfcae769f am dec2509d: am b9eabc5c: Merge "Allow swipe down to dismiss for ResolverDrawerLayout" into lmp-mr1-dev automerge: 63bb338 
* commit 'dec2509d706f64fc81676fdde1c353e717a73ed0':
  Allow swipe down to dismiss for ResolverDrawerLayout
 2014-10-31 20:40:14 +00:00
Adam Powell
dec2509d70 am b9eabc5c: Merge "Allow swipe down to dismiss for ResolverDrawerLayout" into lmp-mr1-dev 
automerge: 63bb338

* commit '63bb33832380feb546d1a20d8f1c057f2088aed5':
  Allow swipe down to dismiss for ResolverDrawerLayout
 2014-10-31 20:35:42 +00:00
Adam Powell
63bb338323 am b9eabc5c: Merge "Allow swipe down to dismiss for ResolverDrawerLayout" into lmp-mr1-dev 
* commit 'b9eabc5c2b54145772cbec1c6cec90360925e174':
  Allow swipe down to dismiss for ResolverDrawerLayout
 2014-10-31 20:34:25 +00:00
Evan Charlton
e28999260c am 3869d751: am 984cf41a: Merge "Have Pm return the correct code" into lmp-mr1-dev automerge: e8b451d 
* commit '3869d75196c40ef919a2444a673d787d23679af5':
  Have Pm return the correct code
 2014-10-31 20:29:22 +00:00
Adam Powell
b9eabc5c2b Merge "Allow swipe down to dismiss for ResolverDrawerLayout" into lmp-mr1-dev 2014-10-31 20:28:48 +00:00
Evan Charlton
3869d75196 am 984cf41a: Merge "Have Pm return the correct code" into lmp-mr1-dev 
automerge: e8b451d

* commit 'e8b451dd123b96252026992be3c96c9c577b4245':
  Have Pm return the correct code
 2014-10-31 20:22:15 +00:00
Evan Charlton
e8b451dd12 am 984cf41a: Merge "Have Pm return the correct code" into lmp-mr1-dev 
* commit '984cf41a54493d7fca5b499789ea5da5ad22b450':
  Have Pm return the correct code
 2014-10-31 20:21:12 +00:00
Evan Charlton
984cf41a54 Merge "Have Pm return the correct code" into lmp-mr1-dev 2014-10-31 20:16:09 +00:00
Amith Yamasani
b9a7f37e71 am 84df64d4: am 8079a812: Merge "Backup and restore battery saver trigger level" into lmp-mr1-dev automerge: 80e5f45 
* commit '84df64d4009aa42ccca1bb4c4b03396fe441f990':
  Backup and restore battery saver trigger level
 2014-10-31 20:04:24 +00:00
Svetoslav
a3b6fc48b7 am 2a6749ad: am 93134ce8: Merge "Save to a PDF file should look like print preview." into lmp-mr1-dev automerge: 160021d 
* commit '2a6749adc0d0693b97c81b6083629e13b604d45a':
  Save to a PDF file should look like print preview.
 2014-10-31 20:04:19 +00:00
Svetoslav
e7d267e3d8 am eaaa38ae: am b1ecf0d7: Merge "Adding APIs to enable apps to influence accessibility traversal." into lmp-mr1-dev automerge: 97fcd2b 
* commit 'eaaa38aea09e82fc557ebf0dd7fd02acfbfa1d59':
  Adding APIs to enable apps to influence accessibility traversal.
 2014-10-31 20:04:14 +00:00
Amith Yamasani
84df64d400 am 8079a812: Merge "Backup and restore battery saver trigger level" into lmp-mr1-dev 
automerge: 80e5f45

* commit '80e5f45979416c0bee487725eaf4078b6ba42769':
  Backup and restore battery saver trigger level
 2014-10-31 20:00:57 +00:00
Svetoslav
2a6749adc0 am 93134ce8: Merge "Save to a PDF file should look like print preview." into lmp-mr1-dev 
automerge: 160021d

* commit '160021d8cf62f566587d899498c72fff82b6969f':
  Save to a PDF file should look like print preview.
 2014-10-31 19:59:53 +00:00
Svetoslav
eaaa38aea0 am b1ecf0d7: Merge "Adding APIs to enable apps to influence accessibility traversal." into lmp-mr1-dev 
automerge: 97fcd2b

* commit '97fcd2b5d15ed01b1ee27a30132e95b4733793cf':
  Adding APIs to enable apps to influence accessibility traversal.
 2014-10-31 19:58:57 +00:00
Amith Yamasani
80e5f45979 am 8079a812: Merge "Backup and restore battery saver trigger level" into lmp-mr1-dev 
* commit '8079a812aabffe0014cd4c8e3e2a3e273a768436':
  Backup and restore battery saver trigger level
 2014-10-31 19:57:28 +00:00
Svetoslav
160021d8cf am 93134ce8: Merge "Save to a PDF file should look like print preview." into lmp-mr1-dev 
* commit '93134ce87e7b33e599c9ef9ed8b19ec2556ca8f1':
  Save to a PDF file should look like print preview.
 2014-10-31 19:57:23 +00:00
Svetoslav
97fcd2b5d1 am b1ecf0d7: Merge "Adding APIs to enable apps to influence accessibility traversal." into lmp-mr1-dev 
* commit 'b1ecf0d776a2dce5d60802f83fb97c893ba42bf1':
  Adding APIs to enable apps to influence accessibility traversal.
 2014-10-31 19:57:18 +00:00
Amith Yamasani
8079a812aa Merge "Backup and restore battery saver trigger level" into lmp-mr1-dev 2014-10-31 19:55:52 +00:00
Svetoslav
93134ce87e Merge "Save to a PDF file should look like print preview." into lmp-mr1-dev 2014-10-31 19:54:05 +00:00
Svetoslav
b1ecf0d776 Merge "Adding APIs to enable apps to influence accessibility traversal." into lmp-mr1-dev 2014-10-31 19:53:32 +00:00
Evan Charlton
7c006199e5 Have Pm return the correct code 
If the command fails, have Pm return a nonzero exit code.

Bug: 18085950
Change-Id: I3de1b8f69aa8f44b2e2109864c1aa093e3b82141
 2014-10-31 12:45:25 -07:00
Chris Wren
06e09af368 am bbe8c74f: am b9144cea: Merge "Clear the initialized flag when resetting the height." into lmp-mr1-dev automerge: c5f1ee3 
* commit 'bbe8c74f6b6cae4e2590d33dbeeab8c1b59f8fb9':
  Clear the initialized flag when resetting the height.
 2014-10-31 19:44:31 +00:00
John Spurlock
cdd12b7caf am e7eadc46: am 404658ee: Merge "Update 1-bar status bar / qs icons." into lmp-mr1-dev automerge: 44c534d 
* commit 'e7eadc463564a64b51b4264654e7025747d8fe77':
  Update 1-bar status bar / qs icons.
 2014-10-31 19:44:26 +00:00
Chris Wren
bbe8c74f6b am b9144cea: Merge "Clear the initialized flag when resetting the height." into lmp-mr1-dev 
automerge: c5f1ee3

* commit 'c5f1ee3dd144799b92b7c41286e2512b09f364d9':
  Clear the initialized flag when resetting the height.
 2014-10-31 19:39:12 +00:00
John Spurlock
e7eadc4635 am 404658ee: Merge "Update 1-bar status bar / qs icons." into lmp-mr1-dev 
automerge: 44c534d

* commit '44c534d88ae1153c8d29cee27de4131cd7215273':
  Update 1-bar status bar / qs icons.
 2014-10-31 19:37:46 +00:00
Joe Fernandez
0e4ef67369 am 89e73a1c: am ea17fdec: Merge "docs:studio-updates-814v2" into lmp-docs 
* commit '89e73a1c85c3af19530cd7b9f7093668abba9edb':
  docs:studio-updates-814v2
 2014-10-31 19:35:52 +00:00
Joe Fernandez
89e73a1c85 am ea17fdec: Merge "docs:studio-updates-814v2" into lmp-docs 
* commit 'ea17fdecae470beeae8e12666254bf8f6446b06e':
  docs:studio-updates-814v2
 2014-10-31 19:28:30 +00:00
Joe Fernandez
ea17fdecae Merge "docs:studio-updates-814v2" into lmp-docs 2014-10-31 19:23:46 +00:00
Rich Slogar
62fddcd9d9 docs:studio-updates-814v2 
Change-Id: I68f6fb1e40e5b7bbdf25e6ab1340d02116452a02
 2014-10-31 12:21:48 -07:00
Chris Wren
c5f1ee3dd1 am b9144cea: Merge "Clear the initialized flag when resetting the height." into lmp-mr1-dev 
* commit 'b9144cea5184c90534db75b47e3818a688e64d5b':
  Clear the initialized flag when resetting the height.
 2014-10-31 19:15:20 +00:00
Chris Wren
b9144cea51 Merge "Clear the initialized flag when resetting the height." into lmp-mr1-dev 2014-10-31 19:10:53 +00:00