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

228299 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mihai Niță
085caa2bb2 Merge "Adding a locale picker with two-step selection: language, then region." 2015-12-18 21:55:32 +00:00
Andreas Gampe
a0c40fc602 Merge "Frameworks/base: Change android.util.Log multiline logging" 2015-12-18 21:27:18 +00:00
Mihai Nita
3b70b0fc25 Adding a locale picker with two-step selection: language, then region. 
This is intended to replace the UI part of the LocalePicker, at
least for the main "Settings" application (under "Language & Input")
and for the "Setup Wizard".

The UI part in the old LocalePicker can be removed once all the
components that use it are migrated to the new one.

Bug: 25800339
Change-Id: I2f264cdb7b7fc586124dd58fad2c68060d5b7aa8
 2015-12-18 21:13:55 +00:00
Julia Reynolds
e00da66cdc Merge "Differentiate between apps that use topics and those that don't." 2015-12-18 21:09:45 +00:00
Daniel Koulomzin
db3631f8c1 Merge "Making ViewRootImpl drop input events when the Activity is in ambient mode." into cw-e-dev am: cbef517d02 am: 898e330aae am: 94794af6be 
am: 3f66df086a

* commit '3f66df086a210bc0dec7a0bd86081f6f79b3a712':
  Making ViewRootImpl drop input events when the Activity is in ambient mode.
 2015-12-18 21:04:41 +00:00
Robert Greenwalt
4d97265fe8 resolve merge conflicts of 9887f2f50a to lmp-sprout-dev. am: 5a77651489 am: 5946a9b798 am: 2ecc918bd3 am: 81674b1ff5 am: 1e04dfb926 am: 3927089cce am: f1530bf3d7 am: fba515f614 am: 2ce61fb68a 
am: c57d50c0fb

* commit 'c57d50c0fbffe2a4f479469b490be751cdcf45fa':
  Protect some new broadcasts.
 2015-12-18 21:02:54 +00:00
Mark Lu
fa616e7cab Fix system watchdog timeout when reading too many usage events. am: 8877120173 am: 370567d1f5 
am: 8f968ae1a2

* commit '8f968ae1a22f940f68ac2bf08c4ffcfde539e93b':
  Fix system watchdog timeout when reading too many usage events.
 2015-12-18 21:00:42 +00:00
Robert Greenwalt
7c39c4bf91 Merge "Check permissions on getDeviceId." into mnc-dev am: 4557ef32fe am: 628b8f1f5f am: a652b7161d am: c99c41781c am: b5f6115092 
am: 740e5da062

* commit '740e5da0624f8ede5a8ddaa20bfdbb2bd1cfa13a':
  Check permissions on getDeviceId.
 2015-12-18 20:59:02 +00:00
Julia Reynolds
be8fdee532 Differentiate between apps that use topics and those that don't. 
Bug: 22451710
Change-Id: Idb567a4fc511a03cb999179765cfa4cbeb63dcb7
 2015-12-18 15:57:43 -05:00
Robert Greenwalt
9ebb1aeb99 Merge "Check permissions on getDeviceId." into mnc-dr-dev am: ef58df63d6 am: 064eb2a7cc am: 5d7bb383b8 am: 50843b1708 
am: 15912efe72

* commit '15912efe72fe27d9ce212d203227687fe8d98867':
  Check permissions on getDeviceId.
 2015-12-18 20:57:33 +00:00
Daniel Koulomzin
3f66df086a Merge "Making ViewRootImpl drop input events when the Activity is in ambient mode." into cw-e-dev am: cbef517d02 am: 898e330aae 
am: 94794af6be

* commit '94794af6bee35c249857f0440c361d589b77aa5d':
  Making ViewRootImpl drop input events when the Activity is in ambient mode.
 2015-12-18 12:15:10 -08:00
Robert Greenwalt
c57d50c0fb resolve merge conflicts of 9887f2f50a to lmp-sprout-dev. am: 5a77651489 am: 5946a9b798 am: 2ecc918bd3 am: 81674b1ff5 am: 1e04dfb926 am: 3927089cce am: f1530bf3d7 am: fba515f614 
am: 2ce61fb68a

* commit '2ce61fb68a598622343047aa8a202513a61566c2':
  Protect some new broadcasts.
 2015-12-18 12:09:54 -08:00
Daniel Koulomzin
94794af6be Merge "Making ViewRootImpl drop input events when the Activity is in ambient mode." into cw-e-dev am: cbef517d02 
am: 898e330aae

* commit '898e330aaedbfa9e41d649187800c307e3d84169':
  Making ViewRootImpl drop input events when the Activity is in ambient mode.
 2015-12-18 20:09:35 +00:00
Amith Yamasani
2e9aa7bddc Merge "Fix broken user removal" 2015-12-18 19:59:19 +00:00
Daniel Koulomzin
898e330aae Merge "Making ViewRootImpl drop input events when the Activity is in ambient mode." into cw-e-dev 
am: cbef517d02

