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

164138 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Deepanshu Gupta
4f3b8527e3 Update JRE for runConfigurations. 
The intensive bridge tests use some libraries that are compiled with
1.7. All other tests are capable of running on JRE 1.6. Thus, change the
run configurations appropriately.

Change-Id: Iaea0fef2e58877578b36ac2ffe0b20b3a55f572c
 2015-03-18 17:03:15 -07:00
Deepanshu Gupta
6092c044aa Fix project settings. [DO NOT MERGE] 
1. Update layoutlib_api source path.
2. Update jdk version
3. Update nullity annotations.

Change-Id: I48db7dbd7ba5ff02fcf11672608b75e072385166
(cherry picked from commit 7b2cae5072321da5d67f9d12dea10871326f3477)
 2015-03-18 16:59:49 -07:00
Joe Fernandez
cdf130800b am ed657981: am 59d6c8bd: Merge "cherrypick from lmp-docs docs: Update auto landing and design page image assets Original Change-Id: I0382eaa82ee51ce4fce8287c36e8702c13ea8819" into lmp-docs 
* commit 'ed6579811f466db1e5e4058508c71e412472e71e':
  cherrypick from lmp-docs docs: Update auto landing and design page image assets Original Change-Id: I0382eaa82ee51ce4fce8287c36e8702c13ea8819
 2015-03-18 23:54:30 +00:00
Joe Fernandez
e31c904831 am 462dc7b9: am cb92819f: Merge "docs: Add distribution guidelines and update quality checklist for Android Auto." into lmp-docs 
* commit '462dc7b9ca508a6f61bb8dd494b67aa0d80eb57e':
  docs: Add distribution guidelines and update quality checklist for Android Auto.
 2015-03-18 23:54:22 +00:00
Eric Gilmore
f1598d1852 Changes for a quick, pre-migration bug sprint: 
Bug: 19679070, 19716684, 19680472.
Change-Id: I14ba1cf53ea42cd7739793fd9873e40e4a2ee6a0
 2015-03-18 16:53:47 -07:00
Joe Fernandez
ed6579811f am 59d6c8bd: Merge "cherrypick from lmp-docs docs: Update auto landing and design page image assets Original Change-Id: I0382eaa82ee51ce4fce8287c36e8702c13ea8819" into lmp-docs 
* commit '59d6c8bdaf6428f10d0c8bf144de7c39848ed868':
  cherrypick from lmp-docs docs: Update auto landing and design page image assets Original Change-Id: I0382eaa82ee51ce4fce8287c36e8702c13ea8819
 2015-03-18 23:47:26 +00:00
Joe Fernandez
462dc7b9ca am cb92819f: Merge "docs: Add distribution guidelines and update quality checklist for Android Auto." into lmp-docs 
* commit 'cb92819facfa4170623ba97130044a5700b4968b':
  docs: Add distribution guidelines and update quality checklist for Android Auto.
 2015-03-18 23:47:22 +00:00
Joe Fernandez
d2484a8a53 am 26e332bf: am 3bbb646b: Merge "Doc change: add docs for SafetyNet API." into lmp-docs 
* commit '26e332bf6e99845541d2056fe6a1a418f9409bdb':
  Doc change: add docs for SafetyNet API.
 2015-03-18 23:43:31 +00:00
Quddus Chong
c63471ade6 am 51aa424a: am 9b278f56: Merge "docs: Updated \'What\'s New\' in Google Play services doc to reflect changes in GMS v7.0 (Orla). This content is scheduled to be published with the Orla SDK release." into lmp-docs 
* commit '51aa424aa1d69af9b91b5f834d1acb30e99df7b1':
  docs: Updated 'What's New' in Google Play services doc to reflect changes in GMS v7.0 (Orla). This content is scheduled to be published with the Orla SDK release.
 2015-03-18 23:43:27 +00:00
Quddus Chong
5192ac8d06 am f990241a: am abde3d83: Merge "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #1784785." into lmp-docs 
* commit 'f990241a74c9f885f249a78e98c8cd6b083ff1d7':
  docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #1784785.
 2015-03-18 23:43:22 +00:00
Joe Fernandez
59d6c8bdaf Merge "cherrypick from lmp-docs docs: Update auto landing and design page image assets Original Change-Id: I0382eaa82ee51ce4fce8287c36e8702c13ea8819" into lmp-docs 2015-03-18 23:41:56 +00:00
Joe Fernandez
cb92819fac Merge "docs: Add distribution guidelines and update quality checklist for Android Auto." into lmp-docs 2015-03-18 23:41:29 +00:00
Joe Fernandez
26e332bf6e am 3bbb646b: Merge "Doc change: add docs for SafetyNet API." into lmp-docs 
* commit '3bbb646b8a231731327d10a3a243e2f252e185f1':
  Doc change: add docs for SafetyNet API.
 2015-03-18 23:37:14 +00:00
