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

171968 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joe Fernandez
11341c4d32 am 9a0be7d3: am 519fbf3a: am 4234fca6: am 044f3947: Merge "docs: uiautomator blog link removal" into lmp-docs automerge: d799f75 
* commit '9a0be7d31da7c340fd1f5b57c9e1527726697fcc':
  docs: uiautomator blog link removal
 2014-12-16 02:31:17 +00:00
Joe Fernandez
d6bba15c03 am e33b63fe: am 9a05dee5: am e70cb874: am c59d1d78: Merge "docs: studio basics typo" into lmp-docs automerge: 72268ad 
* commit 'e33b63feecf6dc76db716c8064f5a21c751b81d7':
  docs: studio basics typo
 2014-12-16 02:23:24 +00:00
Luan Nguyen
56102be892 am 443e57df: am 556ce7f1: am 47efca78: am a854ddfd: docs: Add two new general functionality requirements automerge: bb01880 
* commit '443e57df26077652d35b4e294e4a5ed3cd6030b3':
  docs: Add two new general functionality requirements
 2014-12-16 02:23:17 +00:00
Mark Renouf
990d605733 am 3e4a43e4: am 1302ee3a: If no display settings are matched, return the first one. DO NOT MERGE automerge: d3adc51 -s ours 
* commit '3e4a43e4f5bbf273dcaef049a2c0c1574c62fc82':
  If no display settings are matched, return the first one. DO NOT MERGE
 2014-12-16 02:23:11 +00:00
Sarah Maddox
99c5ac9e14 am 48f9c8e4: am aaa37da8: am a158abe4: Merge "docs: Updates lesson 1 of location API training: Get last-known location." into lmp-docs automerge: 8f0f627 
* commit '48f9c8e48c5d765afc025c2bda3695d0dd13388e':
  docs: Updates lesson 1 of location API training: Get last-known location.
 2014-12-16 02:00:46 +00:00
smain@google.com
1d97aebdd9 am 9af05a68: am 16d9a037: am 68e6819b: brute force improve suggestions for sdk download automerge: c21b455 
* commit '9af05a689964ca2563c038484b385e8dfb58ed3d':
  brute force improve suggestions for sdk download
 2014-12-16 02:00:41 +00:00
Rich Slogar
ccaf3552e6 am 57911088: am 895d1694: am 6b8756c3: docs: studio 1.0.1 revision update automerge: b2a9bd5 
* commit '579110887d9d5d21ca8ed0b4179b61de3b876410':
  docs: studio 1.0.1 revision update
 2014-12-16 02:00:36 +00:00
smain@google.com
f912c21e43 am a01e83b2: am 8bb3962b: am 8e8f29e3: Merge "fix distribute nav styles. they were not highlighted correctly." into lmp-docs automerge: 63ed5e1 
* commit 'a01e83b2665e32f0ee74ee97b37e12fe1c9ac986':
  fix distribute nav styles. they were not highlighted correctly.
 2014-12-16 02:00:30 +00:00
Joe Fernandez
9a0be7d31d am 519fbf3a: am 4234fca6: am 044f3947: Merge "docs: uiautomator blog link removal" into lmp-docs automerge: d799f75 
* commit '519fbf3ae7dbf27f62321c727e721f29aa89ac92':
  docs: uiautomator blog link removal
 2014-12-16 02:00:24 +00:00
Joe Fernandez
e33b63feec am 9a05dee5: am e70cb874: am c59d1d78: Merge "docs: studio basics typo" into lmp-docs automerge: 72268ad 
* commit '9a05dee5ece7ba9cf3127bac89b0f3ff1d8448b8':
  docs: studio basics typo
 2014-12-16 01:54:09 +00:00
Luan Nguyen
443e57df26 am 556ce7f1: am 47efca78: am a854ddfd: docs: Add two new general functionality requirements automerge: bb01880 
* commit '556ce7f145de641e0f920ed3059be5a82eb0bb7b':
  docs: Add two new general functionality requirements
 2014-12-16 01:54:03 +00:00
Mark Renouf
3e4a43e4f5 am 1302ee3a: If no display settings are matched, return the first one. DO NOT MERGE automerge: d3adc51 -s ours 
* commit '1302ee3a2338dec77da81deca51811e31f693c09':
  If no display settings are matched, return the first one. DO NOT MERGE
 2014-12-16 01:53:58 +00:00
