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

159703 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Wale Ogunwale
74bf065e43 Don't allow windows with invalid types to be added. 
Bug: 18950225
Change-Id: Ia7ead72d036c7628e0a97f8fe9fef2a35525e4df
 2015-01-12 14:01:25 -08:00
Ricardo Cervera
eec6dd779c am a87f3555: am d8bd117c: Merge "docs: Add parent calls to WatchFaces snippet." into lmp-docs 
* commit 'a87f35555d4aca13902a334691815cfa462feb30':
  docs: Add parent calls to WatchFaces snippet.
 2015-01-12 21:59:33 +00:00
Ricardo Cervera
a87f35555d am d8bd117c: Merge "docs: Add parent calls to WatchFaces snippet." into lmp-docs 
* commit 'd8bd117ce017d7e9b967d7949f8ca3e661e2cd39':
  docs: Add parent calls to WatchFaces snippet.
 2015-01-12 21:53:27 +00:00
Ricardo Cervera
d8bd117ce0 Merge "docs: Add parent calls to WatchFaces snippet." into lmp-docs 2015-01-12 21:49:23 +00:00
Joe Fernandez
d15b54d23f am 0bb84bb5: am 661ca547: am 8062f1f3: Merge "docs: Removing obsolete L-Preview docs and images" into lmp-docs 
* commit '0bb84bb5e2a137475718e31fb25f06b160163588':
  docs: Removing obsolete L-Preview docs and images
 2015-01-12 21:39:24 +00:00
Joe Fernandez
0bb84bb5e2 am 661ca547: am 8062f1f3: Merge "docs: Removing obsolete L-Preview docs and images" into lmp-docs 
* commit '661ca54706c146697fe45dfcf81840c25b9022b2':
  docs: Removing obsolete L-Preview docs and images
 2015-01-12 21:34:19 +00:00
Joe Fernandez
520a3c8258 am acd5f3ab: am 1946978c: am 76110e7c: docs: Remove Wear preview reference docs 
* commit 'acd5f3ab40c81b5267b4b551e0fd55ce839351b9':
  docs: Remove Wear preview reference docs
 2015-01-12 21:31:02 +00:00
Joe Fernandez
661ca54706 am 8062f1f3: Merge "docs: Removing obsolete L-Preview docs and images" into lmp-docs 
* commit '8062f1f34113f4d73d37ebb57245342cca9d8f9c':
  docs: Removing obsolete L-Preview docs and images
 2015-01-12 21:27:24 +00:00
Joe Fernandez
acd5f3ab40 am 1946978c: am 76110e7c: docs: Remove Wear preview reference docs 
* commit '1946978c5341fe06db287a4535769ea12e6b6745':
  docs: Remove Wear preview reference docs
 2015-01-12 21:25:42 +00:00
Joe Fernandez
8062f1f341 Merge "docs: Removing obsolete L-Preview docs and images" into lmp-docs 2015-01-12 21:23:17 +00:00
Joe Fernandez
1946978c53 am 76110e7c: docs: Remove Wear preview reference docs 
* commit '76110e7c46297a221d8f2c92fbaef46b6f405294':
  docs: Remove Wear preview reference docs
 2015-01-12 21:16:26 +00:00
Jason Monk
0a1eb640d2 Merge "Carrier text handle sim removal" into lmp-mr1-dev 2015-01-12 21:00:09 +00:00
Ricardo Cervera
afd23aba8e docs: Add parent calls to WatchFaces snippet. 
Bug: 18982021

Change-Id: I2b39255827826d1e097ccba97e90e92a587fc39b
 2015-01-12 12:54:32 -08:00
Prashant Malani
b71f9f96f7 Merge "Improve the circularMask for round displays" into lmp-mr1-dev 2015-01-12 18:34:46 +00:00
Joe Fernandez
76110e7c46 docs: Remove Wear preview reference docs 
These docs are out of date and unreachable due to redirect rules.

Change-Id: I76d9ccfff139b2377c45d71af2998a99b82a2f14
 2015-01-12 10:28:03 -08:00
Joe Fernandez
05d9a5107f docs: Removing obsolete L-Preview docs and images 
- /preview/images/
- TV Preview index pages
- Notifications preview page

Change-Id: I3e7c4e06bcdb6804fd83a80a8171a9d8e0c57117
 2015-01-12 10:20:41 -08:00
Eric Gilmore
c6a228511c am 3fca2e7f: am 10b829e1: am fec824b6: Merge "Adding Android Fundamentals video." into lmp-docs 
* commit '3fca2e7fee3d657c74406f8405bc1d669b9392e8':
  Adding Android Fundamentals video.
 2015-01-12 17:19:05 +00:00
Eric Gilmore
3fca2e7fee am 10b829e1: am fec824b6: Merge "Adding Android Fundamentals video." into lmp-docs 
* commit '10b829e126482c54657371485ecf425b3f05bb0f':
  Adding Android Fundamentals video.
 2015-01-12 17:13:14 +00:00
