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

163809 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andrew Solovay
b489a6d14f am cf34a6d1: am 46bda6a4: am 6fd36f11: am ae279bd5: Merge "docs: Fixed typo (spurious quotation mark)." into lmp-docs 
* commit 'cf34a6d1a19853fe156bf14abcb40a01a380de79':
  docs: Fixed typo (spurious quotation mark).
 2015-03-19 01:26:04 +00:00
Andrew Solovay
006d751215 am a0141748: am 42f966c9: am dbec5ae6: am 0aef0abf: Merge "docs: Fixed broken image link, and broke long lines in code samples" into lmp-docs 
* commit 'a01417485279a486df31f8666b037b6f15d7f935':
  docs: Fixed broken image link, and broke long lines in code samples
 2015-03-19 01:25:57 +00:00
Andrew Solovay
cf34a6d1a1 am 46bda6a4: am 6fd36f11: am ae279bd5: Merge "docs: Fixed typo (spurious quotation mark)." into lmp-docs 
* commit '46bda6a4838e592fd3cc0d9334ae92cdc7434f3e':
  docs: Fixed typo (spurious quotation mark).
 2015-03-19 00:55:08 +00:00
Andrew Solovay
a014174852 am 42f966c9: am dbec5ae6: am 0aef0abf: Merge "docs: Fixed broken image link, and broke long lines in code samples" into lmp-docs 
* commit '42f966c9df6ed4e7903e87ad557d63ed81da2986':
  docs: Fixed broken image link, and broke long lines in code samples
 2015-03-19 00:55:01 +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
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
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
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
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
Deepanshu Gupta
38467b5fbb am 9a00f1c8: am 79f7fce7: am 2e4d9324: Fix NoActionBar themes rendering. 
* commit '9a00f1c84b7a7936a12415a08604ac8fb98ec5ea':
  Fix NoActionBar themes rendering.
 2015-03-17 14:28:33 +00:00
Deepanshu Gupta
1f9a26af95 am 158c08bc: am ada85905: Fix AppCompat action bar theming. 
* commit '158c08bcf1cd0bc702748ee2a4cf6aa259c26147':
  Fix AppCompat action bar theming.
 2015-03-17 14:16:50 +00:00
Deepanshu Gupta
9a00f1c84b am 79f7fce7: am 2e4d9324: Fix NoActionBar themes rendering. 
* commit '79f7fce7a49e7b7cd414ff5c3fdb5cbaae45c1f1':
  Fix NoActionBar themes rendering.
 2015-03-17 14:16:42 +00:00
Deepanshu Gupta
158c08bcf1 am ada85905: Fix AppCompat action bar theming. 
* commit 'ada8590547348b77d8cbd56abdb8fadb3e72c015':
  Fix AppCompat action bar theming.
 2015-03-17 00:21:02 +00:00
Deepanshu Gupta
79f7fce7a4 am 2e4d9324: Fix NoActionBar themes rendering. 
* commit '2e4d93245764a1c1d7515361ddbb8fc1665f814e':
  Fix NoActionBar themes rendering.
 2015-03-17 00:20:58 +00:00
Deepanshu Gupta
ada8590547 Fix AppCompat action bar theming. 
Use themed context to inflate the action bar when AppCompat is used.
Also fix minor issues exposed as a result.

 - Set project callback when LayoutInflater is created by
   LayoutInflater.from(context).
 - Remove duplication of code to get base context from context wrapper.

Bug: http://b.android.com/159711
Change-Id: I379ba2ba71c0ef547460987c3aa5db521c7de967
 2015-03-16 11:45:00 -07:00
Geoff Mendal
74c66d10a7 Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 2015-03-16 13:05:43 +00:00
Geoff Mendal
de4be3bc2c Import translations. DO NOT MERGE 
Change-Id: I17a68a6a20954432a352e132ac02cb0c9597e1d3
Auto-generated-cl: translation import
 2015-03-16 05:52:00 -07:00
Geoff Mendal
57d39a3d70 Import translations. DO NOT MERGE 
Change-Id: Icc111cdfe84d93d8212be18ba9815a50a83f059c
Auto-generated-cl: translation import
 2015-03-16 05:48:31 -07:00