Quddus Chong
51aa424aa1 am 9b278f56: Merge "docs: Updated \'What\'s New\' in Google Play services doc to reflect changes in GMS v7.0 (Orla). This content is scheduled to be published with the Orla SDK release." into lmp-docs 
* commit '9b278f5615966f1d642f2503759f6618292058bb':
  docs: Updated 'What's New' in Google Play services doc to reflect changes in GMS v7.0 (Orla). This content is scheduled to be published with the Orla SDK release.
 2015-03-18 23:37:09 +00:00
Quddus Chong
f990241a74 am abde3d83: Merge "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #1784785." into lmp-docs 
* commit 'abde3d83f86af44e2beedc2fc10bfc23a405a5d9':
  docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #1784785.
 2015-03-18 23:37:03 +00:00
Joe Fernandez
3bbb646b8a Merge "Doc change: add docs for SafetyNet API." into lmp-docs 2015-03-18 23:30:09 +00:00
Quddus Chong
9b278f5615 Merge "docs: Updated 'What's New' in Google Play services doc to reflect changes in GMS v7.0 (Orla). This content is scheduled to be published with the Orla SDK release." into lmp-docs 2015-03-18 23:29:57 +00:00
Quddus Chong
abde3d83f8 Merge "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #1784785." into lmp-docs 2015-03-18 23:29:44 +00:00
Dirk Dougherty
11e8057566 Doc change: add docs for SafetyNet API. 
Change-Id: I265320788718672ac117c9ff6033e48d1e9161a5
 2015-03-18 16:16:18 -07:00
Quddus Chong
b2a6185e25 docs: Updated 'What's New' in Google Play services doc to reflect changes in GMS v7.0 (Orla). This content is scheduled to be published with the Orla SDK release. 
Change-Id: I4154c04a3a64fce1ec314a40237ab4c5472d651c
 2015-03-18 16:11:23 -07:00
Andrew Solovay
3f7f78c651 am 27853819: am 78bbfe04: Merge "docs: Removed sentence fragments." into lmp-docs 
* commit '278538193c2eb68d13c3f8a741ab6c2274feb266':
  docs: Removed sentence fragments.
 2015-03-18 22:44:32 +00:00
Andrew Solovay
46bda6a483 am 6fd36f11: am ae279bd5: Merge "docs: Fixed typo (spurious quotation mark)." into lmp-docs 
* commit '6fd36f11bee008dae92ed312e4a8291417e6e93f':
  docs: Fixed typo (spurious quotation mark).
 2015-03-18 22:44:24 +00:00
Andrew Solovay
42f966c9df am dbec5ae6: am 0aef0abf: Merge "docs: Fixed broken image link, and broke long lines in code samples" into lmp-docs 
* commit 'dbec5ae69a8bcf10cfd6d483356d0fb904b73290':
  docs: Fixed broken image link, and broke long lines in code samples
 2015-03-18 22:44:09 +00:00
Andrew Solovay
278538193c am 78bbfe04: Merge "docs: Removed sentence fragments." into lmp-docs 
* commit '78bbfe049c5e7a0c2f7ac8fe39f45b11d9099a55':
  docs: Removed sentence fragments.
 2015-03-18 22:35:59 +00:00
Andrew Solovay
6fd36f11be am ae279bd5: Merge "docs: Fixed typo (spurious quotation mark)." into lmp-docs 
* commit 'ae279bd5b03f472d4bd1427365009269db9fe5e3':
  docs: Fixed typo (spurious quotation mark).
 2015-03-18 22:35:49 +00:00
Andrew Solovay
dbec5ae69a am 0aef0abf: Merge "docs: Fixed broken image link, and broke long lines in code samples" into lmp-docs 
* commit '0aef0abf3d3366c09a89d3132ff2ce5979988fc1':
  docs: Fixed broken image link, and broke long lines in code samples
 2015-03-18 22:35:45 +00:00
Andrew Solovay
78bbfe049c Merge "docs: Removed sentence fragments." into lmp-docs 2015-03-18 22:27:08 +00:00
Andrew Solovay
ae279bd5b0 Merge "docs: Fixed typo (spurious quotation mark)." into lmp-docs 2015-03-18 22:26:05 +00:00
Andrew Solovay
0aef0abf3d Merge "docs: Fixed broken image link, and broke long lines in code samples" into lmp-docs 2015-03-18 22:23:13 +00:00
Bart Sears
cc86bc0c92 am c2eb5c60: Merge "Prevent activities from being started during setup wizard." into lmp-mr1-dev 
* commit 'c2eb5c602d36d91483c8f24b0c6859e4283724b4':
  Prevent activities from being started during setup wizard.
 2015-03-18 20:28:59 +00:00