Eric Gilmore
10b829e126 am fec824b6: Merge "Adding Android Fundamentals video." into lmp-docs 
* commit 'fec824b6118a73bdc760acaf7dbd9420ffe7fe91':
  Adding Android Fundamentals video.
 2015-01-12 17:07:12 +00:00
Eric Gilmore
fec824b611 Merge "Adding Android Fundamentals video." into lmp-docs 2015-01-12 17:02:32 +00:00
Tyler Gunn
cd5d33c89f Fix for call timer resetting when starting IMS conference call. 1/4 
- Added support in Conference for specifying the connect time when the
conference is created.

Bug: 18959443
Change-Id: I501edde3b62f6bf021eb7455089e80626013da12
 2015-01-12 09:02:01 -08:00
Eric Gilmore
c726557cbd am 2c7e5631: am 7862ba29: am 6c8b80ac: Merge "Removing three obsolete lessons from TOC, which in turn removes them from building-userinfo.jd when built." into lmp-docs 
* commit '2c7e563181405ae6a91edb57f654f884b8759c8e':
  Removing three obsolete lessons from TOC, which in turn removes them from building-userinfo.jd when built.
 2015-01-12 16:55:40 +00:00
Eric Gilmore
2c7e563181 am 7862ba29: am 6c8b80ac: Merge "Removing three obsolete lessons from TOC, which in turn removes them from building-userinfo.jd when built." into lmp-docs 
* commit '7862ba297f7106ef0208e8f1dbbe9f9e35c63485':
  Removing three obsolete lessons from TOC, which in turn removes them from building-userinfo.jd when built.
 2015-01-12 16:46:35 +00:00
Eric Gilmore
7862ba297f am 6c8b80ac: Merge "Removing three obsolete lessons from TOC, which in turn removes them from building-userinfo.jd when built." into lmp-docs 
* commit '6c8b80acbb456b5b537137a181dc2ad4cbd07adc':
  Removing three obsolete lessons from TOC, which in turn removes them from building-userinfo.jd when built.
 2015-01-12 16:26:43 +00:00
Geoff Mendal
3d9875f477 Import translations. DO NOT MERGE 
Change-Id: I58457a1543f87145ae4a2c3292e49465939f715d
Auto-generated-cl: translation import
 2015-01-12 16:07:33 +00:00
Eric Laurent
695233fe83 Merge "AudioService: send connection intent for HDMI ARC device" into lmp-mr1-dev 2015-01-12 15:39:45 +00:00
Jason Monk
d74a331ae1 Merge "Avoid showing emergency calls when not possible" into lmp-mr1-dev 2015-01-12 14:01:04 +00:00
Etan Cohen
1691881763 Merge "Added configuration to determine whether VoLTE requires provisioning." into lmp-mr1-dev 2015-01-11 19:10:22 +00:00
Jinsuk Kim
f94d5d26f2 Merge "CEC: Keep Playback device awake while it is the active source" into lmp-mr1-dev 2015-01-10 21:59:40 +00:00
Deepanshu Gupta
2a9abb34d8 am aadcdef3: am 191d06b5: am 74147527: am 8505c387: Special case AppCompat to show action bar. automerge: bb600de automerge: 8d9361a 
* commit 'aadcdef312bac520e5352d687a642a87faf3c654':
 2015-01-10 10:19:28 +00:00
Deepanshu Gupta
f58aa34283 am 686160b8: am 74e00d22: Support Locale.toLanguageTag on Java 6 automerge: dbd64f7 automerge: 7da2b5d 
* commit '686160b854e845b79f74a526b397bb6dc438392b':
 2015-01-10 10:19:24 +00:00
Deepanshu Gupta
de8b66ffef am 7aafa4fd: am 38884a30: LayoutLib: Fix System.arraycopy() automerge: 51fb775 automerge: 55c7bd4 
* commit '7aafa4fd31d9a42fe0cd9a8e2e6aa8a4728ec166':
 2015-01-10 10:19:20 +00:00
Deepanshu Gupta
aadcdef312 am 191d06b5: am 74147527: am 8505c387: Special case AppCompat to show action bar. automerge: bb600de automerge: 8d9361a 
* commit '191d06b55598b653e0764638ca37d8618c9d085e':
 2015-01-10 10:13:04 +00:00
Deepanshu Gupta
686160b854 am 74e00d22: Support Locale.toLanguageTag on Java 6 automerge: dbd64f7 automerge: 7da2b5d 
* commit '74e00d229b5e4fca4bffd94373d58f94a74255d5':
 2015-01-10 10:13:00 +00:00
