Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
195,746 Commits 3 Branches 0 Tags
f7606047eee0291d223fb08d080462744549031d
Commit Graph

52738 Commits

Author SHA1 Message Date
Adam Skory
f7606047ee am e76e7014: Don\'t forget to parcel mIsAppProvidedIntent 
* commit 'e76e7014c7aa22f56f1b82c87d9d80106b5ddcc1':
  Don't forget to parcel mIsAppProvidedIntent
 2015-06-06 01:20:36 +00:00
Adam Skory
e76e7014c7 Don't forget to parcel mIsAppProvidedIntent 
If you forget to parcel it like I did, it's
not going to do you much good.

Change-Id: I85191594e7ffab2c36aeed317932b126da288bdf
 2015-06-05 19:08:01 -06:00
Adam Skory
dd3899aee7 am a28863e7: Merge "Record provision of custom Intents in AssistContent" into mnc-dev 
* commit 'a28863e76979a3551509d8e5eccf3a1c7c604022':
  Record provision of custom Intents in AssistContent
 2015-06-06 01:07:39 +00:00
Adam Skory
a28863e769 Merge "Record provision of custom Intents in AssistContent" into mnc-dev 2015-06-06 01:01:00 +00:00
Adam Skory
cd70c64f50 Record provision of custom Intents in AssistContent 
Simplifies behavior wrt automatically setting the
web URI for ACTION_VIEW Intents, by not doing so
for custom Intents.

Adds a boolean isAppProvidedIntent() as a signal for
recepients of the AssistContent that a custom Intent
was provided. Custom Intents are more likely to be
relevant.

Change-Id: Ibe4bfa040eba904411b9820ab4ddfcf509413829
 2015-06-05 18:55:29 -06:00
Eino-Ville Talvala
fa6a4729e0 am 76233f06: Merge "Camera2: Legacy: Do not remap EACCES error code to PERMISSION_DENIED" into mnc-dev 
* commit '76233f068bde3c19d1d0986efee4fb21df973ed5':
  Camera2: Legacy: Do not remap EACCES error code to PERMISSION_DENIED
 2015-06-06 00:49:45 +00:00
Eino-Ville Talvala
76233f068b Merge "Camera2: Legacy: Do not remap EACCES error code to PERMISSION_DENIED" into mnc-dev 2015-06-06 00:40:16 +00:00
Heidi von Markham
ea5d021615 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:17:42 +00:00
Ruben Brunk
b31e547597 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:17:13 +00:00
Etan Cohen
d40a83543a Merge commit 'bff7b32' into merge 2015-06-05 17:15:18 -07:00
Zhijun He
d3bc26a853 Merge "Camera2: add missing HFR implementation" into mnc-dev 2015-06-06 00:06:46 +00:00
James Cook
c049c72d2a am 74f3d396: Merge "Allow different visual and voice assist prompts" into mnc-dev 
* commit '74f3d396712a805f5d2c6c1bb769c92b815dec87':
  Allow different visual and voice assist prompts
 2015-06-06 00:06:41 +00:00
Ruben Brunk
8f955f89c2 Merge "Add UI for camera + flashlight battery reporting." into mnc-dev 2015-06-06 00:04:24 +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
e42751516d am 5c6c06bf: Merge "Adding am send-trim-memory command" into mnc-dev 
* commit '5c6c06bf187e6e96d9db1398108d613f86f5a912':
  Adding am send-trim-memory command
 2015-06-05 23:47:00 +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
eaa437131d 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:16 +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
Zhijun He
d24e49bba8 Camera2: add missing HFR implementation 
Bug: 21442271
Change-Id: I08c0a5b75ccb0f737013026511cfe3bf9e15c744
 2015-06-05 14:55:04 -07:00
Wei Wang
948e6cfec8 am a73c8b6f: Merge "add gps gid to system_server" into mnc-dev 
* commit 'a73c8b6fbf9ef2091db7300d0f290335024e4af5':
  add gps gid to system_server
 2015-06-05 21:44:57 +00:00
Wei Wang
a73c8b6fbf Merge "add gps gid to system_server" into mnc-dev 2015-06-05 21:34:11 +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
Adam Powell
3eaf106a3a am cedc7b3b: Merge "Use real rounding in ImageView bounds configuration" into mnc-dev 
* commit 'cedc7b3ba4449da497f9e81c66ff7700c2a364fc':
  Use real rounding in ImageView bounds configuration
 2015-06-05 20:15:56 +00:00
Adam Powell
cedc7b3ba4 Merge "Use real rounding in ImageView bounds configuration" into mnc-dev 2015-06-05 20:07:07 +00:00
Adam Lesinski
7b83b0c75c Update docs to reflect correct time units 
Change-Id: Id2757e45e989b148671cf83d51011984e07cd017
 2015-06-05 12:59:36 -07:00
Alan Viverette
14f3776b36 am a06b41b0: Merge "Avoid NPE when drawable fails to load" into mnc-dev 
* commit 'a06b41b06e5bbcf5bf02741a765ebad5367c14de':
  Avoid NPE when drawable fails to load
 2015-06-05 17:27:24 +00:00
Alan Viverette
9896efc792 am 42cc892b: Merge "Account for margins in ScrollView onMeasure() when filling viewport" into mnc-dev 
* commit '42cc892be135ed5be6f98f5f70bb6739bfaecaad':
  Account for margins in ScrollView onMeasure() when filling viewport
 2015-06-05 17:27:18 +00:00
