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

164025 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Geoff Mendal
8d889a67d0 Import translations. DO NOT MERGE 
Change-Id: I046ce211561d45c3ee6b1763a7578d9ac54f3c90
Auto-generated-cl: translation import
 2015-03-18 05:47:44 -07:00
Filip Gruszczynski
7bd2feda9e Merge "Add animation to zeroing burn in protection." into lmp-mr1-modular-dev 2015-03-17 20:38:35 +00:00
Brian Carlstrom
d8507e3aa4 am 83419118: am 97f3cd0a: Merge "Update vmSafeMode documentation" into lmp-mr1-dev 
* commit '83419118e3c72311ef6b900457d1b03fd5c77883':
  Update vmSafeMode documentation
 2015-03-17 19:36:19 +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
Filip Gruszczynski
17413eb575 Add animation to zeroing burn in protection. 
Also don't shift immediately after starting ambient mode, but wait until
the first update.

Bug: 19521822
Change-Id: Id0b267d0f30e4533195dcfadbed726db0866e4db
 2015-03-17 11:30:12 -07:00
Filip Gruszczynski
86318d768a Merge "Option for going home when going to sleep for devices without physical button." into lmp-mr1-modular-dev 2015-03-17 18:29:30 +00:00
Deepanshu Gupta
576801ff82 am 842eee9f: am 1f9a26af: am 158c08bc: am ada85905: Fix AppCompat action bar theming. 
* commit '842eee9f816a2e35bf3c9ce6c14cd5e43684265b':
  Fix AppCompat action bar theming.
 2015-03-17 14:36:05 +00:00
Deepanshu Gupta
a5be9a7d2d am 38467b5f: am 9a00f1c8: am 79f7fce7: am 2e4d9324: Fix NoActionBar themes rendering. 
* commit '38467b5fbbc09ad05624454f735d27ada25565c8':
  Fix NoActionBar themes rendering.
 2015-03-17 14:35:58 +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
Filip Gruszczynski
9779e128d6 Option for going home when going to sleep for devices without physical button. 
Bug: 19623388
Change-Id: Iec16f83c64646ded12ec97d4b540510b7f9dfd47
 2015-03-16 08:57:17 -07:00
Geoff Mendal
0134869b5c am 74c66d10: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 
* commit '74c66d10a7b2237f8aaf8c10675a10b9347860f4':
  Import translations. DO NOT MERGE
 2015-03-16 13:07:29 +00:00
Geoff Mendal
3437d9e716 am 57d39a3d: (-s ours) Import translations. DO NOT MERGE 
* commit '57d39a3d70cf820e830c351d9d7fbb5d16d42ecf':
  Import translations. DO NOT MERGE
 2015-03-16 13:07:26 +00: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
eb1aec7fef Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev 2015-03-16 12:50:20 +00:00
Geoff Mendal
9a03622927 Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev 2015-03-16 12:49:40 +00: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
Geoff Mendal
f3e18606f7 Import translations. DO NOT MERGE 
Change-Id: I6ecfa92145f12da6a6101a84c9fd10db911948a1
Auto-generated-cl: translation import
 2015-03-16 05:35:33 -07:00
Geoff Mendal
c6c9079a61 Import translations. DO NOT MERGE 
Change-Id: I50b5dec066f0ded04d173b768fe2285f9eebf81d
Auto-generated-cl: translation import
 2015-03-16 07:35:06 -05:00
Geoff Mendal
e35b3e380f Import translations. DO NOT MERGE 
Change-Id: I9f312c6b5a86264eb96437751fefd5957383b400
Auto-generated-cl: translation import
 2015-03-16 05:31:48 -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
Luan Nguyen
d9eb3881f4 am 0c89bdb7: 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 '0c89bdb7a7eb491c503c369c0f1d9e523c8ae34a':
  docs: Remove deprecated Fitness information from this doc. Guides have been moved to developers.google.com/fit
 2015-03-13 18:42:03 +00: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
5be1afedd8 am 7151b1ef: am 98560bdf: am bfcc60a3: am 2825a9c6: am 470ad0fa: Merge "Correct docs to specify leading slash in paths." into lmp-docs 
* commit '7151b1ef4213207103a669602d6bb9502bc22a13':
  Correct docs to specify leading slash in paths.
 2015-03-13 00:46:51 +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
