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

103641 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joe Malin
89cded957c am 39069b6e: am efb3726c: am 2b8f3734: am e3c549fc: am cd70c873: Merge "Android U: Making Apps Location-Aware" into jb-mr1.1-docs 
* commit '39069b6e82fa848608d56b4efc8f28785816fe27':
  Android U: Making Apps Location-Aware
 2013-05-13 23:36:58 -07:00
Joe Malin
39069b6e82 am efb3726c: am 2b8f3734: am e3c549fc: am cd70c873: Merge "Android U: Making Apps Location-Aware" into jb-mr1.1-docs 
* commit 'efb3726c226001149c92d48fa50da7031c231490':
  Android U: Making Apps Location-Aware
 2013-05-13 23:34:47 -07:00
Joe Malin
efb3726c22 am 2b8f3734: am e3c549fc: am cd70c873: Merge "Android U: Making Apps Location-Aware" into jb-mr1.1-docs 
* commit '2b8f3734c485870d5f27fc9010932aaf83b7ccfc':
  Android U: Making Apps Location-Aware
 2013-05-13 23:31:01 -07:00
Joe Malin
2b8f3734c4 am e3c549fc: am cd70c873: Merge "Android U: Making Apps Location-Aware" into jb-mr1.1-docs 
* commit 'e3c549fca27ad075deeb901df9701cf74d0a62fe':
  Android U: Making Apps Location-Aware
 2013-05-13 23:29:08 -07:00
Joe Malin
e3c549fca2 am cd70c873: Merge "Android U: Making Apps Location-Aware" into jb-mr1.1-docs 
* commit 'cd70c8736919a2750777ba5c7f655c650584fcf4':
  Android U: Making Apps Location-Aware
 2013-05-13 23:27:13 -07:00
Joe Malin
cd70c87369 Merge "Android U: Making Apps Location-Aware" into jb-mr1.1-docs 2013-05-14 04:12:17 +00:00
Joe Malin
3ddba7ee37 Android U: Making Apps Location-Aware 
Change-Id: I8f44c6ca6d797ceb8ada5b2c723a8cca0081cf0a
 2013-05-13 20:50:22 -07:00
Jeff Brown
0500297714 Merge "Include support library resource modules when building docs." into jb-mr2-dev 2013-05-14 00:33:21 +00:00
Scott Main
2abe99b9a0 am b4e1c857: am 25d193e9: am 7c840551: add Nav Drawer lesson and revise other lessons with updated API recommendations for back stacking and a revised structure that separates itself from the design-centric terminology. 
* commit 'b4e1c8572aeee78a91f340c9607d3e934adae030':
  add Nav Drawer lesson and revise other lessons with updated API recommendations for back stacking and a revised structure that separates itself from the design-centric terminology.
 2013-05-13 16:10:43 -07:00
Scott Main
b4e1c8572a am 25d193e9: am 7c840551: add Nav Drawer lesson and revise other lessons with updated API recommendations for back stacking and a revised structure that separates itself from the design-centric terminology. 
* commit '25d193e94529facb1e55cacafa6d6fb5e850ab00':
  add Nav Drawer lesson and revise other lessons with updated API recommendations for back stacking and a revised structure that separates itself from the design-centric terminology.
 2013-05-13 16:07:55 -07:00
Scott Main
25d193e945 am 7c840551: add Nav Drawer lesson and revise other lessons with updated API recommendations for back stacking and a revised structure that separates itself from the design-centric terminology. 
* commit '7c8405513675c47205a68c0644f6046eebefc5a3':
  add Nav Drawer lesson and revise other lessons with updated API recommendations for back stacking and a revised structure that separates itself from the design-centric terminology.
 2013-05-13 16:04:31 -07:00
Scott Main
7c84055136 add Nav Drawer lesson and revise other lessons with updated 
API recommendations for back stacking and a revised structure
that separates itself from the design-centric terminology.

Change-Id: I0b3494cbaa3dc2dac2fb3003c6f4cf2f3145323b
 2013-05-13 15:59:57 -07:00
Robert Greenwalt
28d3dbf969 Merge "Remove wifi scan-always dialog." into jb-mr2-dev 2013-05-13 21:11:32 +00:00
Dirk Dougherty
98f9956d2a am 94f39d32: am 1a9fa15c: am be1db97c: am 0bcf7f54: am e6f1a2ab: Merge "Doc change: Updates to gpgs landing." into jb-mr1.1-docs 
* commit '94f39d329abec5e567e36dd2f22a4486dc507f4b':
  Doc change: Updates to gpgs landing.
 2013-05-13 12:14:20 -07:00
