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

12384 Commits

Author SHA1 Message Date
Jeff Brown
c05c1aeedf Revert "Initial draft of new MediaRouter APIs." 
This reverts commit 1a937b04e63539cb1fab1bde601031d415c7156f.

Bug: 20641986
Change-Id: I035d945d1561e5fc7c914aa9362635f763c83cfd
 2015-05-06 16:02:21 -07:00
Alan Viverette
809d5d7fbe Merge "DayNight theme for framework packages" into mnc-dev 2015-05-06 17:25:26 +00:00
Alan Viverette
922e1c6ed2 Add scroll indicators on View, use in AlertDialog 
Also updates default fade duration for scrollbars to match Material
spec and moves around some padding in AlertDialog so that scrolling
text and list items aren't so close to the title.

Bug: 19098033
Change-Id: I40dca6a931480c4c48463e3ea5b8361534cbd8d7
 2015-05-06 10:09:35 -07:00
Alan Viverette
7f76ff39b7 Merge "Fix checkbox animation end colors" into mnc-dev 2015-05-06 03:55:38 +00:00
Selim Cinek
6329bbceeb Merge "The voice assist may now be launched above the lockscreen" into mnc-dev 2015-05-05 23:52:35 +00:00
Etan Cohen
f8904dccf4 Disable VT over IMS feature. 
Feature code (mostly) implemented but not final or supported in release.

Change-Id: I65c4d4400a814718c51954299ef7c993a37638e2
 2015-05-05 15:18:07 -07:00
Selim Cinek
e70d653523 The voice assist may now be launched above the lockscreen 
A possibility was introduced to launch voice assist over
the lockscreen using the left keyguard affordance.

Change-Id: Ic4618d24256b65441a50d77d0ef59b0ec99b6ead
 2015-05-05 14:52:52 -07:00
Alan Viverette
b9da280ac2 DayNight theme for framework packages 
Change-Id: I745f90561c957c83540e75a2886e294633c83be1
 2015-05-05 14:09:21 -07:00
Pavel Zhamaitsiak
b2e3b74418 Merge "WiFi Calling: Show different operator name string in Data usage dialog." into mnc-dev 2015-05-05 21:05:49 +00:00
Pavel Zhamaitsiak
5504d39b7f WiFi Calling: Show different operator name string in Data usage dialog. 
Bug: 19950657
Change-Id: I9999d58e78154ed2d6d824973c40011875de15ef
(cherry picked from lmp-mr1-wfc-dev)
 2015-05-05 13:59:28 -07:00
Svet Ganov
4a64b19f23 Merge "Permission UI - legacy apps support" into mnc-dev 2015-05-05 15:34:10 +00:00
Svet Ganov
019d230499 Permission UI - legacy apps support 
Change-Id: Id3f98c138422d33868363d587dd196898b42a0d4
 2015-05-05 08:33:04 -07:00
Prerepa Viswanadham
d1808401ca Merge changes from topic 'mwd-merge-050415' into mnc-dev 
* changes:
  Merge commit 'b6f59f4' into master_merge
  Merge commit 'f6db0ce' into master_merge
  Merge commit '17455a3' into master_merge
  Merge commit 'b4d5b32' into master_merge
  Merge commit 'a1a2fa7' into master_merge
  Merge commit '8dfdb98' into master_merge
  Merge commit 'eba66c3' into master_merge
 2015-05-05 01:06:38 +00:00
Alan Viverette
e318a467e1 Fix checkbox animation end colors 
Uses a themed color state list so that even though the animations will
end showing the same drawable that they started from, and therefore the
same tint, the correct color will be displayed based on the state. Also
renames the checkbox assets so it's easier to figure out which one is
going in which direction.

Bug: 20733852
Change-Id: I1e8331d9f035595953db6df3b28b766db3617e1c
 2015-05-04 13:58:42 -07:00
Geoff Mendal
123db791d0 Import translations. DO NOT MERGE 
Change-Id: I6371c9d043b9d5436804c4d755ecc6a645ff7119
Auto-generated-cl: translation import
 2015-05-04 07:43:39 -07:00
Matthew Williams
303650c9cd Add full backup criteria to android manifest 
BUG: 20010079
Api change: ApplicationInfo now has a fullBackupContent int
where -1 is (off) 0 is (on) and >0 indicates an xml
resource that should be parsed in order for a developer
to indicate exactly which files they want to include/exclude
from the backup set.
dd: https://docs.google.com/document/d/1dnNctwhWOI-_qtZ7I3iNRtrbShmERj2GFTzwV4xXtOk/edit#heading=h.wcfw1q2pbmae

Change-Id: I90273dc0aef5e9a3230c6b074a45e8f5409ed5ce
 2015-05-03 16:19:27 -07:00
