Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
198,128 Commits 3 Branches 0 Tags
f3de280367f77e6e5b03dca18df42d1ed79ee467
Commit Graph

4674 Commits

Author SHA1 Message Date
Abodunrinwa Toki
034e5cfca4 am cf068ba2: am 3ae8bf53: Merge "Change FloatingToolbar entry/exit animations to fadeIn/fadeOut." into mnc-dev 
* commit 'cf068ba27d86289ed085da17a0536a4d3a5208e6':
  Change FloatingToolbar entry/exit animations to fadeIn/fadeOut.
 2015-06-10 23:14:21 +00:00
Abodunrinwa Toki
3ae8bf530a Merge "Change FloatingToolbar entry/exit animations to fadeIn/fadeOut." into mnc-dev 2015-06-10 19:02:17 +00:00
Chris Wren
1d8d111a16 am 7f588404: am 300a1416: Merge changes from topic \'tron\' into mnc-dev 
* commit '7f588404c531db878597f1221d56907c5c40de5e':
  instrument notification longpress controls
  induct a bunch of new logging categories.
 2015-06-10 15:02:04 +00:00
Chris Wren
300a141650 Merge changes from topic 'tron' into mnc-dev 
* changes:
  instrument notification longpress controls
  induct a bunch of new logging categories.
 2015-06-10 14:14:41 +00:00
Abodunrinwa Toki
7aa6d0a4b1 Change FloatingToolbar entry/exit animations to fadeIn/fadeOut. 
Bug: 21307167
Change-Id: I7f75e064c264666ad0e8f84d5421fcc15176ee3f
 2015-06-10 13:45:25 +01:00
Chris Banes
1f5714c610 am d64c5bef: am d9b0acd2: Merge "Fix location for ActionMenuItemView cheat sheet" into mnc-dev 
* commit 'd64c5befd61434168b16f6eb1b722b7d3512f15a':
  Fix location for ActionMenuItemView cheat sheet
 2015-06-10 09:57:52 +00:00
Chris Banes
d9b0acd2eb Merge "Fix location for ActionMenuItemView cheat sheet" into mnc-dev 2015-06-10 08:12:51 +00:00
Dianne Hackborn
51bcd6728b am 1a18d087: am ea7438e4: Merge "Fix issue #21571700: Need to be smarter about how foreground..." into mnc-dev 
* commit '1a18d087d7c31ee037c9583949f5ecc34ae96479':
  Fix issue #21571700: Need to be smarter about how foreground...
 2015-06-09 21:26:09 +00:00
Dianne Hackborn
ea7438e4a6 Merge "Fix issue #21571700: Need to be smarter about how foreground..." into mnc-dev 2015-06-09 21:08:17 +00:00
Adam Lesinski
0db2df0c28 am 1d050cff: am f17138f0: Merge "Fix calculation of power drain from BT and WiFi" into mnc-dev 
* commit '1d050cff93e7784fc66bdb419858b84c6c2922c7':
  Fix calculation of power drain from BT and WiFi
 2015-06-09 20:08:41 +00:00
Adam Lesinski
8576cf941d Fix calculation of power drain from BT and WiFi 
Unit issue (mV vs V).

Change-Id: I08843312339ccf35a3b55b1c2385c36fdbf61ead
 2015-06-09 12:48:25 -07:00
Chris Wren
611eaa9edf induct a bunch of new logging categories. 
Bug: 21114836
Change-Id: I978a0af2cf86e836091ef9219194e4b587a5534e
 2015-06-09 15:12:50 -04:00
Clara Bayarri
3d8f2b4bd7 am 94913157: am 0f925d0d: Merge "Fallback to old Window.Callback#onWindowStartingActionMode" into mnc-dev 
* commit '9491315788d7dc4f5e9dec1267437140f4c5a644':
  Fallback to old Window.Callback#onWindowStartingActionMode
 2015-06-09 17:31:59 +00:00
Clara Bayarri
0f925d0def Merge "Fallback to old Window.Callback#onWindowStartingActionMode" into mnc-dev 2015-06-09 17:18:50 +00:00
Jorim Jaggi
d556f9d145 am e44488f0: am b835dd76: Close assist when launching intents from notification shade 
* commit 'e44488f096600566547c57f9491a88c84d37d093':
  Close assist when launching intents from notification shade
 2015-06-09 00:49:07 +00:00
Jorim Jaggi
b835dd7641 Close assist when launching intents from notification shade 
Bug: 21035363
Change-Id: I51a6dbe5f0d93aaf81a38d1f1afacaaeaf7732e2
 2015-06-09 00:31:12 +00:00
Clara Bayarri
9f8f6e4e1c Fallback to old Window.Callback#onWindowStartingActionMode 
Some custom implementations of Window.Callback might not have the new
typed method, fallback to typeless if it is implemented and the type
was Primary.

Change-Id: Ie98f9a57354363f1b9f8e48f889298f3ee4b59e2
 2015-06-09 01:26:08 +01:00
