Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
199,109 Commits 3 Branches 0 Tags
add777bd54575449587fcdee0db0cb832f4b6873
Commit Graph

49120 Commits

Author SHA1 Message Date
Martijn Coenen
add777bd54 am de6294b0: am 2812397f: am 6280481a: Merge "Remove NFC CardEmulation dynamic resource APIs." into mnc-dev 
* commit 'de6294b0a20de4b4c0fcd20fc1a491c636e3462c':
  Remove NFC CardEmulation dynamic resource APIs.
 2015-06-08 17:22:35 +00:00
Seigo Nonaka
e07b975c30 am a7bcd727: am a202d86d: am dcfbb618: Merge "Catch BadTokenException and continue in clearInsetofPreviousIme." into mnc-dev 
* commit 'a7bcd72787045b6ed6d57dad4aaf1d614147f6b8':
  Catch BadTokenException and continue in clearInsetofPreviousIme.
 2015-06-08 17:22:25 +00:00
Martijn Coenen
de6294b0a2 am 2812397f: am 6280481a: Merge "Remove NFC CardEmulation dynamic resource APIs." into mnc-dev 
* commit '2812397fa6ca2c8ed5662ec9bfd88b0761e175d3':
  Remove NFC CardEmulation dynamic resource APIs.
 2015-06-08 17:04:37 +00:00
Seigo Nonaka
a7bcd72787 am a202d86d: am dcfbb618: Merge "Catch BadTokenException and continue in clearInsetofPreviousIme." into mnc-dev 
* commit 'a202d86d123103089d2cd4f7b6a60ed832acf079':
  Catch BadTokenException and continue in clearInsetofPreviousIme.
 2015-06-08 17:04:31 +00:00
Martijn Coenen
6280481af6 Merge "Remove NFC CardEmulation dynamic resource APIs." into mnc-dev 2015-06-08 08:05:14 +00:00
Seigo Nonaka
e937216c33 Catch BadTokenException and continue in clearInsetofPreviousIme. 
This is a follow up CL for Ib04967f39b2529251e4835c42e9f99dba2cf43f2.
As well explained in the I2c21573cf972145ab08e66604cdb9344139a3f31,
the race condition here cannot be avoided without an unacceptable
performance penalty.  For now, we follow the same way.

Bug: 21600287
Change-Id: I0ffdf8bf7e8a53cf8aba1339024b32da65d4f32d
 2015-06-08 12:47:25 +09:00
Jae Seo
6868787136 am 1a2519f7: am d0c34cba: am 683e3cfe: Merge "MediaController: Keep the controller when touch exploration is enabled" into mnc-dev 
* commit '1a2519f791d7493e5ca0c2c17a42b91569a7faf7':
  MediaController: Keep the controller when touch exploration is enabled
 2015-06-06 17:05:48 +00:00
Adam Skory
8504484452 am faf041da: am 3f6bf4b2: am e76e7014: Don\'t forget to parcel mIsAppProvidedIntent 
* commit 'faf041da2638d76bc1f42492017295238bf74019':
  Don't forget to parcel mIsAppProvidedIntent
 2015-06-06 17:05:13 +00:00
Adam Skory
cd9bfda5aa am 8e7f05c8: am e1015188: am a28863e7: Merge "Record provision of custom Intents in AssistContent" into mnc-dev 
* commit '8e7f05c86e313310f29439155c73e1a557ba0080':
  Record provision of custom Intents in AssistContent
 2015-06-06 17:05:05 +00:00
Eino-Ville Talvala
8bf7dfad4d am e6ddbc77: am ce491ee1: am 76233f06: Merge "Camera2: Legacy: Do not remap EACCES error code to PERMISSION_DENIED" into mnc-dev 
* commit 'e6ddbc7728f7d7b27a27a2ebd10b6dfe6c1ec83f':
  Camera2: Legacy: Do not remap EACCES error code to PERMISSION_DENIED
 2015-06-06 17:04:55 +00:00
Jae Seo
1a2519f791 am d0c34cba: am 683e3cfe: Merge "MediaController: Keep the controller when touch exploration is enabled" into mnc-dev 
* commit 'd0c34cbaa09921235b30dad595d501c6d4c60f2c':
  MediaController: Keep the controller when touch exploration is enabled
 2015-06-06 05:29:08 +00:00
Jae Seo
683e3cfef1 Merge "MediaController: Keep the controller when touch exploration is enabled" into mnc-dev 2015-06-06 05:06:07 +00:00
Adam Skory
faf041da26 am 3f6bf4b2: am e76e7014: Don\'t forget to parcel mIsAppProvidedIntent 
* commit '3f6bf4b287052f3fface43dd0377bcfada087de6':
  Don't forget to parcel mIsAppProvidedIntent
 2015-06-06 01:33:09 +00:00
Adam Skory
8e7f05c86e am e1015188: am a28863e7: Merge "Record provision of custom Intents in AssistContent" into mnc-dev 
* commit 'e10151882a255a13fc6b02123db891cae7d65143':
  Record provision of custom Intents in AssistContent
 2015-06-06 01:20:15 +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
Eino-Ville Talvala
e6ddbc7728 am ce491ee1: am 76233f06: Merge "Camera2: Legacy: Do not remap EACCES error code to PERMISSION_DENIED" into mnc-dev 
* commit 'ce491ee170e889aeb0b3c0342b86a9c586afd62c':
  Camera2: Legacy: Do not remap EACCES error code to PERMISSION_DENIED
 2015-06-06 01:01:16 +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