Geoff Mendal
d6fec943d7 Import translations. DO NOT MERGE 
Change-Id: Ib21a9d53d30f304a1c82dc4f45e82f3fe27723bb
Auto-generated-cl: translation import
 2015-05-01 23:27:24 -07:00
Bryce Lee
13428b5079 am f626c679: am a7f07fc3: Merge "Add configuration to allow animations during low power mode." into lmp-mr1-modular-dev 
* commit 'f626c679fdd7e44c6cf0eb2d2f6be786636a90bc':
  Add configuration to allow animations during low power mode.
 2015-05-02 01:22:24 +00:00
Jorim Jaggi
0629a5d524 Merge "Rename supportsAssistGesture to supportsAssist" into mnc-dev 2015-05-01 20:34:22 +00:00
Jorim Jaggi
5f560d0562 Rename supportsAssistGesture to supportsAssist 
Bug: 20642759
Change-Id: Idddc786980244cc94570d04fd414540bbad60448
 2015-05-01 13:33:38 -07:00
Prerepa Viswanadham
059ded5a7b Merge commit 'b6f59f4' into master_merge 2015-05-01 10:12:42 -07:00
Alan Viverette
ec48536d30 am 4cff05e1: am 87706358: am ac7927a8: Merge "LayoutInflater should always try to generate LayoutParams for include" into mnc-dev 
* commit '4cff05e1f7ec780f1ab0b77202453867eaf146f3':
  LayoutInflater should always try to generate LayoutParams for include
 2015-05-01 01:33:00 +00:00
Mady Mellor
d274400205 resolved conflicts for merge of 04f2fe39 to master 
Change-Id: I9cd9efb3ead33cef9a0de95417d71d535cbc1bce
 2015-04-30 16:17:16 -07:00
Alan Viverette
877063589a am ac7927a8: Merge "LayoutInflater should always try to generate LayoutParams for include" into mnc-dev 
* commit 'ac7927a89519a79ab73723a13ed9ea12ca16056f':
  LayoutInflater should always try to generate LayoutParams for include
 2015-04-30 21:09:51 +00:00
Alan Viverette
ac7927a895 Merge "LayoutInflater should always try to generate LayoutParams for include" into mnc-dev 2015-04-30 21:03:23 +00:00
Bryce Lee
f626c679fd am a7f07fc3: Merge "Add configuration to allow animations during low power mode." into lmp-mr1-modular-dev 
* commit 'a7f07fc35ba647465503fe0cba3d4521b68d89c1':
  Add configuration to allow animations during low power mode.
 2015-04-30 20:01:02 +00:00
Alan Viverette
84aa2fb65a LayoutInflater should always try to generate LayoutParams for include 
A recent optimization assumed that layout_width and layout_height always
had to be defined to successfully generate layout params, but this is not
guaranteed to be true for custom ViewGroups.

Bug: 20267738
Change-Id: If09d346f30c0848b984b9137088f8f3b7617cd08
 2015-04-30 12:33:54 -07:00
Mady Mellor
d73f05f5f0 am 2619ef39: Merge "Add onStylusButtonPress listener to View" into mnc-dev 
* commit '2619ef3918e15bf415fb038e942cfbd98bff4c6a':
  Add onStylusButtonPress listener to View
 2015-04-30 19:23:12 +00:00
Mady Mellor
2619ef3918 Merge "Add onStylusButtonPress listener to View" into mnc-dev 2015-04-30 19:06:45 +00:00
Mady Mellor
e82067b575 Add onStylusButtonPress listener to View 
The gesture is: stylus touching screen + button pressed, the event
is recognized when the button is pressed, not when it's released.
It can be pressed during DOWN or MOVE.

If the stylus touch + press button is occurring longpress cannot
occur and vice versa. Also adds the haptic feedback and accessibility
bits specific to the new gesture.

Bug: 19620479
Change-Id: Ibc4654978ef39e7b4251d17636453d90f3bf622d
 2015-04-30 09:58:35 -07:00
Alan Viverette
b0f13dc4be am 68999a74: am 19b9f8ef: am 8310f87d: Merge "ActionBar SearchView\'s default hint shouldn\'t override SearchableInfo" into mnc-dev 
* commit '68999a740c511abe0550c721e13580b8d041de51':
  ActionBar SearchView's default hint shouldn't override SearchableInfo
 2015-04-30 16:25:24 +00:00
John Spurlock
b7ca2709c3 am 0f4c6a8b: am 1642e354: am 8f72b403: Merge "Zen: New event condition data model." into mnc-dev 
* commit '0f4c6a8bdf6444d05a6d9de3b32ec2bc7f39f1b3':
  Zen: New event condition data model.
 2015-04-30 16:25:19 +00:00
