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

195871 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Wei Wang
8864ee5320 am dd99df0d: Merge "Fail sanity check when BSSID is empty in RTT request" into mnc-dev 
* commit 'dd99df0dbe21b73f437de1beb910b8ef7a2b6f30':
  Fail sanity check when BSSID is empty in RTT request
 2015-06-06 00:30:36 +00:00
Jae Seo
63d37d9f16 MediaController: Keep the controller when touch exploration is enabled 
Also added missing final and @Override keywords

Bug: 17199815
Change-Id: If96554e36799557a2d81767f287aeb446e4a1983
 2015-06-05 17:27:30 -07:00
Alan Viverette
371b582c49 Merge "Implement getColorFilter() on VectorDrawable" into mnc-dev 2015-06-06 00:26:04 +00:00
George Mount
e5a93aa81c Don't cause requestLayout when transition changes Visibility. 
Bug 21400515

When a Visibility transition temporarily changes a View's
visibility, it should not cause a requestLayout or any other
action, such as focus change. This adds a hidden method to
View to allow it to tweak the visibility without causing
other side-effects.

Change-Id: I5a06149983051319080130e5b5e7cc7edda8dd3e
 2015-06-05 17:21:40 -07:00
Wei Wang
dd99df0dbe Merge "Fail sanity check when BSSID is empty in RTT request" into mnc-dev 2015-06-06 00:20:27 +00:00
Alan Viverette
a741711900 Implement getColorFilter() on VectorDrawable 
Bug: 21580708
Change-Id: Id64bebeb5c39906ed34775e8ccc39f666966bad9
 2015-06-05 17:20:11 -07:00
Heidi von Markham
92e89dc85e am 25af46b0: Merge branch \'mnc-dev\' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into mnc-dev 
* commit '25af46b07d0dbe0f5800a17c231942e4eea7aa99':
  Camera2: add missing HFR implementation
 2015-06-06 00:16:55 +00:00
Joe Fernandez
606e65a87d am c37d84ac: am edaf008c: am b0ebbc86: Merge "Revert "docs: studio 1.2.2.0 updates"" into mnc-preview-docs 
* commit 'c37d84ac087717744e2c0df05a80fa829e6039a2':
  Revert "docs: studio 1.2.2.0 updates"
 2015-06-06 00:16:51 +00:00
Justin Harrison
705a35de3a am c3b9156e: am 6715ef75: am 4f2927d2: am 0eeb3bb8: am 33aa55b1: am 127d0b80: Merge "Revert "Revert "During early boot, send LOCALE_CHANGED only to registered receivers""" into lmp-mr1-dev 
* commit 'c3b9156e284b689845e65880b60be2efc9fa4127':
  Revert "Revert "During early boot, send LOCALE_CHANGED only to registered receivers""
 2015-06-06 00:16:46 +00:00
Justin Harrison
00fd82c3f7 am 9445df6f: am 95be178d: am c4d7c826: am f8c2ffef: am c8fd50b1: am 29b98884: Merge "Revert "During early boot, send LOCALE_CHANGED only to registered receivers"" into lmp-mr1-dev 
* commit '9445df6f0b2c6e623e9773bb8a5a1f51cc75ff76':
  Revert "During early boot, send LOCALE_CHANGED only to registered receivers"
 2015-06-06 00:16:41 +00:00
Rich Slogar
ad7fc99774 am 3a2a3104: am 34bebb04: am 16293cf5: Merge "docs: studio 1.2.2.0 updates" into mnc-preview-docs 
* commit '3a2a31042984282e22ab3e39d6444526980eb1c5':
  docs: studio 1.2.2.0 updates
 2015-06-06 00:16:36 +00:00
Luan Nguyen
2c11981cae am 1877a32f: am 26c3dd5b: am ef7458ed: Merge "docs: Add DevByte embedded video." into mnc-preview-docs 
* commit '1877a32f2124b6382eb8fe600e7cedb98b7316a2':
  docs: Add DevByte embedded video.
 2015-06-06 00:16:32 +00:00
Ruben Brunk
533514c9b5 am 8f955f89: Merge "Add UI for camera + flashlight battery reporting." into mnc-dev 
* commit '8f955f89c2ff19aac7f3e009c825beda3618f630':
  Add UI for camera + flashlight battery reporting.
 2015-06-06 00:16:27 +00:00