Heidi von Markham
0ad013020d am 68d29e22: am 92e89dc8: am 25af46b0: Merge branch \'mnc-dev\' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into mnc-dev 
* commit '68d29e2215eefe6dbf59b16ca49dfafd9a9e83c7':
  Camera2: add missing HFR implementation
 2015-06-06 00:46:00 +00:00
Ruben Brunk
790e1cc3c6 am 4335fbfe: am 533514c9: am 8f955f89: Merge "Add UI for camera + flashlight battery reporting." into mnc-dev 
* commit '4335fbfe173083bc1be3989beeac74fc02deef37':
  Add UI for camera + flashlight battery reporting.
 2015-06-06 00:45:22 +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
68d29e2215 am 92e89dc8: am 25af46b0: Merge branch \'mnc-dev\' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into mnc-dev 
* commit '92e89dc85e2b9c649c221f97efcdee7cdfc4f76b':
  Camera2: add missing HFR implementation
 2015-06-06 00:30:20 +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
da591cc0fe am 80a250a3: am 715c502b: am 74f3d396: Merge "Allow different visual and voice assist prompts" into mnc-dev 
* commit '80a250a3c8f3a0851e7aac0929b8c0a0aa382657':
  Allow different visual and voice assist prompts
 2015-06-06 00:28:48 +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
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
Stefan Kuhne
dd335a119f am 00032442: am a3590bff: am 5c6c06bf: Merge "Adding am send-trim-memory command" into mnc-dev 
* commit '000324423f16362cd14b805af801a4ea3dfd8cd0':
  Adding am send-trim-memory command
 2015-06-06 00:15:56 +00:00
Zhijun He
d3bc26a853 Merge "Camera2: add missing HFR implementation" into mnc-dev 2015-06-06 00:06:46 +00:00
Ruben Brunk
8f955f89c2 Merge "Add UI for camera + flashlight battery reporting." into mnc-dev 2015-06-06 00:04:24 +00:00
Stefan Kuhne
000324423f am a3590bff: am 5c6c06bf: Merge "Adding am send-trim-memory command" into mnc-dev 
* commit 'a3590bffa11dabd0721b731f53e0a1ad84caeabc':
  Adding am send-trim-memory command
 2015-06-06 00:00:06 +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
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
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
Adam Powell
50a11e9d27 am 411b6c06: am 086f5085: am cedc7b3b: Merge "Use real rounding in ImageView bounds configuration" into mnc-dev 
* commit '411b6c069f352853b0ca54d8b5f176299b178833':
  Use real rounding in ImageView bounds configuration
 2015-06-05 20:41:58 +00:00
Adam Powell
411b6c069f am 086f5085: am cedc7b3b: Merge "Use real rounding in ImageView bounds configuration" into mnc-dev 
* commit '086f5085eab75d380b51cf3a286acfada7de6734':
  Use real rounding in ImageView bounds configuration
 2015-06-05 20:29:27 +00:00
Adam Powell
cedc7b3ba4 Merge "Use real rounding in ImageView bounds configuration" into mnc-dev 2015-06-05 20:07:07 +00:00
Alan Viverette
6a521c66ab am c7ee1730: am 6e1c6b19: am a06b41b0: Merge "Avoid NPE when drawable fails to load" into mnc-dev 
* commit 'c7ee173002c5a7950a433bd245524394ab4d5ab1':
  Avoid NPE when drawable fails to load
 2015-06-05 17:54:23 +00:00
Alan Viverette
a788ffc3fe am 8aa4d2a1: am 43b123c1: am 42cc892b: Merge "Account for margins in ScrollView onMeasure() when filling viewport" into mnc-dev 
* commit '8aa4d2a19fc4aa497a6fa34c97f13376444e10ac':
  Account for margins in ScrollView onMeasure() when filling viewport
 2015-06-05 17:54:18 +00:00
Alan Viverette
c7ee173002 am 6e1c6b19: am a06b41b0: Merge "Avoid NPE when drawable fails to load" into mnc-dev 
* commit '6e1c6b19fd92889293fa0af8f48d5d0589a0911e':
  Avoid NPE when drawable fails to load
 2015-06-05 17:42:57 +00:00
Alan Viverette
8aa4d2a19f am 43b123c1: am 42cc892b: Merge "Account for margins in ScrollView onMeasure() when filling viewport" into mnc-dev 
* commit '43b123c134f7496ee83308748978e0fea2c2d4c6':
  Account for margins in ScrollView onMeasure() when filling viewport
 2015-06-05 17:42:51 +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
866d3c7bfb am 5d9d3281: am e3aba488: am 3e85c1ed: Merge "Fix Select All should not be shown when everything is already selected" into mnc-dev 
* commit '5d9d32816afca2976634dff0e4cdfd16f30e65b1':
  Fix Select All should not be shown when everything is already selected
 2015-06-05 16:58:12 +00:00
Clara Bayarri
5d9d32816a am e3aba488: am 3e85c1ed: Merge "Fix Select All should not be shown when everything is already selected" into mnc-dev 
* commit 'e3aba4889e34392f38ca57a6fba164cacdd4cdf3':
  Fix Select All should not be shown when everything is already selected
 2015-06-05 16:46:53 +00:00
Mady Mellor
74bf927e5f am f65aa46c: am 854a2899: am 0f2f9f7a: Merge "Stylus scale - API review feedback" into mnc-dev 
* commit 'f65aa46c503d9f0ca837203004782aa64971bd69':
  Stylus scale - API review feedback
 2015-06-05 16:25:23 +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
f65aa46c50 am 854a2899: am 0f2f9f7a: Merge "Stylus scale - API review feedback" into mnc-dev 
* commit '854a2899c6a70af57d41e338e61d3e809fb98fcf':
  Stylus scale - API review feedback
 2015-06-05 16:13:50 +00:00