Abodunrinwa Toki
9d0b4d9eb6 am 74f745fe: am d0363bc3: am 5793f22e: Merge "Use theme attributes for FloatingToolbar colors." into mnc-dev 
* commit '74f745fe887528354bc2a48267e59141d565ebc3':
  Use theme attributes for FloatingToolbar colors.
 2015-04-30 16:25:08 +00:00
Alan Viverette
19b9f8ef3e am 8310f87d: Merge "ActionBar SearchView\'s default hint shouldn\'t override SearchableInfo" into mnc-dev 
* commit '8310f87d96791e8b864df5e821fe65273c2dd874':
  ActionBar SearchView's default hint shouldn't override SearchableInfo
 2015-04-30 16:07:36 +00:00
Alan Viverette
8310f87d96 Merge "ActionBar SearchView's default hint shouldn't override SearchableInfo" into mnc-dev 2015-04-30 15:59:21 +00:00
John Spurlock
1642e354ed am 8f72b403: Merge "Zen: New event condition data model." into mnc-dev 
* commit '8f72b4037022c4f860caafa296e2ac309bde177f':
  Zen: New event condition data model.
 2015-04-30 15:58:27 +00:00
John Spurlock
8f72b40370 Merge "Zen: New event condition data model." into mnc-dev 2015-04-30 15:45:55 +00:00
John Spurlock
d60258f2d3 Zen: New event condition data model. 
- Add system condition provider for calendar event-based rules.
 - Add stub condition provider for handling event conditions.
 - Add various shared items to support new settings subpage.

Bug: 20064962
Change-Id: I6f5afe0f1444976f0dc6807048e0580e8a28070e
 2015-04-30 11:42:11 -04:00
Benjamin Franz
c5e3d4361d am f225e6c6: am 550ab61c: am dc4ad271: Merge "Add package name extra to PackageInstaller callback" into mnc-dev 
* commit 'f225e6c6af849f965eec8392204b2491f17babac':
  Add package name extra to PackageInstaller callback
 2015-04-30 15:35:05 +00:00
Abodunrinwa Toki
d0363bc394 am 5793f22e: Merge "Use theme attributes for FloatingToolbar colors." into mnc-dev 
* commit '5793f22e68f74522dfe5780b96b22d18617467be':
  Use theme attributes for FloatingToolbar colors.
 2015-04-30 12:33:04 +00:00
Abodunrinwa Toki
5793f22e68 Merge "Use theme attributes for FloatingToolbar colors." into mnc-dev 2015-04-30 12:18:51 +00:00
Benjamin Franz
550ab61ca5 am dc4ad271: Merge "Add package name extra to PackageInstaller callback" into mnc-dev 
* commit 'dc4ad271f931eca48ab8ef22ef76db740d179d99':
  Add package name extra to PackageInstaller callback
 2015-04-30 09:40:39 +00:00
Benjamin Franz
dc4ad271f9 Merge "Add package name extra to PackageInstaller callback" into mnc-dev 2015-04-30 08:33:47 +00:00
Bryce Lee
023de22cf2 Add configuration to allow animations during low power mode. 
On Android Wear, the stream ui needs to continue to be animated during
low power mode.

Bug: 20696607
Change-Id: I24a87eba8d86169d04a72012e0311357622db00a
 2015-04-29 18:34:44 -07:00
Maxim Bogatov
aba56b648f Merge "Add accessibility actions for scrolling in different directions" 2015-04-30 01:16:02 +00:00
Alan Viverette
b4004dfc84 ActionBar SearchView's default hint shouldn't override SearchableInfo 
Moves the queryHint to defaultQueryHint, specifies the override order
as queryHint > SearchableInfo > defaultQueryHint.

Cleans up annotations and comments for several related methods.

Bug: 20614122
Change-Id: Ib58ec309e6814cd512df147d789ec0cd546018af
 2015-04-29 16:55:42 -07:00
Etan Cohen
b6f59f48cb Merge "IMS-VT: Enable video calls" into m-wireless-dev 2015-04-29 23:29:49 +00:00
Dianne Hackborn
c5cbdfcfe5 am 8756f9b3: am 599a4e0e: am 9ac2718e: Merge "Implement user-settable power save whitelist." into mnc-dev 
* commit '8756f9b34dd04cabae7487bd1941008a6c98c4c6':
  Implement user-settable power save whitelist.
 2015-04-29 21:02:36 +00:00
Dianne Hackborn
599a4e0ea8 am 9ac2718e: Merge "Implement user-settable power save whitelist." into mnc-dev 
* commit '9ac2718e7dcf274ad41fbb374bedabadc558634b':
  Implement user-settable power save whitelist.
 2015-04-29 20:40:12 +00:00
Abodunrinwa Toki
09de3928ee Use theme attributes for FloatingToolbar colors. 
Bug: 20148220
Change-Id: Idc64313040f873dadf05a8c777343c67538199a6
 2015-04-29 20:52:58 +01:00