Deepanshu Gupta
7aafa4fd31 am 38884a30: LayoutLib: Fix System.arraycopy() automerge: 51fb775 automerge: 55c7bd4 
* commit '38884a30dfe0fffce0c6097fd9d406e45d04aea5':
 2015-01-10 10:12:56 +00:00
Deepanshu Gupta
191d06b555 am 74147527: am 8505c387: Special case AppCompat to show action bar. automerge: bb600de 
automerge: 8d9361a

* commit '8d9361a4ec1260b268865af6dcc8b2c5bb316f9d':
 2015-01-10 09:49:53 +00:00
Deepanshu Gupta
74e00d229b Support Locale.toLanguageTag on Java 6 automerge: dbd64f7 
automerge: 7da2b5d

* commit '7da2b5dbc259ef026bb075905f9fda3695dd4615':
 2015-01-10 09:48:39 +00:00
Deepanshu Gupta
38884a30df LayoutLib: Fix System.arraycopy() automerge: 51fb775 
automerge: 55c7bd4

* commit '55c7bd4dac3078ab220823e522c9257246933c46':
 2015-01-10 09:47:08 +00:00
Deepanshu Gupta
8d9361a4ec am 74147527: am 8505c387: Special case AppCompat to show action bar. 
automerge: bb600de

* commit 'bb600de6e7c5c7a0a1d4b872d2ee100ccc353213':
  Special case AppCompat to show action bar.
 2015-01-10 04:59:11 +00:00
Deepanshu Gupta
7da2b5dbc2 Support Locale.toLanguageTag on Java 6 
automerge: dbd64f7

* commit 'dbd64f7c904287f9e1bf5bb22385aace85274cab':
  Support Locale.toLanguageTag on Java 6
 2015-01-10 04:57:42 +00:00
Deepanshu Gupta
55c7bd4dac LayoutLib: Fix System.arraycopy() 
automerge: 51fb775

* commit '51fb7754fc9a232a225b31b37219f4b0dcba6711':
  LayoutLib: Fix System.arraycopy()
 2015-01-10 04:56:36 +00:00
Etan Cohen
038c3d21a7 Added configuration to determine whether VoLTE requires provisioning. 
Bug: 18576107
Change-Id: I08c231a3d876f3fe92c0fcb7f52be878b2da00dd
 2015-01-10 04:26:22 +00:00
Deepanshu Gupta
f2e04ac7ea am c598047d: am ca67a249: am bb600de6: am 74147527: am 8505c387: Special case AppCompat to show action bar. 
* commit 'c598047d67f64e690f682d82c0e77989c79ae465':
  Special case AppCompat to show action bar.
 2015-01-10 04:04:22 +00:00
Deepanshu Gupta
cd2e4da9a7 am 20625cce: am c5871ea1: am dbd64f7c: (-s ours) Support Locale.toLanguageTag on Java 6 
* commit '20625cce4c13d2337456aaa74ba91b6c4379321f':
  Support Locale.toLanguageTag on Java 6
 2015-01-10 04:04:18 +00:00
Deepanshu Gupta
b752d97248 am b3d418ad: am db703ab6: am 51fb7754: (-s ours) LayoutLib: Fix System.arraycopy() 
* commit 'b3d418ad027c324c1169e7087689a81bfefdf7f3':
  LayoutLib: Fix System.arraycopy()
 2015-01-10 03:59:58 +00:00
Deepanshu Gupta
c598047d67 am ca67a249: am bb600de6: am 74147527: am 8505c387: Special case AppCompat to show action bar. 
* commit 'ca67a249293d021808f349fa2e2f799451aeafe8':
  Special case AppCompat to show action bar.
 2015-01-10 03:56:47 +00:00
Deepanshu Gupta
20625cce4c am c5871ea1: am dbd64f7c: (-s ours) Support Locale.toLanguageTag on Java 6 
* commit 'c5871ea1b830153e7f85367844bcc67b81a2c06b':
  Support Locale.toLanguageTag on Java 6
 2015-01-10 03:56:44 +00:00
Deepanshu Gupta
b3d418ad02 am db703ab6: am 51fb7754: (-s ours) LayoutLib: Fix System.arraycopy() 
* commit 'db703ab64643ef91bbdb989a04597ecf7d0ca928':
  LayoutLib: Fix System.arraycopy()
 2015-01-10 03:52:05 +00:00
Deepanshu Gupta
ca67a24929 am bb600de6: am 74147527: am 8505c387: Special case AppCompat to show action bar. 
* commit 'bb600de6e7c5c7a0a1d4b872d2ee100ccc353213':
  Special case AppCompat to show action bar.
 2015-01-10 03:51:05 +00:00
Deepanshu Gupta
c5871ea1b8 am dbd64f7c: (-s ours) Support Locale.toLanguageTag on Java 6 
* commit 'dbd64f7c904287f9e1bf5bb22385aace85274cab':
  Support Locale.toLanguageTag on Java 6
 2015-01-10 03:51:01 +00:00