* commit 'cbef517d02f4f3680e155cc1a704ebf5c959d03f':
  Making ViewRootImpl drop input events when the Activity is in ambient mode.
 2015-12-18 11:55:52 -08:00
Ruben Brunk
55bed95778 Merge "Add a framework service tracking VR mode state." 2015-12-18 19:50:24 +00:00
Daniel Koulomzin
cbef517d02 Merge "Making ViewRootImpl drop input events when the Activity is in ambient mode." into cw-e-dev 2015-12-18 19:49:18 +00:00
Wale Ogunwale
1d0d4d3c6e Merge "Added PRIVATE_FLAG_LAYOUT_CHILD_WINDOW_IN_PARENT_FRAME window flag" 2015-12-18 19:47:13 +00:00
Robert Greenwalt
2ce61fb68a resolve merge conflicts of 9887f2f50a to lmp-sprout-dev. am: 5a77651489 am: 5946a9b798 am: 2ecc918bd3 am: 81674b1ff5 am: 1e04dfb926 am: 3927089cce am: f1530bf3d7 
am: fba515f614

* commit 'fba515f614c1df7a30f2d003f2861bc14bc8fbda':
  Protect some new broadcasts.
 2015-12-18 11:42:58 -08:00
Robert Greenwalt
fba515f614 resolve merge conflicts of 9887f2f50a to lmp-sprout-dev. am: 5a77651489 am: 5946a9b798 am: 2ecc918bd3 am: 81674b1ff5 am: 1e04dfb926 am: 3927089cce 
am: f1530bf3d7

* commit 'f1530bf3d72315256dd7a2c18ba383dc15445b54':
  Protect some new broadcasts.
 2015-12-18 19:36:54 +00:00
Robert Greenwalt
f1530bf3d7 resolve merge conflicts of 9887f2f50a to lmp-sprout-dev. am: 5a77651489 am: 5946a9b798 am: 2ecc918bd3 am: 81674b1ff5 am: 1e04dfb926 
am: 3927089cce

* commit '3927089cce9d43a0b517f53fd6a542f07cb0955b':
  Protect some new broadcasts.
 2015-12-18 11:31:54 -08:00
Robert Greenwalt
3927089cce resolve merge conflicts of 9887f2f50a to lmp-sprout-dev. am: 5a77651489 am: 5946a9b798 am: 2ecc918bd3 am: 81674b1ff5 
am: 1e04dfb926

* commit '1e04dfb926040a6fad073fca0835777123d155e7':
  Protect some new broadcasts.
 2015-12-18 11:24:53 -08:00
Amith Yamasani
458ac46374 Fix broken user removal 
Check target user instead of current user, when deciding if
user can be stopped.

Bug: 26207032
Change-Id: Ibf9cb827943f8fbf8fa3b96a9e04c96d11a36d0a
 2015-12-18 11:21:31 -08:00
Robert Greenwalt
1e04dfb926 resolve merge conflicts of 9887f2f50a to lmp-sprout-dev. am: 5a77651489 am: 5946a9b798 am: 2ecc918bd3 
am: 81674b1ff5

* commit '81674b1ff5deedcf2f1a79f07441e506a4f66354':
  Protect some new broadcasts.
 2015-12-18 19:17:58 +00:00
Robert Greenwalt
81674b1ff5 resolve merge conflicts of 9887f2f50a to lmp-sprout-dev. am: 5a77651489 am: 5946a9b798 
am: 2ecc918bd3

* commit '2ecc918bd3c7f63ea70a7395b3a622c7f1a40f84':
  Protect some new broadcasts.
 2015-12-18 19:04:25 +00:00
Robert Greenwalt
2ecc918bd3 resolve merge conflicts of 9887f2f50a to lmp-sprout-dev. am: 5a77651489 
am: 5946a9b798

* commit '5946a9b798f9a4b0e9eacd2685fc5ec9d6cc9ed6':
  Protect some new broadcasts.
 2015-12-18 18:48:59 +00:00
Mark Lu
8f968ae1a2 Fix system watchdog timeout when reading too many usage events. am: 8877120173 
am: 370567d1f5

* commit '370567d1f5be189c858836746bd93e7482c9571a':
  Fix system watchdog timeout when reading too many usage events.
 2015-12-18 18:45:39 +00:00
Robert Greenwalt
740e5da062 Merge "Check permissions on getDeviceId." into mnc-dev am: 4557ef32fe am: 628b8f1f5f am: a652b7161d am: c99c41781c 
am: b5f6115092

* commit 'b5f611509276516eb26d86fe63e845b7148bec86':
  Check permissions on getDeviceId.
 2015-12-18 18:43:05 +00:00