Brian Carlstrom
9900dbb9e8 am a00be9b4: Remember failed dexopt to avoid retry 
automerge: 2350c7c

* commit '2350c7cb1238ad24b5afaa7f6627b3443d33621b':
  Remember failed dexopt to avoid retry
 2014-12-16 01:46:40 +00:00
Jay Shrauner
58d66c30d7 am 12b5e504: Merge "Fix NPE in Transport.applyBatch" into lmp-mr1-dev 
automerge: 59e96ee

* commit '59e96ee423f4fc810f29451144143a581a8cd99a':
  Fix NPE in Transport.applyBatch
 2014-12-16 01:45:09 +00:00
Adam Lesinski
22bfb75ebb am 0f0e85a6: Merge "AAPT: attributes showing up after v21 attributes would be removed for pre-21 devices" into lmp-mr1-dev 
automerge: 465d123

* commit '465d123464eadf180b618164b2ed23702bca3d86':
  AAPT: attributes showing up after v21 attributes would be removed for pre-21 devices
 2014-12-16 01:43:16 +00:00
Sarah Maddox
48f9c8e48c am aaa37da8: am a158abe4: Merge "docs: Updates lesson 1 of location API training: Get last-known location." into lmp-docs 
automerge: 8f0f627

* commit '8f0f627e0e76918a57941c71ad49ea6758f68886':
  docs: Updates lesson 1 of location API training: Get last-known location.
 2014-12-16 01:39:00 +00:00
smain@google.com
9af05a6899 am 16d9a037: am 68e6819b: brute force improve suggestions for sdk download 
automerge: c21b455

* commit 'c21b4553cbdeb8286a49108ec6059871ad81eba2':
  brute force improve suggestions for sdk download
 2014-12-16 01:37:42 +00:00
Rich Slogar
579110887d am 895d1694: am 6b8756c3: docs: studio 1.0.1 revision update 
automerge: b2a9bd5

* commit 'b2a9bd5e9b1984b8aeda17b0c1477e9190fc171e':
  docs: studio 1.0.1 revision update
 2014-12-16 01:36:40 +00:00
smain@google.com
a01e83b266 am 8bb3962b: am 8e8f29e3: Merge "fix distribute nav styles. they were not highlighted correctly." into lmp-docs 
automerge: 63ed5e1

* commit '63ed5e1b7736006f8d4ac5b4e60c453e2b26ad81':
  fix distribute nav styles. they were not highlighted correctly.
 2014-12-16 01:35:19 +00:00
Joe Fernandez
519fbf3ae7 am 4234fca6: am 044f3947: Merge "docs: uiautomator blog link removal" into lmp-docs 
automerge: d799f75

* commit 'd799f75c6b3adb088372f73967aee6362407e59b':
  docs: uiautomator blog link removal
 2014-12-16 01:33:56 +00:00
Joe Fernandez
9a05dee5ec am e70cb874: am c59d1d78: Merge "docs: studio basics typo" into lmp-docs 
automerge: 72268ad

* commit '72268ad3d4ecdeaee47ad8de0ec372bb834255c7':
  docs: studio basics typo
 2014-12-16 01:32:49 +00:00
Luan Nguyen
556ce7f145 am 47efca78: am a854ddfd: docs: Add two new general functionality requirements 
automerge: bb01880

* commit 'bb01880e6216c360a4732b02a1becb32520fcf5e':
  docs: Add two new general functionality requirements
 2014-12-16 01:30:17 +00:00
Mark Renouf
1302ee3a23 If no display settings are matched, return the first one. DO NOT MERGE 
automerge: d3adc51  -s ours

* commit 'd3adc51a1b845e37845af6a885ce7371c2ce252c':
  If no display settings are matched, return the first one. DO NOT MERGE
 2014-12-16 01:29:01 +00:00
Brian Carlstrom
2350c7cb12 am a00be9b4: Remember failed dexopt to avoid retry 
* commit 'a00be9b4d521287fdf4678fb196c3e3a0053c3e4':
  Remember failed dexopt to avoid retry
 2014-12-16 00:55:20 +00:00
