Brian Carlstrom
88dde1db44
am d8507e3a: am 83419118: am 97f3cd0a: Merge "Update vmSafeMode documentation" into lmp-mr1-dev
...
* commit 'd8507e3aa4c8b05f753cd9541014c391891c1f75':
Update vmSafeMode documentation
2015-03-17 19:44:55 +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
81c47fc23a
am 86318d76: Merge "Option for going home when going to sleep for devices without physical button." into lmp-mr1-modular-dev
...
* commit '86318d768a2c5043e1261e9daacf1497d1e4a732':
Option for going home when going to sleep for devices without physical button.
2015-03-17 18:35:17 +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
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
199a70f182
am 576801ff: am 842eee9f: am 1f9a26af: am 158c08bc: am ada85905: Fix AppCompat action bar theming.
...
* commit '576801ff82a85c4de19404dfe364eef7184b84e0':
Fix AppCompat action bar theming.
2015-03-17 14:44:52 +00:00
Deepanshu Gupta
0f8c9d1df2
am a5be9a7d: am 38467b5f: am 9a00f1c8: am 79f7fce7: am 2e4d9324: Fix NoActionBar themes rendering.
...
* commit 'a5be9a7d2d2cbcd3892fc916c9a944745024881d':
Fix NoActionBar themes rendering.
2015-03-17 14:44:46 +00:00
Mathieu Chartier
5ec7c78d52
am 008ec61e: Merge "Change jit properties to be debug properties"
...
* commit '008ec61e0ccff0ca92cc0d2b5b73a1d620d3aad3':
Change jit properties to be debug properties
2015-03-17 14:36:50 +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
Mathieu Chartier
008ec61e0c
Merge "Change jit properties to be debug properties"
2015-03-17 02:04:34 +00:00
Andreas Gampe
14e436aec4
am 345a8f69: Merge "Frameworks/base: Fix a comparison"
...
* commit '345a8f69ea2acd6d3ecf4c200cb33e8037f8798c':
Frameworks/base: Fix a comparison
2015-03-17 00:25:04 +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
Andreas Gampe
345a8f69ea
Merge "Frameworks/base: Fix a comparison"
2015-03-17 00:12:25 +00:00
Mathieu Chartier
1ad10ef1e4
Change jit properties to be debug properties
...
Bug: 19735273
Change-Id: I266cf447a7af0595366bf89109d2823094f5cf41
2015-03-16 16:22:52 -07:00
Quddus Chong
180b835480
docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #1784785 .
...
Change-Id: Iea6a787896d22ec29702fc7370d9ad702af051b7
2015-03-16 15:48:18 -07:00
Luan Nguyen
8662c04fd7
docs: Add distribution guidelines and update quality checklist
...
for Android Auto.
Change-Id: Ie504fee6ee32fd24d332ff65004a6b711e7fe3ec
2015-03-16 13:54:51 -07:00
Andreas Gampe
7f95a1bc32
am 5eb42122: Merge "Frameworks/base: Force long computation"
...
* commit '5eb421221bcade4f5715d42843346f7d3c733547':
Frameworks/base: Force long computation
2015-03-16 20:49:12 +00:00
Andreas Gampe
5eb421221b
Merge "Frameworks/base: Force long computation"
2015-03-16 20:37:02 +00:00
Andreas Gampe
e685753136
am f3e581c9: Merge "Frameworks/base: Check before foreach in Script"
...
* commit 'f3e581c99f33ae1857fa52b11cf9bfbfe400c553':
Frameworks/base: Check before foreach in Script
2015-03-16 19:31:17 +00:00
Andreas Gampe
c3228a9d40
am 3d33314e: Merge "Frameworks/base: Use equals for Integer comparison"
...
* commit '3d33314e03c24758e3b3bbd9e23e40199a259b80':
Frameworks/base: Use equals for Integer comparison
2015-03-16 19:22:00 +00:00
Andreas Gampe
f3e581c99f
Merge "Frameworks/base: Check before foreach in Script"
2015-03-16 19:17:45 +00:00
Andreas Gampe
3d33314e03
Merge "Frameworks/base: Use equals for Integer comparison"
2015-03-16 19:10:40 +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
Andreas Gampe
8af305f17f
am 6878ee57: Merge "Revert "Frameworks/base: Fix a constructor""
...
* commit '6878ee57b438b063fcc09a19a04fba92e113c1d2':
Revert "Frameworks/base: Fix a constructor"
2015-03-16 18:03:17 +00:00
Andreas Gampe
6878ee57b4
Merge "Revert "Frameworks/base: Fix a constructor""
2015-03-16 17:51:15 +00:00
Andreas Gampe
8c80efeaeb
Revert "Frameworks/base: Fix a constructor"
...
The constructor was public API, doh. Gotta do this differently.
This reverts commit 33c5b2a62f3e62382c41e24c6b527119978816a0.
Change-Id: Iadca87fe6a8866a8bd9d6f2a91578ec0d4c44691
2015-03-16 17:51:01 +00:00
Andreas Gampe
8e176d396d
am 007e207b: Merge "Frameworks/base: Fix null-pointer check"
...
* commit '007e207bdeda3f0143eba8f52db3e72bf7487efb':
Frameworks/base: Fix null-pointer check
2015-03-16 17:12:57 +00:00
Andreas Gampe
19279ec048
am d61cbf9a: Merge "Frameworks/base: Fix a constructor"
...
* commit 'd61cbf9a08733b45a6aecafffffa60da269a3e1e':
Frameworks/base: Fix a constructor
2015-03-16 17:03:02 +00:00
Andreas Gampe
007e207bde
Merge "Frameworks/base: Fix null-pointer check"
2015-03-16 16:59:14 +00:00
Andreas Gampe
d61cbf9a08
Merge "Frameworks/base: Fix a constructor"
2015-03-16 16:51:01 +00:00
Robert Greenwalt
7cff91ea67
am 079cfa64: Merge "Frameworks/base: Fix a hashCode implementation"
...
* commit '079cfa64ec827e80d3173e2043218866f1b36146':
Frameworks/base: Fix a hashCode implementation
2015-03-16 16:29:52 +00:00
Robert Greenwalt
079cfa64ec
Merge "Frameworks/base: Fix a hashCode implementation"
2015-03-16 16:17:51 +00: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
Andreas Gampe
038b846284
am 5abcd06b: Merge "Frameworks/base: Fix always-false equals"
...
* commit '5abcd06b1f673a2d59d1aba5f4b95fe741ace274':
Frameworks/base: Fix always-false equals
2015-03-16 15:43:37 +00:00
Andreas Gampe
5abcd06b1f
Merge "Frameworks/base: Fix always-false equals"
2015-03-16 15:28:53 +00:00
John Reck
059ba9814b
am 386dcbdd: Merge "Frameworks/base: Fix missing cast"
...
* commit '386dcbddf5c166f98209b78389e79d49ab3a8222':
Frameworks/base: Fix missing cast
2015-03-16 15:09:04 +00:00
John Reck
386dcbddf5
Merge "Frameworks/base: Fix missing cast"
2015-03-16 14:56:52 +00:00
Geoff Mendal
c64f5ca02b
am 0134869b: (-s ours) am 74c66d10: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
...
* commit '0134869b5c81771ae3e3251fa42ac6c478e62f5a':
Import translations. DO NOT MERGE
2015-03-16 13:14:52 +00:00
Geoff Mendal
4777b612e0
am 3437d9e7: (-s ours) am 57d39a3d: (-s ours) Import translations. DO NOT MERGE
...
* commit '3437d9e716e477d407dfc13cc797500e6421e464':
Import translations. DO NOT MERGE
2015-03-16 13:14:47 +00: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