Craig Mautner
2825a9c618 am 470ad0fa: Merge "Correct docs to specify leading slash in paths." into lmp-docs 
* commit '470ad0fa1c0a4047c0a4c3d132a9ec3106e447ba':
  Correct docs to specify leading slash in paths.
 2015-03-13 00:17:36 +00:00
Craig Mautner
470ad0fa1c Merge "Correct docs to specify leading slash in paths." into lmp-docs 2015-03-13 00:09:31 +00:00
Roozbeh Pournader
07e01e07bb am 11b6e235: am db56b5a6: Move Noto Sans Tai Le to the end of the font fallback list. 
* commit '11b6e2358aac68691f016fca07ee82be3e815f2b':
  Move Noto Sans Tai Le to the end of the font fallback list.
 2015-03-12 17:52:54 +00:00
Roozbeh Pournader
11b6e2358a am db56b5a6: Move Noto Sans Tai Le to the end of the font fallback list. 
* commit 'db56b5a681b097f7649937e8ad4d73c1e560fb3b':
  Move Noto Sans Tai Le to the end of the font fallback list.
 2015-03-12 17:43:42 +00:00
Roozbeh Pournader
db56b5a681 Move Noto Sans Tai Le to the end of the font fallback list. 
This is to make sure the East Asian punctuation shared between CJK languages
and Tai Le are rendered from the CJK fonts when no language is specified
for the text, or CJK text is rendered in a non-CJK locale.

Also remove the old comment about 64k glyphs limit.

Bug: 19355391
Change-Id: Ic2cbc79cecf9539ace8a432f373685eeff81e106
(cherry picked from commit 70f0a4365bbffd016470807c9dbd7e9c1ea2df9d)
 2015-03-12 15:45:32 +00:00
Deepanshu Gupta
a4ed5e9411 am e770c5e4: am c44430a3: Merge "Tools attribute improvements for RecyclerView LayoutManager." into lmp-mr1-dev 
* commit 'e770c5e45a139d709976f8c1dbb821733968b5a8':
  Tools attribute improvements for RecyclerView LayoutManager.
 2015-03-12 01:55:16 +00:00
Deepanshu Gupta
e770c5e45a am c44430a3: Merge "Tools attribute improvements for RecyclerView LayoutManager." into lmp-mr1-dev 
* commit 'c44430a36813dc4afb6000279254e578bc5d0391':
  Tools attribute improvements for RecyclerView LayoutManager.
 2015-03-12 01:41:57 +00:00
Deepanshu Gupta
c44430a368 Merge "Tools attribute improvements for RecyclerView LayoutManager." into lmp-mr1-dev 2015-03-12 01:16:45 +00:00
Rich Slogar
1a27a3fb4e am 46005888: am 0146922a: am 633f4829: am 7256fb4f: am a6b0ddb7: Merge "docs: build image updates" into lmp-docs 
* commit '4600588868b7df38084915793db8eeb38e90ca5a':
  docs: build image updates
 2015-03-12 01:07:20 +00:00
Deepanshu Gupta
65215edd7a am f0d324e5: am 71ba1230: am efc09c64: am 78660423: Merge "Fix cyclic dependency in BlendComposite and BlendingMode." into lmp-dev 
* commit 'f0d324e531e395674f71b3944623bd17fe74b372':
  Fix cyclic dependency in BlendComposite and BlendingMode.
 2015-03-12 00:59:39 +00:00
Rich Slogar
4600588868 am 0146922a: am 633f4829: am 7256fb4f: am a6b0ddb7: Merge "docs: build image updates" into lmp-docs 
* commit '0146922a6fee8af01ffd6ea201cbb6de0dbd4ed8':
  docs: build image updates
 2015-03-12 00:59:35 +00:00
Deepanshu Gupta
f0d324e531 am 71ba1230: am efc09c64: am 78660423: Merge "Fix cyclic dependency in BlendComposite and BlendingMode." into lmp-dev 
* commit '71ba12308e338595d8068ff788bb5c8abfcfe515':
  Fix cyclic dependency in BlendComposite and BlendingMode.
 2015-03-12 00:52:53 +00:00