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

159505 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Winson Chung
7ce662ef87 Merge "DO NOT MERGE. Ensure screen pinning UI appears immediately after setting changes." into lmp-mr1-dev 2015-01-13 18:16:22 +00:00
Nicolas Prévot
6ab76bd434 Merge "Clarify docs for user restrictions" into lmp-mr1-dev 2015-01-13 17:35:14 +00:00
Ricardo Cervera
8eb306077d am 62ceea31: am f5569413: docs: Fix broken link in Common Intents automerge: c2d373a 
* commit '62ceea31564ac27c84ff78b400f844be98917c29':
  docs: Fix broken link in Common Intents
 2015-01-13 16:49:57 +00:00
Ricardo Cervera
62ceea3156 am f5569413: docs: Fix broken link in Common Intents 
automerge: c2d373a

* commit 'c2d373a0a7bb45e8c8a282781c5bc4f75db86b7d':
  docs: Fix broken link in Common Intents
 2015-01-13 16:42:22 +00:00
Ricardo Cervera
c2d373a0a7 am f5569413: docs: Fix broken link in Common Intents 
* commit 'f556941357ea391cae6dcd2e22b71a837a216d06':
  docs: Fix broken link in Common Intents
 2015-01-13 16:35:04 +00:00
Ricardo Cervera
f556941357 docs: Fix broken link in Common Intents 
Bug: 18991366

Change-Id: I998e5213bb7117ebd26ab335206f430f60d1c537
 2015-01-13 08:28:22 -08:00
Amith Yamasani
150514bd03 Clarify docs for user restrictions 
Specify which restrictions are not relevant or behave differently
for managed profiles.

Bug: 18768578
Change-Id: Iac1435c5b931cbb889902a9b9e427bc0e0778bf2
 2015-01-13 16:04:42 +00:00
Winson Chung
98e8f7ac5e DO NOT MERGE. Ensure screen pinning UI appears immediately after setting changes. 
Fixes an issue where the screen pinning UI in the Overview space would
not appear on the first load after changing the setting, this was because
the updated flag was not read before the tasks were preloaded prior to
entering the Overview space.

Bug: 18986736
Change-Id: I50dc9ff6d369fb3f2593f2bf2c1dc4608878820f
 2015-01-12 17:36:47 -08:00
Alan Viverette
71922de6c8 Update docs for Window.setElevation(), apply changes immediately 
BUG: 18983689
Change-Id: I471104092d6296dc0ba2689da96783be088fbce8
 2015-01-12 16:14:02 -08:00
Ricardo Cervera
9a19ed17e1 am eec6dd77: am a87f3555: am d8bd117c: Merge "docs: Add parent calls to WatchFaces snippet." into lmp-docs 
* commit 'eec6dd779ca170a80ff457828e2687da834d2c1f':
  docs: Add parent calls to WatchFaces snippet.
 2015-01-12 22:16:09 +00:00
Wale Ogunwale
1ea6afe123 Merge "Don't allow windows with invalid types to be added." into lmp-mr1-dev 2015-01-12 22:03:50 +00:00
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
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