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

190001 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Wale Ogunwale
fe4680f9da am 354b70f7: Merge "Set non-starting visible resumed activity as resumed activity for the stack" into mnc-dev 
* commit '354b70f7d209e79e4442d4b70fb1d849163eae3d':
  Set non-starting visible resumed activity as resumed activity for the stack
 2015-04-28 17:29:46 +00:00
Amith Yamasani
24bd0be558 Mark actually seen notifications as seen 
This was missing from a previous CL that was meant to have it.

Change-Id: I856cee8708d988630778ba88b70deaad8730fc1f
 2015-04-28 10:28:09 -07:00
Paul McLean
6bd27e1a0c AudioRecord device select continued 
Change-Id: I3b6ace370b878351d98dbdcba2db718b30de2f27
 2015-04-28 17:16:18 +00:00
Joe Fernandez
cd3793c6f2 am e658285b: am 03cbc278: am 0312f377: Merge "docs: Modify Branding guidelines for Android form factors" into lmp-mr1-ub-docs 
* commit 'e658285baf86a223ad369851d1fc5ebacad7b408':
  docs: Modify Branding guidelines for Android form factors
 2015-04-28 17:14:34 +00:00
Wale Ogunwale
354b70f7d2 Merge "Set non-starting visible resumed activity as resumed activity for the stack" into mnc-dev 2015-04-28 17:12:47 +00:00
Joe Fernandez
e658285baf am 03cbc278: am 0312f377: Merge "docs: Modify Branding guidelines for Android form factors" into lmp-mr1-ub-docs 
* commit '03cbc27845d6622c8eb7c033ec18dc535ab5d7e4':
  docs: Modify Branding guidelines for Android form factors
 2015-04-28 17:02:34 +00:00
Joe Fernandez
03cbc27845 am 0312f377: Merge "docs: Modify Branding guidelines for Android form factors" into lmp-mr1-ub-docs 
* commit '0312f37785768d7931e81afe92dbeda11f132d50':
  docs: Modify Branding guidelines for Android form factors
 2015-04-28 16:46:36 +00:00
Chris Craik
956f340aac Remove unused flags and dirty rects 
bug:17209071

Also update DisplayList->RenderNode naming in Editor

Change-Id: I1d505640ba7388a0b0042d9c787f859e45a24da5
 2015-04-28 09:40:01 -07:00
Joe Fernandez
0312f37785 Merge "docs: Modify Branding guidelines for Android form factors" into lmp-mr1-ub-docs 2015-04-28 16:21:56 +00:00
Svet Ganov
565d274f30 am 340b198c: Merge "Handle null projection properly if provider app op is not enabled." into mnc-dev 
* commit '340b198ccbd1a05e67d586c345139617d4b84ce0':
  Handle null projection properly if provider app op is not enabled.
 2015-04-28 16:20:43 +00:00
Svet Ganov
340b198ccb Merge "Handle null projection properly if provider app op is not enabled." into mnc-dev 2015-04-28 16:03:54 +00:00
Craig Mautner
4557c08c15 Notify client of all window movements. 
Previously only the animated movements were reported.

Fixes bug 19817982.

Change-Id: Icebc723be87aa948b72a2ea7cd94d5a0472990be
 2015-04-28 07:59:18 -07:00
dcashman
59f9592ff4 am 2301174e: Merge "Add KeySetManagerService unit tests." into mnc-dev 
* commit '2301174eb3598a3290b5c56aae36b19b2c6743ac':
  Add KeySetManagerService unit tests.
 2015-04-28 14:54:59 +00:00
dcashman
1ea5067e0a am e12f23dc: Merge "Remove static modifier from KeySetManagerService issuedIds." into mnc-dev 
* commit 'e12f23dc7e36f34c2ebd440e5deffd8866b66ade':
  Remove static modifier from KeySetManagerService issuedIds.
 2015-04-28 14:54:55 +00:00
dcashman
2301174eb3 Merge "Add KeySetManagerService unit tests." into mnc-dev 2015-04-28 14:44:06 +00:00
dcashman
e12f23dc7e Merge "Remove static modifier from KeySetManagerService issuedIds." into mnc-dev 2015-04-28 14:43:30 +00:00
Geoff Mendal
d34e8ebc02 am 5d3249d6: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev 
* commit '5d3249d6fd0b699087fbafa27a699256a3bd1e65':
  Import translations. DO NOT MERGE
 2015-04-28 10:09:21 +00:00
Geoff Mendal
c0aba5f705 am 5e43ae9c: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev 
* commit '5e43ae9c9c33d4be8ce1dbd760ce0170d0666d71':
  Import translations. DO NOT MERGE
 2015-04-28 10:09:17 +00:00