Jay Shrauner
59e96ee423 am 12b5e504: Merge "Fix NPE in Transport.applyBatch" into lmp-mr1-dev 
* commit '12b5e504fd3845fed9c649cf01cd27b84fb6742c':
  Fix NPE in Transport.applyBatch
 2014-12-16 00:55:11 +00:00
Adam Lesinski
465d123464 am 0f0e85a6: Merge "AAPT: attributes showing up after v21 attributes would be removed for pre-21 devices" into lmp-mr1-dev 
* commit '0f0e85a68961e303ac85d31fb36ec8384277349d':
  AAPT: attributes showing up after v21 attributes would be removed for pre-21 devices
 2014-12-16 00:54:59 +00:00
Brian Carlstrom
a00be9b4d5 Remember failed dexopt to avoid retry 
Bug: 18643977
Change-Id: Ida8d9b9ce992d97fb75bccb8c3da0d9d73a480a9
 2014-12-15 15:57:56 -08:00
Jay Shrauner
12b5e504fd Merge "Fix NPE in Transport.applyBatch" into lmp-mr1-dev 2014-12-15 23:56:53 +00:00
ztenghui
d76da520ed Remove 2 sub-tests from the internal test app. 
b/18171696

Change-Id: I4c4e96c2d0a8e664d81abb300a8f56c5bbb358cd
 2014-12-15 15:47:41 -08:00
Raph Levien
50e9228493 Preserve leading "+" in phone numbers 
The normalizeNumber method in PhoneNumberUtils preserves a leading "+"
but only if it's the first character in the string. Thus it gets
dropped if there is leading punctuation such as "(". This patch
preserves the leading "+" as long as it would be the first character
in the normalized phone number.

Bug: 18418335
Change-Id: Ifcb1d3dd6c2943c729f570e7f3c90d1da9ee8b4b
 2014-12-15 15:46:17 -08:00
Adam Lesinski
0f0e85a689 Merge "AAPT: attributes showing up after v21 attributes would be removed for pre-21 devices" into lmp-mr1-dev 2014-12-15 23:35:23 +00:00
Yorke Lee
4f80324540 Revert "Allow home to be pressed while in incoming call screen" 
This reverts commit ad84e0637f43311a05e894393be6538909b937fb.

Bug: 18742942
Change-Id: I6c0a1651526a37cca8e27be9fbd36a2f59943366
 2014-12-15 23:22:06 +00:00
Jorim Jaggi
4800de0f7c am 93c736b3: am 613fffcd: Merge "Revert "Revert "Attempt to fix keyguard missing bug""" into lmp-mr1-dev 
* commit '93c736b3daa9b715814dd20892c1f41b5348f575':
  Revert "Revert "Attempt to fix keyguard missing bug""
 2014-12-15 22:41:50 +00:00
Jorim Jaggi
93c736b3da am 613fffcd: Merge "Revert "Revert "Attempt to fix keyguard missing bug""" into lmp-mr1-dev 
* commit '613fffcd0f17eecb0231fe24f7abf7936eef8d37':
  Revert "Revert "Attempt to fix keyguard missing bug""
 2014-12-15 22:35:56 +00:00
Sarah Maddox
8f0f627e0e am aaa37da8: am a158abe4: Merge "docs: Updates lesson 1 of location API training: Get last-known location." into lmp-docs 
* commit 'aaa37da8e0d358317d85e3bc7bfa363c644f5ef1':
  docs: Updates lesson 1 of location API training: Get last-known location.
 2014-12-15 21:57:02 +00:00
Sarah Maddox
aaa37da8e0 am a158abe4: Merge "docs: Updates lesson 1 of location API training: Get last-known location." into lmp-docs 
* commit 'a158abe4542742381861d1360a79db2cdd28be57':
  docs: Updates lesson 1 of location API training: Get last-known location.
 2014-12-15 21:50:27 +00:00
Jay Shrauner
ac2506c7e3 Fix NPE in Transport.applyBatch 
Bug:18756774
Change-Id: I1da4f0131b1529598043e4cb9fb226d02bff8669
 2014-12-15 13:25:52 -08:00