Heidi von Markham
25af46b07d Merge branch 'mnc-dev' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into mnc-dev 2015-06-06 00:07:02 +00:00
Zhijun He
d3bc26a853 Merge "Camera2: add missing HFR implementation" into mnc-dev 2015-06-06 00:06:46 +00:00
Joe Fernandez
c37d84ac08 am edaf008c: am b0ebbc86: Merge "Revert "docs: studio 1.2.2.0 updates"" into mnc-preview-docs 
* commit 'edaf008c5e594d140aa430965a779f0b35280730':
  Revert "docs: studio 1.2.2.0 updates"
 2015-06-06 00:06:25 +00:00
Justin Harrison
c3b9156e28 am 6715ef75: am 4f2927d2: am 0eeb3bb8: am 33aa55b1: am 127d0b80: Merge "Revert "Revert "During early boot, send LOCALE_CHANGED only to registered receivers""" into lmp-mr1-dev 
* commit '6715ef754a72fdc2477257051e539c38aae6afcd':
  Revert "Revert "During early boot, send LOCALE_CHANGED only to registered receivers""
 2015-06-06 00:06:07 +00:00
Justin Harrison
9445df6f0b am 95be178d: am c4d7c826: am f8c2ffef: am c8fd50b1: am 29b98884: Merge "Revert "During early boot, send LOCALE_CHANGED only to registered receivers"" into lmp-mr1-dev 
* commit '95be178dafd0dfefcae060f65df296cb523f82a4':
  Revert "During early boot, send LOCALE_CHANGED only to registered receivers"
 2015-06-06 00:06:02 +00:00
Rich Slogar
3a2a310429 am 34bebb04: am 16293cf5: Merge "docs: studio 1.2.2.0 updates" into mnc-preview-docs 
* commit '34bebb044062ebb783705c420b8a2e6b38d6af04':
  docs: studio 1.2.2.0 updates
 2015-06-06 00:05:44 +00:00
Luan Nguyen
1877a32f21 am 26c3dd5b: am ef7458ed: Merge "docs: Add DevByte embedded video." into mnc-preview-docs 
* commit '26c3dd5b0302ea6dcb353be2df8cfaf5f8ca5622':
  docs: Add DevByte embedded video.
 2015-06-06 00:05:05 +00:00
Ruben Brunk
8f955f89c2 Merge "Add UI for camera + flashlight battery reporting." into mnc-dev 2015-06-06 00:04:24 +00:00
Svetoslav
1edaf1bc57 am 772ca6cf: Merge "Update SMS permission description string" into mnc-dev 
* commit '772ca6cf2a72f9cbf6e5dbe8693112638f3b5481':
  Update SMS permission description string
 2015-06-05 23:59:56 +00:00
Christopher Tate
8462211c9c am 97c699e2: Merge "Don\'t run backups in battery-saver mode" into mnc-dev 
* commit '97c699e2bd6169f867311bd40b25801432e78f68':
  Don't run backups in battery-saver mode
 2015-06-05 23:59:52 +00:00
James Cook
715c502bed am 74f3d396: Merge "Allow different visual and voice assist prompts" into mnc-dev 
* commit '74f3d396712a805f5d2c6c1bb769c92b815dec87':
  Allow different visual and voice assist prompts
 2015-06-05 23:59:48 +00:00
Sanket Padawe
447cef97db am 912f705f: Merge "Suppress default logging in SubscriptionManager." into mnc-dev 
* commit '912f705f1f98ba2fc744601994dfbe12f391b0ae':
  Suppress default logging in SubscriptionManager.
 2015-06-05 23:59:43 +00:00
Svetoslav
772ca6cf2a Merge "Update SMS permission description string" into mnc-dev 2015-06-05 23:53:46 +00:00
Svetoslav
cfbca74bfa Update SMS permission description string 
Change-Id: I777615113dbdcd0df1b5f4984ae18bfa57976ba3
 2015-06-05 16:50:51 -07:00
Christopher Tate
97c699e2bd Merge "Don't run backups in battery-saver mode" into mnc-dev 2015-06-05 23:50:44 +00:00
James Cook
74f3d39671 Merge "Allow different visual and voice assist prompts" into mnc-dev 2015-06-05 23:49:59 +00:00
Stefan Kuhne
a3590bffa1 am 5c6c06bf: Merge "Adding am send-trim-memory command" into mnc-dev 
* commit '5c6c06bf187e6e96d9db1398108d613f86f5a912':
  Adding am send-trim-memory command
 2015-06-05 23:46:36 +00:00