Dirk Dougherty
94f39d329a am 1a9fa15c: am be1db97c: am 0bcf7f54: am e6f1a2ab: Merge "Doc change: Updates to gpgs landing." into jb-mr1.1-docs 
* commit '1a9fa15cca400abc9f66862de05cf991eb4b7ccc':
  Doc change: Updates to gpgs landing.
 2013-05-13 12:10:30 -07:00
Dirk Dougherty
1a9fa15cca am be1db97c: am 0bcf7f54: am e6f1a2ab: Merge "Doc change: Updates to gpgs landing." into jb-mr1.1-docs 
* commit 'be1db97c36ae9b6a3b031ddd92547364c155cdfd':
  Doc change: Updates to gpgs landing.
 2013-05-13 12:08:25 -07:00
Dirk Dougherty
be1db97c36 am 0bcf7f54: am e6f1a2ab: Merge "Doc change: Updates to gpgs landing." into jb-mr1.1-docs 
* commit '0bcf7f54e807d4aeb58bf4ec9a2831c11c6b000d':
  Doc change: Updates to gpgs landing.
 2013-05-13 12:06:02 -07:00
Dirk Dougherty
0bcf7f54e8 am e6f1a2ab: Merge "Doc change: Updates to gpgs landing." into jb-mr1.1-docs 
* commit 'e6f1a2abaf24d9a9c4f91d2e76679d47ece1069b':
  Doc change: Updates to gpgs landing.
 2013-05-13 12:02:48 -07:00
Dirk Dougherty
e6f1a2abaf Merge "Doc change: Updates to gpgs landing." into jb-mr1.1-docs 2013-05-13 19:00:25 +00:00
Dirk Dougherty
1178e44bf4 Doc change: Updates to gpgs landing. 
Change-Id: Iec8aea322ec7ad7fde176171ed8a63fdbff4744b
 2013-05-13 11:57:51 -07:00
Robert Greenwalt
aee3d28763 Remove wifi scan-always dialog. 
Removes intent type for dialog and Setting on whether to show
dialog.

bug:8907190
Change-Id: Id37e03126d4afdfd7d921132a57233b84603c8bd
 2013-05-13 11:32:31 -07:00
Fabrice Di Meglio
b4426f155f Merge "Fix bug #8858012 layer-list's bitmap item's start/end gravity is incorrect on RTL under certain conditions" into jb-mr2-dev 2013-05-13 18:18:17 +00:00
Joe Fernandez
8ba56f862d am 44f93922: am 8964ac0f: am 013a4ba0: Merge "docs: Android Support Library r13 Release Notes" into jb-mr1.1-ub-dev 
* commit '44f93922c6b0774152725af69d623189e0ce71a5':
  docs: Android Support Library r13 Release Notes
 2013-05-13 10:48:07 -07:00
Joe Fernandez
44f93922c6 am 8964ac0f: am 013a4ba0: Merge "docs: Android Support Library r13 Release Notes" into jb-mr1.1-ub-dev 
* commit '8964ac0f5e0bd99c42bf70280751d5a578f893d1':
  docs: Android Support Library r13 Release Notes
 2013-05-13 10:44:44 -07:00
Joe Fernandez
8964ac0f5e am 013a4ba0: Merge "docs: Android Support Library r13 Release Notes" into jb-mr1.1-ub-dev 
* commit '013a4ba05d641b6778b6d5c6f9bef58ffb0aa134':
  docs: Android Support Library r13 Release Notes
 2013-05-13 10:41:35 -07:00
Joe Fernandez
013a4ba05d Merge "docs: Android Support Library r13 Release Notes" into jb-mr1.1-ub-dev 2013-05-13 17:39:01 +00:00
Joe Fernandez
41ad895f38 docs: Android Support Library r13 Release Notes 
Release notes for Google I/O 2013 / SDK 22 release, including
DrawerLayout and SlidingPaneLayout classes.

Change-Id: Ibebcec7f34da59a0779b4e83e135d22d2d791542
 2013-05-13 10:29:16 -07:00
Dirk Dougherty
dc4f96a04d am 8cd0c685: am dec1d413: am ba3e973f: am 4e98f9d3: am 730c32c5: Doc change: update gps 3.1 reference docs. 
* commit '8cd0c6858273b01801118d3ecea89cf746fe6b33':
  Doc change: update gps 3.1 reference docs.
 2013-05-13 10:10:37 -07:00
Dirk Dougherty
8cd0c68582 am dec1d413: am ba3e973f: am 4e98f9d3: am 730c32c5: Doc change: update gps 3.1 reference docs. 
* commit 'dec1d413f4e6f20d0d97f19baa59542fdf90e323':
  Doc change: update gps 3.1 reference docs.
 2013-05-13 10:07:32 -07:00