Adam Lesinski
e4768b4207 am 2ce589b1: am 4cf59747: Merge "Bump the BatteryStats parcel VERSION" into mnc-dev 
* commit '2ce589b1dbba5bb25cb00de773a2275cec636829':
  Bump the BatteryStats parcel VERSION
 2015-06-08 23:41:07 +00:00
Adam Lesinski
df6235cd76 Bump the BatteryStats parcel VERSION 
A previous change forgot to bump the version, leading to
corrupt data.

Bug:19683715
Bug:21574065
Change-Id: I30c9039694b02d576909e8f60c25f175986b8c5c
 2015-06-08 15:04:16 -07:00
Dianne Hackborn
ab4bb9d1fe Fix issue #21571700: Need to be smarter about how foreground... 
...services get out of app idle

Introduce a new process state to even better distinguish foreground
services from other states.  Rework the INTERACTION reporting to
usage stats to do it less when the screen is off -- require that
an app sit in the foreground service or top activity state for
at least 30 minutes before we consider it an interaction.

Also eradicate a bunch of logging in package manager.

Change-Id: I94249e67f9a9c62e9a92ae104710e6747b16327e
 2015-06-08 13:51:57 -07:00
Tim Kilbourn
6b3bb7d669 am 0a08108d: am 159f558a: Merge "Pass an args bundle to launchAssistAction." into mnc-dev 
* commit '0a08108d753f2d04da046e6d7792ee33ac2af364':
  Pass an args bundle to launchAssistAction.
 2015-06-08 17:14:02 +00:00
Chris Wren
87a1dcba0b am 0a769f1d: am aaf68f21: Merge "instrument emergency call button" into mnc-dev 
* commit '0a769f1dd8fd953408270db35063a97a6302d784':
  instrument emergency call button
 2015-06-08 17:05:41 +00:00
Abodunrinwa Toki
f70aa84170 am 6bbacb53: am 7d3b8833: Merge "Fix ActionMode.snooze API" into mnc-dev 
* commit '6bbacb53c9584db8b4a7af1e6d3f8a04237b469b':
  Fix ActionMode.snooze API
 2015-06-08 17:04:42 +00:00
Tim Kilbourn
159f558a39 Merge "Pass an args bundle to launchAssistAction." into mnc-dev 2015-06-08 16:46:42 +00:00
Chris Wren
aaf68f2163 Merge "instrument emergency call button" into mnc-dev 2015-06-08 14:38:30 +00:00
Chris Banes
d74f960ece Fix location for ActionMenuItemView cheat sheet 
Currently handling does not take the screen position into
account.

BUG: 21690674
Change-Id: I7e957d453bffd5c9bf5ac61a17fcab7d00fec5b6
 2015-06-08 13:36:24 +01:00
Abodunrinwa Toki
7d3b8833df Merge "Fix ActionMode.snooze API" into mnc-dev 2015-06-08 11:36:19 +00:00
Ruben Brunk
4335fbfe17 am 533514c9: am 8f955f89: Merge "Add UI for camera + flashlight battery reporting." into mnc-dev 
* commit '533514c9b5bf05bbba33e2499618fa3c47f31451':
  Add UI for camera + flashlight battery reporting.
 2015-06-06 00:29:50 +00:00
James Cook
80a250a3c8 am 715c502b: am 74f3d396: Merge "Allow different visual and voice assist prompts" into mnc-dev 
* commit '715c502bedee1e414d9d420d35e91a8f2920f25a':
  Allow different visual and voice assist prompts
 2015-06-06 00:18:47 +00:00
Ruben Brunk
8f955f89c2 Merge "Add UI for camera + flashlight battery reporting." into mnc-dev 2015-06-06 00:04:24 +00:00
Adam Lesinski
c12b8d3c6d am f926e3b9: am 8e518c81: Merge "Update docs to reflect correct time units" into mnc-dev 
* commit 'f926e3b9bf26318b4b207afb25887165bf12e533':
  Update docs to reflect correct time units
 2015-06-05 23:46:46 +00:00