Alan Viverette
a06b41b06e Merge "Avoid NPE when drawable fails to load" into mnc-dev 2015-06-05 17:20:41 +00:00
Alan Viverette
42cc892be1 Merge "Account for margins in ScrollView onMeasure() when filling viewport" into mnc-dev 2015-06-05 17:18:47 +00:00
Alan Viverette
0f1c95edf8 Avoid NPE when drawable fails to load 
Bug: 17760671
Change-Id: I99364e915e318b3e49fc758811784939a937de7c
 2015-06-05 10:17:21 -07:00
Clara Bayarri
5d48e93b9f am 3e85c1ed: Merge "Fix Select All should not be shown when everything is already selected" into mnc-dev 
* commit '3e85c1ed0cce70164dfe6f8ffa4bf3695c4ce0ba':
  Fix Select All should not be shown when everything is already selected
 2015-06-05 16:31:57 +00:00
Clara Bayarri
3e85c1ed0c Merge "Fix Select All should not be shown when everything is already selected" into mnc-dev 2015-06-05 16:19:31 +00:00
Mady Mellor
e24f34232e am 0f2f9f7a: Merge "Stylus scale - API review feedback" into mnc-dev 
* commit '0f2f9f7a51a43ef8ca1d977f62cf649d08d6ec84':
  Stylus scale - API review feedback
 2015-06-05 16:01:06 +00:00
Adam Powell
14d1f1383f Use real rounding in ImageView bounds configuration 
While a useful tactic in previous years, the (int) (float + 0.5f)
trick is inaccurate in some cases. Tradeoffs have changed; do the real
thing now.

Bug 20145160

Change-Id: I8af31bcb1945dc113fd36e094f5970ebd4ec0304
 2015-06-05 08:51:45 -07:00
Mady Mellor
0f2f9f7a51 Merge "Stylus scale - API review feedback" into mnc-dev 2015-06-05 15:50:52 +00:00
Chet Haase
4628f85bdc am e790c977: Hide View.getBackgroundColor() prior to removal 
* commit 'e790c97787dbc05930ad0c4a708fad7cd7d3f2b9':
  Hide View.getBackgroundColor() prior to removal
 2015-06-05 14:55:27 +00:00
Chet Haase
e790c97787 Hide View.getBackgroundColor() prior to removal 
Issue #21572678  API Review: android.view.View.getBackgroundColor()

Change-Id: Ia4fa9e207db3af6e076581bf23747eba6e56bb69
 2015-06-05 14:41:51 +00:00
Zoltan Szatmary-Ban
ed232f58eb am c92550e4: Merge "Replace renamed reference to NetworkStats in javadoc" into mnc-dev 
* commit 'c92550e4b44da843a530dcde0ed26f221d3df0fc':
  Replace renamed reference to NetworkStats in javadoc
 2015-06-05 10:07:30 +00:00
Zoltan Szatmary-Ban
c92550e4b4 Merge "Replace renamed reference to NetworkStats in javadoc" into mnc-dev 2015-06-05 09:59:02 +00:00
Zhijun He
2c3c333c80 am 16ed7e70: Merge "Camera2: fix doc build" into mnc-dev 
* commit '16ed7e70c869e12eae4721d6b4380c05c3423c78':
  Camera2: fix doc build
 2015-06-05 03:44:26 +00:00
Zhijun He
16ed7e70c8 Merge "Camera2: fix doc build" into mnc-dev 2015-06-05 03:33:59 +00:00
Zhijun He
39d1461cf1 Camera2: fix doc build 
Bug: 21645842
Change-Id: Ibd4ce455d9906da858b98f17fd7859016c1730c3
 2015-06-04 20:21:23 -07:00
Abodunrinwa Toki
12ade2aca5 am 4741f6a4: Merge "TextView: Make sure the contentRect is within visibile bounds." into mnc-dev 
* commit '4741f6a4c7c7d705d6b7907798a3bb89b2501e9b':
  TextView: Make sure the contentRect is within visibile bounds.
 2015-06-05 03:18:50 +00:00
Abodunrinwa Toki
4741f6a4c7 Merge "TextView: Make sure the contentRect is within visibile bounds." into mnc-dev 2015-06-05 03:08:09 +00:00
Johnson Hsieh
d6e6bbdbf3 am 997f3cca: Merge "Fix build: documentation error in AlarmClock.java." into mnc-dev 
* commit '997f3ccad33394fabe62a6a388e701e07a52e408':
  Fix build: documentation error in AlarmClock.java.
 2015-06-05 03:07:42 +00:00
Johnson Hsieh
997f3ccad3 Merge "Fix build: documentation error in AlarmClock.java." into mnc-dev 2015-06-05 02:58:42 +00:00
Johnson Hsieh
bcc1ff6726 Fix build: documentation error in AlarmClock.java. 
Change-Id: I3f64df1857c516d4c6a4ed56094a27f489eddef3
 2015-06-04 19:51:52 -07:00
Filip Gruszczynski
621a8ba789 am 43c4cd1c: am 93634166: am d88e4d50: Merge "ActivityView: set surface on a background thread." into cw-d-mr1-dev 
* commit '43c4cd1c82eab55decd88816a505ed102b79fb81':
  ActivityView: set surface on a background thread.
 2015-06-05 02:35:09 +00:00