Adam Powell
f0af0ea33b Fix touch intercept bug in ResolverDrawerLayout 
ResolverDrawerLayout could get into a state where it thought a drag
was in progress, but since there was no distance to drag it would
return false from onTouchEvent for ACTION_DOWN. This would cause it to
intercept all future touch events, blocking interaction with
ResolverDrawerLayout child views. This would only happen if none of
the child views wanted the initial ACTION_DOWN event and it ended up
being processed in the ResolverDrawerLayout itself, such as in
response to touching in empty space or on the title text, and if all
available options fit in view without needing to expand the drawer.

Fix this by only setting the dragging bit if we're going to claim the
rest of the touch events after ACTION_DOWN.

Bug 18563698

Change-Id: Iab2ec38528697c9ff36bbb08b1f1210a6879d5ef
 2014-12-15 13:18:06 -08:00
Sarah Maddox
a158abe454 Merge "docs: Updates lesson 1 of location API training: Get last-known location." into lmp-docs 2014-12-15 20:42:40 +00:00
Paul Jensen
f4ffaa4f57 Fix race between CONNECTIVITY_ACTION and setting default network. 
Now that the delay between connectivity changes and CONNECTIVITY_ACTION
has been removed (ag/599650) races between CONNECTIVITY_ACTION and
the setting of the default network become more evident.
In http://crbug.com/441818 Chrome is calling getaddrinfo()
immediately after a device goes from no connectivity to cellular
connectivity, and Chrome is erroneously getting back EAI_NODATA
because netd hasn't yet set the default network for DNS resolutions.

bug:18757162
Change-Id: Ib607dcb3697403272a8c838713a9cb602e9c6820
 2014-12-15 15:20:30 -05:00
Jorim Jaggi
613fffcd0f Merge "Revert "Revert "Attempt to fix keyguard missing bug""" into lmp-mr1-dev 2014-12-15 19:56:45 +00:00
Elliott Hughes
3e8484c3f7 am 2a6426c9: am e9e1e0d2: Merge "Reimplement reopenStdio in Java." 
* commit '2a6426c900d319c7b928242694ad050a73ad324b':
  Reimplement reopenStdio in Java.
 2014-12-15 19:38:04 +00:00
Elliott Hughes
2a6426c900 am e9e1e0d2: Merge "Reimplement reopenStdio in Java." 
* commit 'e9e1e0d20f1f7bae11f5df74d14c7b1be4edc8ac':
  Reimplement reopenStdio in Java.
 2014-12-15 19:30:56 +00:00
Amit Mahajan
98cc133f07 am 2fab5307: am d060b50b: Merge "Change to treat slotId 0 emergency numbers as default." into lmp-mr1-dev 
* commit '2fab5307d1983b0415b7eeb79779ecaee7b67ea1':
  Change to treat slotId 0 emergency numbers as default.
 2014-12-15 19:27:10 +00:00
Elliott Hughes
e9e1e0d20f Merge "Reimplement reopenStdio in Java." 2014-12-15 19:24:53 +00:00
Amit Mahajan
2fab5307d1 am d060b50b: Merge "Change to treat slotId 0 emergency numbers as default." into lmp-mr1-dev 
* commit 'd060b50b331f540d42c91501d820e3c2601dec18':
  Change to treat slotId 0 emergency numbers as default.
 2014-12-15 19:19:06 +00:00
Jim Miller
a8800f7c27 Revert "Revert "Attempt to fix keyguard missing bug"" 
This reverts commit 1991590ddd0ca6d3a0cac290b65120c147034dbc
and fixes a bug where we were showing the scrim on devices without keyguard.

Bug: 18468369
Change-Id: Idce1370dadacd09c4a8f1a7fd9728c23b218d19c
 2014-12-15 20:12:09 +01:00
Amit Mahajan
d060b50b33 Merge "Change to treat slotId 0 emergency numbers as default." into lmp-mr1-dev 2014-12-15 19:06:48 +00:00
Elliott Hughes
dac83f5e6a Reimplement reopenStdio in Java. 
Bug: 18719692
Change-Id: I4ed984cd6148c5cba75d46a60f32a0687a5bcac3
 2014-12-15 11:00:25 -08:00
Rich Slogar
c819d3df86 docs: studio revision 21 update 
Change-Id: I61a6fa657aae08760a73816d5ad5536957a3be20
 2014-12-15 10:46:18 -08:00