Wale Ogunwale
8216eb2221 Added PRIVATE_FLAG_LAYOUT_CHILD_WINDOW_IN_PARENT_FRAME window flag 
Allows us to differentiate between child windows that always want to be
laid-out in the parent frame regardless of multi-windowing mode
(PopupWindows) and those that don't (SurfaceViews).

Bug: 26255254
Change-Id: Icbc245a24f9a38698444196846ddb25016ef7e2a
 2015-12-18 10:42:42 -08:00
Robert Greenwalt
15912efe72 Merge "Check permissions on getDeviceId." into mnc-dr-dev am: ef58df63d6 am: 064eb2a7cc am: 5d7bb383b8 
am: 50843b1708

* commit '50843b1708f7662f9be661001125d91e0ef544d7':
  Check permissions on getDeviceId.
 2015-12-18 18:41:23 +00:00
Robert Greenwalt
5946a9b798 resolve merge conflicts of 9887f2f50a to lmp-sprout-dev. 
am: 5a77651489

* commit '5a77651489ace080671034a85e5771c6ddc73525':
  Protect some new broadcasts.
 2015-12-18 18:38:10 +00:00
Jeff Sharkey
374e7ddce2 Merge changes Ieabfedfd,I7159d757 
* changes:
  Sometimes to move forward you need to move backwards.
  Sometimes to move forward you need to move backwards.
 2015-12-18 18:25:28 +00:00
Jeff Sharkey
665e0b5bbe Sometimes to move forward you need to move backwards. 
Part B.

Bug: 26118802

Change-Id: Ieabfedfd0ebff5b1f3dc32d1de43aef9974f15d2
 2015-12-18 11:24:20 -07:00
Jeff Sharkey
3d88b4651a Sometimes to move forward you need to move backwards. 
Part A.

Bug: 26118802
Change-Id: I7159d757caa92c590c79cacf62128d1324978c46
 2015-12-18 11:23:29 -07:00
Ta-wei Yen
76ef0fbe06 Merge "Add field QUOTA_OCCUPIED and QUOTA_TOTAL to VoicemailContract.Status" 2015-12-18 18:22:10 +00:00
Filip Gruszczynski
61924260f4 Merge "Collect activity starting logic into ActivityStarter class." 2015-12-18 18:17:02 +00:00
Chris Craik
33e9b426da Merge "Fix merged op clipping issue" 2015-12-18 18:07:50 +00:00
Chris Craik
93e53e09dd Fix merged op clipping issue 
Change-Id: I48cd5e92f3e62dcd189a4411a71aa7a40ce5498c
 2015-12-18 10:07:16 -08:00
Daniel Koulomzin
087ae471c2 Making ViewRootImpl drop input events when the Activity is in ambient 
mode.

WearableActivityController tells ViewRootImpl about ambient mode.

Bug: 25912259
Bug: 25973146
Bug: 25714113
Change-Id: Idcca2b254db3145039f50f2a7dfd38a224ec287e
 2015-12-18 12:56:00 -05:00
Fyodor Kupolov
7164cb68dd Merge "Use buffering when reading preferred apps" 2015-12-18 17:22:07 +00:00
Fyodor Kupolov
42f9fe75e6 Merge "Optimized database creation for a new user" 2015-12-18 17:22:04 +00:00
Filip Gruszczynski
07a0e4980b Collect activity starting logic into ActivityStarter class. 
Change-Id: If1c074d6c278647ec55f2313483945f24aca8b3b
 2015-12-18 09:04:55 -08:00
Wale Ogunwale
ef19b98312 Merge "Correctly set mContainingFrame for PopupWindows in multi-window mode" 2015-12-18 16:44:15 +00:00
Jeff Sharkey
2527e2bf15 Merge "Allow library spec and app configs to be read from odm partition" 2015-12-18 16:34:26 +00:00
Wale Ogunwale
79f268d92a Correctly set mContainingFrame for PopupWindows in multi-window mode 
For child windows we want to base their containing frame on their
parent frame and not the task bounds.

Bug: 26255254
Change-Id: Ic211c31e69df16fdbdb7b7ba2022379c5f4a87c0
 2015-12-18 08:25:47 -08:00
George Mount
69b495bdb8 Merge "Alt-up moves focus to the toolbar in action bar mode." 2015-12-18 15:46:31 +00:00
George Mount
5beb2617f9 Alt-up moves focus to the toolbar in action bar mode. 
Bug 24811572

Change-Id: Ie065fa13ba76131e700e73984a99fc60a7aa513c
 2015-12-18 07:44:50 -08:00
George Mount
7f55215afd Merge "Reset accessibility after Activity enter transition." 2015-12-18 15:29:52 +00:00
Todd Kennedy
c366471590 Merge "Print "Success" on success" 2015-12-18 15:16:19 +00:00
Winson Chung
0583d3d188 Hiding pinned stack tasks from overview 
Bug: 25381158
Change-Id: Iad442b7f5dc49109529cb5dab2168b19837af6e3
 2015-12-18 10:05:13 -05:00