Geoff Mendal
5d3249d6fd Merge "Import translations. DO NOT MERGE" into mnc-dev 2015-04-28 09:56:41 +00:00
Geoff Mendal
5e43ae9c9c Merge "Import translations. DO NOT MERGE" into mnc-dev 2015-04-28 09:56:25 +00:00
Dongwon Kang
2be6622b96 am 99f6c2a0: Merge "TIF: add new audio modes to the timeShiftSetPlaybackRate() javadoc." into mnc-dev 
* commit '99f6c2a0728ddd41e9d147884816a451c250b0ad':
  TIF: add new audio modes to the timeShiftSetPlaybackRate() javadoc.
 2015-04-28 09:41:18 +00:00
Dongwon Kang
99f6c2a072 Merge "TIF: add new audio modes to the timeShiftSetPlaybackRate() javadoc." into mnc-dev 2015-04-28 09:25:50 +00:00
Geoff Mendal
f5bc286477 Import translations. DO NOT MERGE 
Change-Id: I6f6d4bf043ac98defa9d3b70d0a01d48f4aa6ace
Auto-generated-cl: translation import
 2015-04-28 01:56:40 -07:00
Geoff Mendal
079eab5c7d Import translations. DO NOT MERGE 
Change-Id: I25003c7f81d46bc95432d22aeb7657fef7c76579
Auto-generated-cl: translation import
 2015-04-28 01:43:47 -07:00
Dongwon Kang
b73868ddf8 TIF: add new audio modes to the timeShiftSetPlaybackRate() javadoc. 
Bug: 20509313
Change-Id: I762bb74ae2a1688e1bc6cdbf6bf5a8b931ae0689
 2015-04-28 17:24:51 +09:00
Martijn Coenen
cfbedfeebb am e48cca2a: Merge "Fix vmalloc memory accounting (DO NOT MERGE)." into mnc-dev 
* commit 'e48cca2a20668951254e980ac9284cd3492280ba':
  Fix vmalloc memory accounting (DO NOT MERGE).
 2015-04-28 08:03:58 +00:00
Martijn Coenen
e48cca2a20 Merge "Fix vmalloc memory accounting (DO NOT MERGE)." into mnc-dev 2015-04-28 07:50:13 +00:00
Keisuke Kuroyanagi
a3a411ec68 am d2b9bd80: Merge "Fix: End handle disappears when the selection is short." into mnc-dev 
* commit 'd2b9bd80a20e5339bd2555d83d11a5cd88a20034':
  Fix: End handle disappears when the selection is short.
 2015-04-28 05:10:55 +00:00
Keisuke Kuroyanagi
d2b9bd80a2 Merge "Fix: End handle disappears when the selection is short." into mnc-dev 2015-04-28 04:58:45 +00:00
Geoff Mendal
3f98c14dc6 am 7bdd6aa1: (-s ours) Import translations. DO NOT MERGE 
* commit '7bdd6aa1a4fd0f02184dc39fb43a2096fbfb6e1f':
  Import translations. DO NOT MERGE
 2015-04-28 04:58:07 +00:00
Geoff Mendal
7bdd6aa1a4 Import translations. DO NOT MERGE 
Change-Id: I56af308506de3258cefb3c96d49ca5ccaed1a57d
Auto-generated-cl: translation import
 2015-04-27 21:38:29 -07:00
Wale Ogunwale
85b90abdf9 Set non-starting visible resumed activity as resumed activity for the stack 
When ensuring visible activities for a stack we check to see if there is
already a resumed activity on the stack, so if we need to start an
activity that needs to be visible, we start it in the paused state
if there is already a resumed activity in the stack. This was't
taking into account a non-starting, visible, and resumed activity.

One case this can happen is if the currently resumed activity in
the stack becomes translucent and the activity behind it needs to
be started because it was previously destroyed due to low memory.

Bug: 19636839
Change-Id: I31670fd64d3bcbbf41823f51518ca603c7412e92
 2015-04-28 04:11:40 +00:00
Joshua Schwarz
4547dac01f Fix one-off error in reporting. 
Change-Id: I5315e3d13b42285169e6c92cfcf9cf2ae9667018
 2015-04-27 18:37:34 -07:00
Joe Fernandez
203c0a1c31 am f488985d: am ff31bb4b: am 68ef9287: Merge "docs: Add note about overriding onConnectedNodes() when listening for capability node changes." into lmp-mr1-ub-docs 
* commit 'f488985dce6424446a458f08f2c141b64ac07e39':
  docs: Add note about overriding onConnectedNodes() when listening for capability node changes.
 2015-04-28 00:45:48 +00:00