James Cook
6cf397508e Allow different visual and voice assist prompts 
* Introduce VoiceInteractor.Prompt, holding multiple voice prompts
("What genre?", "What genre of music?", "What genre of music, for
example classical?") as well as a different visual prompt to show
on screen ("Choose genre").
* Migrate framework voice interactor code from a CharSequence prompt
to Prompt.

Bug: 21024958
Change-Id: Ib595fbdb2801cc558085e9b8366d619ff1d4d656
 2015-06-05 16:36:22 -07:00
Adam Lesinski
8e518c81ea Merge "Update docs to reflect correct time units" into mnc-dev 2015-06-05 23:31:28 +00:00
Tim Kilbourn
0e5f110fc9 Pass an args bundle to launchAssistAction. 
In order to track the input device that was used to trigger assist, the
input device id is sent as an extra in the assist intent whenever it is
available. This is particularly useful on TVs, when an app may want to
know whether the input device has a microphone.

Bug: 21666123
Change-Id: I0f8c09e2f617606bef481bdff924cb6b9b47dd12
 2015-06-05 23:26:39 +00:00
Wei Wang
d3c9fc57f7 am 01b8f2cd: am a73c8b6f: Merge "add gps gid to system_server" into mnc-dev 
* commit '01b8f2cd62d246d04a24366f20a5ddfcd5f014cf':
  add gps gid to system_server
 2015-06-05 21:56:46 +00:00
Kevin Tang
c6432e5c72 add gps gid to system_server 
system_server hosts gps service, it should pocess gps
gid, so it can communicate with native gps daemons.

Change-Id: I59d7e99ec996891b19fa15a3ed66e055e6bccad8
 2015-06-05 14:18:49 -07:00
Chris Wren
de0a21f436 instrument emergency call button 
Bug: 21527672
Change-Id: I1cc8ace204e16964ae2a251152f36133e6d02932
 2015-06-05 17:17:55 -04:00
Adam Lesinski
7b83b0c75c Update docs to reflect correct time units 
Change-Id: Id2757e45e989b148671cf83d51011984e07cd017
 2015-06-05 12:59:36 -07:00
Abodunrinwa Toki
5e516a7531 am 4bbc9f4d: am 4741f6a4: Merge "TextView: Make sure the contentRect is within visibile bounds." into mnc-dev 
* commit '4bbc9f4d52c9bc219318c38593a2ff05c07d652e':
  TextView: Make sure the contentRect is within visibile bounds.
 2015-06-05 03:31:01 +00:00
Abodunrinwa Toki
9e211282d3 Fix ActionMode.snooze API 
Bug: 21572677
Change-Id: If9fdb8ace3773b983418b0148082712644fd1fa5
 2015-06-05 03:35:15 +01:00
Abodunrinwa Toki
601523ad00 TextView: Make sure the contentRect is within visibile bounds. 
Bug: 21620604
Change-Id: Idd0d891e423316b2ebacf883fd3cbfff9ef69743
 2015-06-05 00:42:06 +01:00
Ruben Brunk
5b1308f02d Add UI for camera + flashlight battery reporting. 
Bug: 11694505
Change-Id: Ieefa78a1d641851f4141fe666dae7b9fde394f09
 2015-06-04 16:41:11 -07:00
Abodunrinwa Toki
ce36d78ac3 am 7814e92f: am 2fe44efc: Merge "Also refresh FloatingToolbar for "icon" menu item changes." into mnc-dev 
* commit '7814e92f7f2e76b4e517adfc496db006284f518a':
  Also refresh FloatingToolbar for "icon" menu item changes.
 2015-06-04 19:22:59 +00:00
Abodunrinwa Toki
2fe44efced Merge "Also refresh FloatingToolbar for "icon" menu item changes." into mnc-dev 2015-06-04 17:09:11 +00:00
Yohei Yukawa
e09356c0e5 am 4b0f5442: am cc71518a: Merge "Include InputMethodSubtypeSwitchingController in state dump." into mnc-dev 
* commit '4b0f544285e6cb270a9cbf09d56b0df432960293':
  Include InputMethodSubtypeSwitchingController in state dump.
 2015-06-04 09:59:14 +00:00
Yohei Yukawa
cc71518aef Merge "Include InputMethodSubtypeSwitchingController in state dump." into mnc-dev 2015-06-04 08:06:10 +00:00
Yohei Yukawa
d724886cc1 Include InputMethodSubtypeSwitchingController in state dump. 
In order to diagnose IME issues in multi-user / multi-profile
environment, internal state of
InputMethodSubtypeSwitchingController needs to be included in
the bugreport.

Bug: 19340792
Bug: 19587437
Bug: 21612582
Change-Id: I34aca2c1a4330ec08b5e40441e631809a8bb844e
 2015-06-04 00:13:50 -07:00
Abodunrinwa Toki
b84975d090 am 34a29798: am bbb4c614: Merge "Fix floating toolbar position issues." into mnc-dev 
* commit '34a29798e961b692ad7096bbd3e9217e19899e76':
  Fix floating toolbar position issues.
 2015-06-04 00:27:08 +00:00
Abodunrinwa Toki
e3eb183350 Fix floating toolbar position issues. 
This CL makes the toolbar respect a viewport specified by
the content area (calculated from the globalVisibleRect and
windowInsets). By doing this the toolbar positions
itself appropraitely avoiding the status and nav bars.

Bug: 21324303
Change-Id: I3de9e114194dd43888b7f581ef12c3f8b813b3ca
 2015-06-03 20:33:49 +01:00
Abodunrinwa Toki
60416891d2 am 24a28fa6: am 96e727d1: Merge "Fix FloatingToolbar positioning for RTL." into mnc-dev 
* commit '24a28fa62919a82ced1371ea7fdc6c1091bb0273':
  Fix FloatingToolbar positioning for RTL.
 2015-06-03 18:49:09 +00:00