Commit Graph

52770 Commits

Author SHA1 Message Date
John Spurlock
04ce57d972 am 20ac61b8: Merge "Zen: New user flow for requesting DND access." into mnc-dev
* commit '20ac61b8c0abd5af4ce32707e01cc1a501cbb7f0':
  Zen: New user flow for requesting DND access.
2015-06-08 16:45:49 +00:00
George Mount
a0d57af11b am 616bb3d5: Merge "API Council changes." into mnc-dev
* commit '616bb3d50c79842eeb5183d8637bc3a270a7d1a0':
  API Council changes.
2015-06-08 16:45:44 +00:00
John Spurlock
20ac61b8c0 Merge "Zen: New user flow for requesting DND access." into mnc-dev 2015-06-08 16:39:36 +00:00
George Mount
616bb3d50c Merge "API Council changes." into mnc-dev 2015-06-08 16:36:22 +00:00
John Spurlock
7c74f78a85 Zen: New user flow for requesting DND access.
- User flow is now similar to requesting access to notification
   content, namely prompting the user to visit a settings page
   for enabling/disabling apps access.
 - New ACTION_NOTIFICATION_POLICY_ACCESS_GRANTED_CHANGED intent
   for apps to listen to this state change.
 - Removed obsolete request method and associated internal callback
   aidl.
 - Added new android.permission.ACCESS_NOTIFICATION_POLICY permission
   for apps to include as a signal that they want to request this access
   (and therefore appear in the list on the settings page).
 - Improve javadocs, outline the user flow in NotificationManager#isNotificationPolicyAccessGranted
   and link to this method elsewhere.
 - NoManService now persists the user-enabled package list across reboots
   and does so per-user.
 - Rename public settings intent to correspond with the noman api.

Bug: 21621663
Change-Id: I72cbc21cd736e6a157b6be5d1d0ba0b4a8e7ef4e
2015-06-08 11:53:35 -04:00
Mady Mellor
58f9414499 am e1f3214e: Merge "Change stylus button press to context click in View - API review feedback" into mnc-dev
* commit 'e1f3214e72b63ed7cbe368005622055f80da0e0d':
  Change stylus button press to context click in View - API review feedback
2015-06-08 15:18:46 +00:00
Mady Mellor
20829525cc am a54a8626: Merge "Change stylus button press to context click in GD - API review feedback" into mnc-dev
* commit 'a54a8626ed77c5641adfb3dbcfdc9bf463478101':
  Change stylus button press to context click in GD - API review feedback
2015-06-08 15:18:39 +00:00
Mady Mellor
e1f3214e72 Merge "Change stylus button press to context click in View - API review feedback" into mnc-dev 2015-06-08 15:11:32 +00:00
Mady Mellor
a54a8626ed Merge "Change stylus button press to context click in GD - API review feedback" into mnc-dev 2015-06-08 15:11:10 +00:00
Chris Wren
50aaf5dd23 am aaf68f21: Merge "instrument emergency call button" into mnc-dev
* commit 'aaf68f216327a8a2adaf72032904b50796b4aea7':
  instrument emergency call button
2015-06-08 14:48:59 +00:00
Chris Wren
aaf68f2163 Merge "instrument emergency call button" into mnc-dev 2015-06-08 14:38:30 +00:00
George Mount
5c91771af2 am 7c79c82b: Merge "Don\'t cause requestLayout when transition changes Visibility." into mnc-dev
* commit '7c79c82b97dd7445974e740e8e58ca5dbb4fb121':
  Don't cause requestLayout when transition changes Visibility.
2015-06-08 14:25:17 +00:00
George Mount
7c79c82b97 Merge "Don't cause requestLayout when transition changes Visibility." into mnc-dev 2015-06-08 14:18:13 +00:00
Kenny Guy
8bf71ef27d am a73e4599: Merge "Correct the docs for getUserBadgedIcon" into mnc-dev
* commit 'a73e4599506a1d3498ef5e9c240d79d7125fd2e9':
  Correct the docs for getUserBadgedIcon
2015-06-08 12:47:02 +00:00
Kenny Guy
a73e459950 Merge "Correct the docs for getUserBadgedIcon" into mnc-dev 2015-06-08 12:34:26 +00:00
Abodunrinwa Toki
36961252d1 am 7d3b8833: Merge "Fix ActionMode.snooze API" into mnc-dev
* commit '7d3b8833df5857f5cc70d6c101abe7501fa22b49':
  Fix ActionMode.snooze API
2015-06-08 11:44:51 +00:00
Abodunrinwa Toki
7d3b8833df Merge "Fix ActionMode.snooze API" into mnc-dev 2015-06-08 11:36:19 +00:00
Martijn Coenen
443afdddea am 6280481a: Merge "Remove NFC CardEmulation dynamic resource APIs." into mnc-dev
* commit '6280481af6a7fb2631012a34b03b2d6b0d01eae5':
  Remove NFC CardEmulation dynamic resource APIs.
2015-06-08 09:35:01 +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
79e6cfcf1c am dcfbb618: Merge "Catch BadTokenException and continue in clearInsetofPreviousIme." into mnc-dev
* commit 'dcfbb618e33f432d83c56a79e71aeec5d81bbacd':
  Catch BadTokenException and continue in clearInsetofPreviousIme.
2015-06-08 05:45:05 +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
7956baa723 am 683e3cfe: Merge "MediaController: Keep the controller when touch exploration is enabled" into mnc-dev
* commit '683e3cfef17bb1a80d7c387200ac491e663d5af2':
  MediaController: Keep the controller when touch exploration is enabled
2015-06-06 05:16:57 +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
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
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
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
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
Mady Mellor
015020eb3a Change stylus button press to context click in GD - API review feedback
Based on API review feedback we should use onContextClick instead of
onStylusButtonPress. This CL updates associated methods and usage
in GestureDetector.

Additionally listens for mouse right clicks and calls the
onContextClick method for these as well.

Bug: 21572278
Change-Id: I4fa01997bff7265d5d2713353a93e07417a148e5
2015-06-05 14:41:22 -07:00
Wei Wang
a73c8b6fbf Merge "add gps gid to system_server" into mnc-dev 2015-06-05 21:34:11 +00:00
George Mount
aef1ae3391 API Council changes.
Bug 21571897

Change-Id: I681096c50a6f4a448e399b482742efc06229fab1
2015-06-05 14:23:47 -07:00