Joe Fernandez
c70f95a337 am d602d23f: am 80d19484: am 185002bc: Merge "docs: Update Wearable API setup to mention addApiIfAvailable()." into lmp-mr1-ub-docs 
* commit 'd602d23fd81d7b70d76c596d9b0ae7a4cfd98e02':
  docs: Update Wearable API setup to mention addApiIfAvailable().
 2015-04-28 00:45:44 +00:00
Robert Shih
ce1ff57f2d am 43429656: Merge "MediaController: workaround to disable seek" into mnc-dev 
* commit '43429656ff8762416571661c591691aeb9cebdbd':
  MediaController: workaround to disable seek
 2015-04-28 00:45:38 +00:00
Joe Fernandez
f488985dce am ff31bb4b: am 68ef9287: Merge "docs: Add note about overriding onConnectedNodes() when listening for capability node changes." into lmp-mr1-ub-docs 
* commit 'ff31bb4bb7d46766552526f6580a76445a549339':
  docs: Add note about overriding onConnectedNodes() when listening for capability node changes.
 2015-04-28 00:36:29 +00:00
Joe Fernandez
d602d23fd8 am 80d19484: am 185002bc: Merge "docs: Update Wearable API setup to mention addApiIfAvailable()." into lmp-mr1-ub-docs 
* commit '80d19484c109c4beb0e36b7ce0418ebe526ad300':
  docs: Update Wearable API setup to mention addApiIfAvailable().
 2015-04-28 00:36:23 +00:00
Robert Shih
43429656ff Merge "MediaController: workaround to disable seek" into mnc-dev 2015-04-28 00:30:12 +00:00
Joe Fernandez
ff31bb4bb7 am 68ef9287: Merge "docs: Add note about overriding onConnectedNodes() when listening for capability node changes." into lmp-mr1-ub-docs 
* commit '68ef92871f52bad28d5aea168c0d3a4b863d282d':
  docs: Add note about overriding onConnectedNodes() when listening for capability node changes.
 2015-04-28 00:24:26 +00:00
Joe Fernandez
80d19484c1 am 185002bc: Merge "docs: Update Wearable API setup to mention addApiIfAvailable()." into lmp-mr1-ub-docs 
* commit '185002bcc9b551828557ab6946fef7fef1c17d74':
  docs: Update Wearable API setup to mention addApiIfAvailable().
 2015-04-28 00:24:19 +00:00
Svet Ganov
a2147ec975 Handle null projection properly if provider app op is not enabled. 
Change-Id: I00b757ef73bf4dd58217ba748520c3504350d4ba
 2015-04-28 00:04:00 +00:00
Joe Fernandez
68ef92871f Merge "docs: Add note about overriding onConnectedNodes() when listening for capability node changes." into lmp-mr1-ub-docs 2015-04-28 00:03:50 +00:00
Joe Fernandez
185002bcc9 Merge "docs: Update Wearable API setup to mention addApiIfAvailable()." into lmp-mr1-ub-docs 2015-04-28 00:00:09 +00:00
Alan Viverette
aacb04ca5c am 1ce80dc0: Merge "Add some missing Settings and DayNight themes" into mnc-dev 
* commit '1ce80dc0e21268475ae9f5d8ec8e0c114687de54':
  Add some missing Settings and DayNight themes
 2015-04-27 23:35:35 +00:00
Deepanshu Gupta
9014b31f80 am 8381e2cd: Merge "Fix view outline for shadows in LayoutLib." into mnc-dev 
* commit '8381e2cdcc24a5099b1e8811b0d7b8c125145899':
  Fix view outline for shadows in LayoutLib.
 2015-04-27 23:35:29 +00:00
Alan Viverette
1ce80dc0e2 Merge "Add some missing Settings and DayNight themes" into mnc-dev 2015-04-27 23:27:12 +00:00
Deepanshu Gupta
8381e2cdcc Merge "Fix view outline for shadows in LayoutLib." into mnc-dev 2015-04-27 23:20:35 +00:00
Alan Viverette
520034755f Add some missing Settings and DayNight themes 
Bug: 20546201
Change-Id: I1eeaf3c76c17b773bb7d9b19ad7fa84479b70f41
 2015-04-27 23:20:00 +00:00
Raph Levien
33d77e18c4 am a589368a: Merge "Expose drawTextRun publicly" into mnc-dev 
* commit 'a589368a78f946976f1ac45feb47fb9611b0e64b':
  Expose drawTextRun publicly
 2015-04-27 23:07:09 +00:00