Sanket Padawe
912f705f1f Merge "Suppress default logging in SubscriptionManager." into mnc-dev 2015-06-05 23:45:45 +00:00
Stefan Kuhne
5c6c06bf18 Merge "Adding am send-trim-memory command" into mnc-dev 2015-06-05 23:37:15 +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
f926e3b9bf am 8e518c81: Merge "Update docs to reflect correct time units" into mnc-dev 
* commit '8e518c81ea630ca37d373ceb90e3d6c01330cb38':
  Update docs to reflect correct time units
 2015-06-05 23:33:15 +00:00
Jae Seo
5da1398bf9 am 093d9949: TIF: Replace explicit types with <> 
* commit '093d994965bef197fb676731fc50f6f6f630b8fe':
  TIF: Replace explicit types with <>
 2015-06-05 23:33:10 +00:00
Adam Lesinski
8e518c81ea Merge "Update docs to reflect correct time units" into mnc-dev 2015-06-05 23:31:28 +00:00
Stefan Kuhne
16045c24fe Adding am send-trim-memory command 
This patch adds a send-trim-memory command to the ActivityManager to allow
for better debugging&testing.

The command is
adb shell am send-trim-memory [--user <USER_ID>] <PROCESS> <LEVEL>
whereas LEVEL can be one of the following:
[HIDDEN|RUNNING_MODERATE|BACKGROUND|RUNNING_LOW|MODERATE|
 RUNNING_CRITICAL|COMPLETE]

Bug: 21633189
Change-Id: I7a41ce02c3c9043ffd3e5aaa791f7b7306a9de49
 2015-06-05 16:30:29 -07: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
Jae Seo
093d994965 TIF: Replace explicit types with <> 
Also removed unnecessary boxing/unboxing

Change-Id: I97ef6b7f369cac97a133180773be96463f2a813d
 2015-06-05 16:24:57 -07:00
Jae Seo
369e88b68d am b40933de: Merge "TIF: Convert fields to local variables" into mnc-dev 
* commit 'b40933defeca2a27c1f0a5cf8f25919cb9ac2128':
  TIF: Convert fields to local variables
 2015-06-05 23:17:30 +00:00
Sanket Padawe
28964eb236 Suppress default logging in SubscriptionManager. 
Bug: 20465753
Change-Id: Ieeb493be7b32382c6adf1cf0664cf3e96cedace7
 2015-06-05 16:13:51 -07:00
Jae Seo
b40933defe Merge "TIF: Convert fields to local variables" into mnc-dev 2015-06-05 23:04:03 +00:00
Filip Gruszczynski
17ba2e6c49 am aaf1811d: Calculate outsets before window frame adjustment. 
* commit 'aaf1811dda607f10ab0f0ae80fd2b2b7cf9d0069':
  Calculate outsets before window frame adjustment.
 2015-06-05 23:00:32 +00:00
Yorke Lee
04ea7d3b7c Add telecom extra to specify handle for incoming call 
Bug: 19696065
Change-Id: Ie7c9e3f982808abd4944cfa7bd3c754b93479f84
 2015-06-05 16:00:12 -07:00
ztenghui
22cc9d47b1 am 5dfe9d30: Merge "Add reset to AVD" into mnc-dev 
* commit '5dfe9d30b4a5b765cc03907a4be30e2f7d013686':
  Add reset to AVD
 2015-06-05 22:54:19 +00:00
Yang Ni
ee8e4edeba am 6f4610bd: Merge "Fixed ScriptGroup for outputs to globals" into mnc-dev 
* commit '6f4610bdad3e270af59a8099970e8b40bf17f687':
  Fixed ScriptGroup for outputs to globals
 2015-06-05 22:54:15 +00:00
ztenghui
5dfe9d30b4 Merge "Add reset to AVD" into mnc-dev 2015-06-05 22:47:30 +00:00
Jonathan Basseri
1eb46fd4f9 am 64128563: Merge "Renaming carrier config variable keys." into mnc-dev 
* commit '6412856358493455692955147991d858cfe16f80':
  Renaming carrier config variable keys.
 2015-06-05 22:44:39 +00:00
Yang Ni
6f4610bdad Merge "Fixed ScriptGroup for outputs to globals" into mnc-dev 2015-06-05 22:43:27 +00:00
ztenghui
9605271806 Add reset to AVD 
b/21664621

Change-Id: Ie40c3723860e183c8e4fedd2a76b9debbdf64a2a
 2015-06-05 15:42:59 -07:00