Bart Sears
c2eb5c602d Merge "Prevent activities from being started during setup wizard." into lmp-mr1-dev 2015-03-18 20:22:36 +00:00
Andrew Solovay
43100d3203 docs: Removed sentence fragments. 
These fragments were left over from the edit process for the original
CL (http://ag/586972). The paragraph they belong to was removed.

See first comment for doc stage location.

bug: 19793140
Change-Id: Iafa30c4036c57ba00b534d619cd1fa4135f60175
 2015-03-18 11:56:20 -07:00
Dan Sandler
7662079160 am b3a1b663: Merge "Avoid crashing on corrupted notifications." into lmp-mr1-dev 
* commit 'b3a1b6632e403926fed995e851a8e44fc944c663':
  Avoid crashing on corrupted notifications.
 2015-03-18 18:29:48 +00:00
Dan Sandler
b3a1b6632e Merge "Avoid crashing on corrupted notifications." into lmp-mr1-dev 2015-03-18 18:23:20 +00:00
Rich Slogar
96693b2977 am 8d3f587f: am 57c24fbb: am 2fc33a00: am ddc44153: docs: downloads for sdk 24.1.2 
* commit '8d3f587f15016d193e4739e3893b77e11336b498':
  docs: downloads for sdk 24.1.2
 2015-03-18 17:35:46 +00:00
Rich Slogar
8d3f587f15 am 57c24fbb: am 2fc33a00: am ddc44153: docs: downloads for sdk 24.1.2 
* commit '57c24fbb90dd7b342b06e2daecc1033f92d730da':
  docs: downloads for sdk 24.1.2
 2015-03-18 17:27:29 +00:00
Rich Slogar
57c24fbb90 am 2fc33a00: am ddc44153: docs: downloads for sdk 24.1.2 
* commit '2fc33a008c02cf408e1d270972bbf681c7a36785':
  docs: downloads for sdk 24.1.2
 2015-03-18 17:20:51 +00:00
Rich Slogar
2fc33a008c am ddc44153: docs: downloads for sdk 24.1.2 
* commit 'ddc44153295174e8195286c21d7edcd3962b3661':
  docs: downloads for sdk 24.1.2
 2015-03-18 17:13:55 +00:00
Geoff Mendal
54064f66c9 Import translations. DO NOT MERGE 
Change-Id: Ifd3f512fcd1aabd685f10218eceda8f4f83bb116
Auto-generated-cl: translation import
 2015-03-18 06:04:44 -07:00
Rich Slogar
ddc4415329 docs: downloads for sdk 24.1.2 
b.android 160727

Change-Id: I112badc736ce4b85fabe0b702a2b24800ee589bd
 2015-03-17 17:20:09 -07:00
Deepanshu Gupta
84e550f5e6 Fix layoutlib tests. 
The date picker and calendar widgets show the current date. Comparing
widgets showing current date with a static golden image wasn't the best
idea.

- Change the widgets to custom widgets that set a predefined date/time
  so that the rendering is independent of the system date.
- Change the layout slightly to make it look nicer.
- Update gradle plugin version.

Change-Id: Ia3fb4965a372a28087a0d8c9df40fd6779df6050
 2015-03-17 17:17:42 -07:00
Dong Zhou
94573dc551 am 89f41eb3: Define the capability to speed up MT call audio 
* commit '89f41eb39e910e220957ac861651ead17eff9085':
  Define the capability to speed up MT call audio
 2015-03-17 22:28:22 +00:00
Kenny Root
4ff668d47a Track change to Conscrypt 
(cherry picked from commit 9d2d6b6b4b1b16221cbd857703cd6301c6bf873c)

Bug: 19798387
Change-Id: I8814fd0720acf09332927f184fdd9b2cdac4f413
 2015-03-17 22:22:48 +00:00
Kenny Root
fbd8805cd7 Merge "Track change to Conscrypt" into lmp-mr1-ub-dev 2015-03-17 22:21:58 +00:00
Dong Zhou
89f41eb39e Define the capability to speed up MT call audio 
Bug: 19656525
Change-Id: I0bc88e85b807871b2883a785efac91bd0e1f6d8d
 2015-03-17 22:16:52 +00:00
Kenny Root
693ea60e9e Track change to Conscrypt 
Change way in which an outside caller can get the preferred SSLContext.

(cherry picked from commit 8a970637208207955fb6a719bd82902384b3c743)

Bug: 19798387
Bug: 17136008
Change-Id: Ide578664bcb605304322bfddd2e640a63042fa09
 2015-03-17 21:27:05 +00:00
Brian Carlstrom
83419118e3 am 97f3cd0a: Merge "Update vmSafeMode documentation" into lmp-mr1-dev 
* commit '97f3cd0a8280b2cf08069cc1e2d89d8bb227633f':
  Update vmSafeMode documentation
 2015-03-17 19:29:20 +00:00
Brian Carlstrom
97f3cd0a82 Merge "Update vmSafeMode documentation" into lmp-mr1-dev 2015-03-17 19:22:46 +00:00
Dan Sandler
06433bd9f3 Avoid crashing on corrupted notifications. 
If a notification content view has an @id/icon or
@id/right_icon, we need to make sure those ImageViews
actually have a drawable inside.

Bug: 19487078
Change-Id: I4ef6c4a10926823aa8680628097ed150d9e717d4
 2015-03-17 16:34:34 +00:00
Deepanshu Gupta
842eee9f81 am 1f9a26af: am 158c08bc: am ada85905: Fix AppCompat action bar theming. 
* commit '1f9a26af95abba385b612c734d1d5e32d9e3f363':
  Fix AppCompat action bar theming.
 2015-03-17 14:28:37 +00:00