Dirk Dougherty
dec1d413f4 am ba3e973f: am 4e98f9d3: am 730c32c5: Doc change: update gps 3.1 reference docs. 
* commit 'ba3e973f290bc10854a21e7cbc4bb6e688403e61':
  Doc change: update gps 3.1 reference docs.
 2013-05-13 10:03:57 -07:00
Dirk Dougherty
ba3e973f29 am 4e98f9d3: am 730c32c5: Doc change: update gps 3.1 reference docs. 
* commit '4e98f9d3f272baab351dbeef38ebc84b0f76236e':
  Doc change: update gps 3.1 reference docs.
 2013-05-13 10:01:00 -07:00
Dirk Dougherty
4e98f9d3f2 am 730c32c5: Doc change: update gps 3.1 reference docs. 
* commit '730c32c5acede2a1e56f904bd8b66191c4f53b1b':
  Doc change: update gps 3.1 reference docs.
 2013-05-13 09:59:05 -07:00
Baligh Uddin
c412ee0fae Import translations. DO NOT MERGE 
Change-Id: Ie2f2c1b3b57497319ee56f46276efeff78660e0b
Auto-generated-cl: translation import
 2013-05-13 07:26:59 -07:00
Kristian Monsen
6e7ed13b12 Merge "Fix for bug 8623163: Call view methods on the UI thread" into jb-mr2-dev 2013-05-13 09:30:07 +00:00
Chris Wren
c7588aa391 Merge "restart notification listener on package add" into jb-mr2-dev 2013-05-12 22:04:05 +00:00
Dirk Dougherty
730c32c5ac Doc change: update gps 3.1 reference docs. 
Bug: 8918191
Change-Id: I3b74aad404eee7420673e04d13a2eb31b60ec833
 2013-05-11 23:18:35 -07:00
Dmitry Shmidt
de1361fa12 Merge "P2P: Turn OFF PS-mode for DHCP session" into jb-mr2-dev 2013-05-11 16:50:38 +00:00
Jeff Brown
ae1d6f2fd3 Include support library resource modules when building docs. 
Bug: 8175766
Change-Id: I0f0739d9f71386bae6c4ad23a2eb33e38d6a2d87
 2013-05-10 20:37:12 -07:00
Fabrice Di Meglio
731ba6649a Fix bug #8858012 layer-list's bitmap item's start/end gravity is incorrect on RTL under certain conditions 
- set correct layout direction for Drawable

Change-Id: Ic8968acadbc7c9aa0bb68dd4dfbe09aa4e7cfa62
 2013-05-10 19:21:35 -07:00
Robert Greenwalt
9e2632037d Merge "Fix for P2P GO beaconing when 4way Handshake fails" into jb-mr2-dev 2013-05-11 01:15:37 +00:00
Dmitry Shmidt
e25f9d246e P2P: Turn OFF PS-mode for DHCP session 
Bug: 8494584

Change-Id: I1d7519a40342538ab31ccad6210e47b3622ae31e
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
 2013-05-10 18:13:46 -07:00
Tim Murray
17502c4bc0 Merge "Remove extraneous logging." into jb-mr2-dev 2013-05-11 00:05:03 +00:00
Robert Greenwalt
c77e2d74ee Fix for P2P GO beaconing when 4way Handshake fails 
bug:8871100
Change-Id: I01276f13bfdd4bc23771414935d2a370223bf4fa
 2013-05-10 17:03:26 -07:00
Jeff Brown
9766caedf0 Merge "Add an API to determine if a route is connecting." into jb-mr2-dev 2013-05-10 23:10:33 +00:00
John Spurlock
11184922d3 Merge "Fix battery level quick settings tile bug." into jb-mr2-dev 2013-05-10 22:36:18 +00:00
Christopher Tate
1965b4479d Revert "The default home intent needs CATEGORY_DEFAULT" 
This reverts commit 1fea6b374f612ca8cedc17de873526f0f7c42a4e.

Bug 8895796

Change-Id: I80ecf1b718829c25e2a7adae956ebe9493cb3f33
 2013-05-10 15:01:02 -07:00
Svetoslav
b3c2b21b5b Merge "Accessibility should not query for list items when data set changed." into jb-mr2-dev 2013-05-10 20:06:42 +00:00
John Spurlock
d3fc956a11 Fix battery level quick settings tile bug. 
Bug: 8726138
Change-Id: I068a78f99ab30ffe24e620be7744cf7835142f56
 2013-05-10 15:58:55 -04:00
Chris Wren
3da7302dd2 restart notification listener on package add 
Bug: 8813471
Change-Id: Icf6c69811392c4567a5c842740e463fb957e7563
 2013-05-10 14:49:53 -04:00
Chris Craik
4329ee2565 Merge "Fix off by one error in log tracking" into jb-mr2-dev 2013-05-10 18:03:57 +00:00