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

228365 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jun Mukai
56cd51a704 Merge "Introduce pointer capture API." 2015-12-18 23:30:10 +00:00
Filip Gruszczynski
ea5a94669c Merge "Temporarily disable forcing of drawing status bar background." 2015-12-18 23:29:58 +00:00
Filip Gruszczynski
96d5c8a9ce Temporarily disable forcing of drawing status bar background. 
Forcing status bar background drawing causes all windows to be
considered fullscreen. As a result alert dialog windows have incorrect
containing frames and aren't repositioned when IME appears.

Until a better solution is implemented for forcing drawing the status
bar, we disable it to have correct old behavior.

Bug: 26050571
Bug: 24365214
Change-Id: Ic27a394711a587fa152a238699cd19751e91a732
 2015-12-18 15:29:30 -08:00
Bryce Lee
a9b1ee799e Merge "Remove duplicate Bluetooth profiles." into cw-e-dev am: 9c27969385 am: d980b8c7a0 am: 1b695edc97 
am: 76656c6b48

* commit '76656c6b48d3fa3e5538e864929ba63b692d5764':
  Remove duplicate Bluetooth profiles.
 2015-12-18 23:25:27 +00:00
Bryce Lee
76656c6b48 Merge "Remove duplicate Bluetooth profiles." into cw-e-dev am: 9c27969385 am: d980b8c7a0 
am: 1b695edc97

* commit '1b695edc97c227a64ef810daee7dc9f3b35206a7':
  Remove duplicate Bluetooth profiles.
 2015-12-18 23:19:18 +00:00
Bryce Lee
1b695edc97 Merge "Remove duplicate Bluetooth profiles." into cw-e-dev am: 9c27969385 
am: d980b8c7a0

* commit 'd980b8c7a05a2dc51145c3465c14f1f106a8bc47':
  Remove duplicate Bluetooth profiles.
 2015-12-18 23:13:51 +00:00
Bryce Lee
d980b8c7a0 Merge "Remove duplicate Bluetooth profiles." into cw-e-dev 
am: 9c27969385

* commit '9c27969385d7a59a535ba3274c279ae96a155d49':
  Remove duplicate Bluetooth profiles.
 2015-12-18 23:07:49 +00:00
Ben Kwa
af55a15196 Merge "Implement bucketed sorting in DocumentsUI." 2015-12-18 23:06:13 +00:00
Ben Kwa
c72a2cb899 Implement bucketed sorting in DocumentsUI. 
Change the sort code in the Model to bucket items into two separate
categories (folders and documents) and then sort the two buckets
separately.

Add code to the adapter to insert a visual break in the UI, between
folders and documents.

Change-Id: I759fedcef829aba9ad61554326489a9e62641cc7
 2015-12-18 15:04:26 -08:00
Bryce Lee
9c27969385 Merge "Remove duplicate Bluetooth profiles." into cw-e-dev 2015-12-18 23:02:40 +00:00
George Mount
0b8056c0bc Merge "Fix problem where enter and space key do nothing on ListView." 2015-12-18 22:32:58 +00:00
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
George Mount
26268f93ce Fix problem where enter and space key do nothing on ListView. 
Enter should select the currently focused item. It was doing
nothing.

Change-Id: I149ed72804234c1c1da4a7a9be8c9f405722d4ec
 2015-12-18 13:00:46 -08: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
Bryce Lee
15309a3d20 Remove duplicate Bluetooth profiles. 
Change-Id: I04fd867511713dd02ef249b113f7a46c69f22f98
 2015-12-18 11:34:20 -08: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
Jun Mukai
347e5d498f Introduce pointer capture API. 
This depends on I4189eb4d93f50c2865b7a325727be5ceebcc71f8 of
frameworks/native.

Bug: 5452473
Change-Id: Ie21e521f3e5c581f976dc0feb5d84bfa48b046cd
 2015-12-18 10:22:43 -08: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