Michael Wright
561d104367 Prevent activities from being started during setup wizard. 
Bug: 19677145
Change-Id: I1d7ca7b25077652355aa55848f973efa69d4b654
 2015-03-13 19:51:28 -07:00
Deepanshu Gupta
2e4d932457 Fix NoActionBar themes rendering. 
Also fix some warnings.

Bug: http://b.android.com/159780
Change-Id: I64fd4259b802722af7a271f51d5943018ed11e9e
 2015-03-13 14:28:14 -07:00
Andrew Solovay
a83fd76089 docs: Fixed typo (spurious quotation mark). 
See first comment for stage location.

bug: 18612085
Change-Id: I4c29a087621d1c62596838d30b2654ee136cecd1
 2015-03-13 13:52:04 -07:00
Andrew Solovay
a8b5b2512f docs: Fixed broken image link, and broke long lines in code samples 
While I had gridview open (per the bug), I also checked the other
files in that directory for broken image links (in case this stemmed
from a doc reorg). I didn't find any broken images, but I did find
a couple of code samples that unnecessarily had horizontal scroll
bars, so I fixed those.

See first comment for doc stage location.

bug: 19611361
Change-Id: I983a09aaee5e2b1747376748c1aa46341c31a3c2
 2015-03-13 12:46:37 -07:00
Luan Nguyen
0c89bdb7a7 am 0d756f7d: am 217a4356: am a8bdd2f3: am 42bb44db: Merge "docs: Remove deprecated Fitness information from this doc. Guides have been moved to developers.google.com/fit" into lmp-docs 
* commit '0d756f7d5646f84753a3db5f702f4ac79bda22bf':
  docs: Remove deprecated Fitness information from this doc. Guides have been moved to developers.google.com/fit
 2015-03-13 18:28:45 +00:00
Luan Nguyen
0d756f7d56 am 217a4356: am a8bdd2f3: am 42bb44db: Merge "docs: Remove deprecated Fitness information from this doc. Guides have been moved to developers.google.com/fit" into lmp-docs 
* commit '217a435665880076abb71085e9d76aec4ff83b6d':
  docs: Remove deprecated Fitness information from this doc. Guides have been moved to developers.google.com/fit
 2015-03-13 18:13:39 +00:00
Luan Nguyen
217a435665 am a8bdd2f3: am 42bb44db: Merge "docs: Remove deprecated Fitness information from this doc. Guides have been moved to developers.google.com/fit" into lmp-docs 
* commit 'a8bdd2f341ded0f2096e2750d176873e3e9e89c7':
  docs: Remove deprecated Fitness information from this doc. Guides have been moved to developers.google.com/fit
 2015-03-13 17:57:02 +00:00
Luan Nguyen
a8bdd2f341 am 42bb44db: Merge "docs: Remove deprecated Fitness information from this doc. Guides have been moved to developers.google.com/fit" into lmp-docs 
* commit '42bb44dbf5bffc5d3fcf89eacfd5c561dbe8095c':
  docs: Remove deprecated Fitness information from this doc. Guides have been moved to developers.google.com/fit
 2015-03-13 17:49:46 +00:00
Luan Nguyen
42bb44dbf5 Merge "docs: Remove deprecated Fitness information from this doc. Guides have been moved to developers.google.com/fit" into lmp-docs 2015-03-13 17:42:15 +00:00
Craig Mautner
7151b1ef42 am 98560bdf: am bfcc60a3: am 2825a9c6: am 470ad0fa: Merge "Correct docs to specify leading slash in paths." into lmp-docs 
* commit '98560bdf87ad5f97054b13d3c92954132584c7f7':
  Correct docs to specify leading slash in paths.
 2015-03-13 00:37:32 +00:00
Craig Mautner
98560bdf87 am bfcc60a3: am 2825a9c6: am 470ad0fa: Merge "Correct docs to specify leading slash in paths." into lmp-docs 
* commit 'bfcc60a3f03ff25dccb5277626da213b1e254ccd':
  Correct docs to specify leading slash in paths.
 2015-03-13 00:29:21 +00:00
Craig Mautner
bfcc60a3f0 am 2825a9c6: am 470ad0fa: Merge "Correct docs to specify leading slash in paths." into lmp-docs 
* commit '2825a9c618840c1cf3d59806a794674f12a7c7c6':
  Correct docs to specify leading slash in paths.
 2015-03-13 00:22:33 +00:00