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

12517 Commits

Author SHA1 Message Date
Vinit Deshpande
f0742bdf06 Merge changes from topic 'mwd-merge-wifi-0602015' into mnc-dev 
* changes:
  keep hal based pno disabled by default
  fix annoying typo
  enable SSID whitelist
  Rename HandlerThread name in RttManager     The sHandlerThread name in RttManager is called "WifiScanner".     It should be changed to RTTManager
 2015-06-03 05:09:32 +00:00
Geoff Mendal
ec07df075e Import translations. DO NOT MERGE 
Change-Id: Iac607a9db94c1949d364ae78a584285bc0882194
Auto-generated-cl: translation import
 2015-06-02 17:01:40 -07:00
Amith Yamasani
ff3b76d046 Merge "Temporarily whitelist an app for network during doze" into mnc-dev 2015-06-02 20:34:59 +00:00
Pierre Vandwalle
8944741c4f keep hal based pno disabled by default 
Change-Id: Ia0de13fa127877a6bfd8b46b5a8b940b1faa7f3d
(cherry picked from commit e447fcd445f339f12d81dafa98a3b8d8a6a1ae7e)
 2015-06-02 13:31:48 -07:00
Pierre Vandwalle
d07695ad94 enable SSID whitelist 
Change-Id: Ic95a0ecd1d7ad7ae2a0f6232b2e8688fdb41dcc2
(cherry picked from commit 4f7606eb88ffcaa264aeb29241c59c403a879f25)
 2015-06-02 13:31:15 -07:00
Adrian Roos
3546c61b27 Remove obsolete symbols 
Change-Id: I8e95e82ef4f954376c57685df80184416d579fe5
 2015-06-02 19:56:11 +00:00
Amith Yamasani
af575b9f8e Temporarily whitelist an app for network during doze 
API to allow an app to be whitelisted for network and wakelock
access for a short period. So even if the device is in idle
mode, such apps can be given a chance to download the payload
related to a high priority cloud-to-device message.

This API is meant for system apps only.

A new permission CHANGE_DEVICE_IDLE_TEMP_WHITELIST is required
to make this call.

Bug: 21525864
Change-Id: Id7a761a664f21af5d7ff55aa56e8df98d15511ca
 2015-06-02 11:05:03 -07:00
Svetoslav
acbe426bbc Merge "Add accidentally deleted strings." into mnc-dev 2015-06-01 23:53:55 +00:00
Svetoslav
5f79d8282d Add accidentally deleted strings. 
Change-Id: I16d7c151b46c076bfdccb1ff0b2bcb0934eedf93
 2015-06-01 16:51:11 -07:00
Alan Viverette
aa67bb1425 ActionBar menu text should look like Button 
Bug: 21560189
Change-Id: Idae6569a5b1c9e3e3ab297c4d057f37e9add9aaa
 2015-06-01 11:27:04 -07:00
Filip Gruszczynski
99bcc3eee2 Merge "Revert "Revert "resolved conflicts for merge of 47249f2a to mnc-dev""" into mnc-dev 2015-06-01 15:42:42 +00:00
Alan Viverette
db2911321b Merge "Replace PNG-based seekbar thumb animation with AVD" into mnc-dev 2015-05-29 22:51:04 +00:00
Alan Viverette
87e1938be8 Replace PNG-based seekbar thumb animation with AVD 
Adds optical inset support for VectorDrawable and GradientDrawable.

Bug: 19944181
Change-Id: I9df04d9fe17ad858413e7f93694bf37ee2c43c85
 2015-05-29 15:12:14 -07:00
Doris Liu
f042cd841f Merge "Update doc to include how clipToPadding affects EdgeEffect" into mnc-dev 2015-05-29 20:28:21 +00:00
Doris Liu
b134b5e376 Update doc to include how clipToPadding affects EdgeEffect 
Bug: 19126514
Change-Id: I72c6ac20b4c72421137d97f77da5425e74f2b09a
 2015-05-29 11:20:46 -07:00
Geoff Mendal
66f49af2fe Revert "Import translations. DO NOT MERGE" 
This reverts commit 29af96c4486c1baf8601482e54e6886139f49546.

Change-Id: Ie95b16f0ad99994e375484f1f2c6e99debbee37d
 2015-05-29 15:04:40 +00:00
Geoff Mendal
29af96c448 Import translations. DO NOT MERGE 
Change-Id: I08da4367a1ba723e7dfb701f47fba96b548e7f86
Auto-generated-cl: translation import
 2015-05-29 07:27:57 -07:00
Alan Viverette
a4d66f3933 Merge "Synchronize Theme.Material and Theme.Material light attributes" into mnc-dev 2015-05-28 23:55:32 +00:00
Alan Viverette
94680e8667 Synchronize Theme.Material and Theme.Material light attributes 
Adds a few attributes that were missing from either theme, ensures all
the attributes match up so that it's easier to scan through for errors.

Bug: 21490615
Change-Id: Iabfed8f61a7bc121e618164dee4121c41e82db09
 2015-05-28 16:52:29 -07:00
Tao Bao
165102f350 Merge "Wait for uncrypt to finish before rebooting" into mnc-dev 2015-05-28 21:48:29 +00:00
Bryce Lee
3aeb5f848e am 2836b863: am f33da518: Merge "Introduce indirection for base micro themes." into cw-d-mr1-dev 
* commit '2836b863fb2aa593d19ffdcaacb8e9fd84dabb12':
  Introduce indirection for base micro themes.
 2015-05-28 20:07:57 +00:00
Bryce Lee
2836b863fb am f33da518: Merge "Introduce indirection for base micro themes." into cw-d-mr1-dev 
* commit 'f33da5188d5d1d66c1697a84358f334018e9f905':
  Introduce indirection for base micro themes.
 2015-05-28 19:52:17 +00:00
Bryce Lee
f33da5188d Merge "Introduce indirection for base micro themes." into cw-d-mr1-dev 2015-05-28 19:39:45 +00:00
Bryce Lee
b99b91cdf8 Introduce indirection for base micro themes. 
This is needed, since overlays must add/modify items to base themes, but
simply declaring the style in an overlay will override the parent. To
ensure the true parent is never overridden, a base theme is introduced
that both the regular theme and the overlay can inherit from.

Bug: 21425951
Change-Id: I0967d0b4ddf12e9765bc321a7485a6dbdfef0b1e
 2015-05-28 11:03:57 -07:00
Brian Attwell
8d38a8d84f Merge "Deprecate {READ,WRITE}_PROFILE permission" into mnc-dev 2015-05-28 17:36:36 +00:00
Svet Ganov
63428ccde7 Merge "Add a normal permission guarding the installer UI - used for stats tracking" into mnc-dev 2015-05-28 15:37:06 +00:00
Svet Ganov
86877e44f0 Add a normal permission guarding the installer UI - used for stats tracking 
bug:2147009

Change-Id: Id020eaf7b852de43966f4ab8231e3f7046e66542
 2015-05-28 08:33:45 -07:00
Brian Attwell
b97df269b5 Deprecate {READ,WRITE}_PROFILE permission 
Now that *_PROFILE permissions are in the same permission
group as *_CONTACTS, these permissions have no visible
impact on the user. However, they complicate developer's
lives and prevent us from using Context#grantUriRequest().

Bug: 21090207
Change-Id: I31e6ae7b0f49c3589071f6a95f8d69a9456c144d
 2015-05-27 19:36:02 -07:00
Filip Gruszczynski
2217f61e51 Revert "Revert "resolved conflicts for merge of 47249f2a to mnc-dev"" 
This includes the fix for the broken dialog windows. The outsets will
only be calculated and applied if the window is full screen, since
they don't make much sense otherwise.

This reverts commit 4bb6b751fbbb218e8a298db4aa008472a0aa8d31.

Change-Id: I977a85a78c990c1840784dc0be0dddd5a6d84e6b
 2015-05-27 15:36:10 -07:00
Svetoslav
b2849d9a20 Merge "Allow priv apps to get local mac address" into mnc-dev 2015-05-27 21:41:31 +00:00
Svetoslav
59ffbc46f3 Allow priv apps to get local mac address 
Change-Id: I550847cedd5a407c9424778e483b525d4b97e46d
 2015-05-27 14:39:21 -07:00
Alan Viverette
25fc117a35 Merge "Remove unused asset, prune large rarely-used Holo assets from preload" into mnc-dev 2015-05-27 19:59:12 +00:00
Alan Viverette
0af36b48b3 Remove unused asset, prune large rarely-used Holo assets from preload 
Bug: 21352447
Change-Id: I4ad6bc99edf5af0a665827702457925339204f97
 2015-05-27 12:55:49 -07:00
Alan Viverette
165229ba41 Merge "Add workaround for measuring stacked button bar layout" into mnc-dev 2015-05-27 17:30:45 +00:00
Alan Viverette
cffaf7e7e4 Add workaround for measuring stacked button bar layout 
Bug: 21300645
Change-Id: If9544da4995c3dce118dd9e36d42764662b3aecd
 2015-05-27 10:28:05 -07:00
Geoff Mendal
27ec560356 Import translations. DO NOT MERGE 
Change-Id: I75401e1e66e9793ea4be891b4ef6afcf9811184a
Auto-generated-cl: translation import
 2015-05-27 09:35:53 -07:00
Jorim Jaggi
5a45537578 Merge "Round rect clipping for notification contents" into mnc-dev 2015-05-26 21:14:46 +00:00
Jorim Jaggi
be4116a347 Round rect clipping for notification contents 
Enable round rect clipping on notifications for the following kind
of notifications:
- Big picture style.
- Big media narrow style.
- Custom notifications.

Bug: 16142505
Change-Id: I157650fe470636ed624a81557c08135827eac0cb
 2015-05-26 14:14:10 -07:00
Jorim Jaggi
d1e0b9493a Merge "Add fingerprint icon" into mnc-dev 2015-05-26 20:50:48 +00:00
Jorim Jaggi
a65f1d1c4c Add fingerprint icon 
Bug: 20663748
Change-Id: Iae9512173f7ea9d3d62a53cded29d23140bdcfd8
 2015-05-26 13:49:44 -07:00
Jason Monk
c2ddb3e452 Merge "Switch runtime permission icons to vectors" into mnc-dev 2015-05-26 19:04:29 +00:00
Jason Monk
627973d89a Switch runtime permission icons to vectors 
Bug: 21367016
Change-Id: I37745eae54e977258b4ec9b184610efd94b268bb
 2015-05-26 14:33:53 -04:00
Abodunrinwa Toki
b21562c465 Support icons in the FloatingToolbar 
Bug: 20202541
Change-Id: Id4d27851739ba557c7f7348094d79f0c5f782e6b
 2015-05-26 12:55:17 +01:00
Geoff Mendal
151c93b90d Import translations. DO NOT MERGE 
Change-Id: I8918640ef803392c6ac66b2293d1a67841bbfaa3
Auto-generated-cl: translation import
 2015-05-25 11:03:26 -07:00
Dianne Hackborn
4bb6b751fb Revert "resolved conflicts for merge of 47249f2a to mnc-dev" 
This reverts commit c7becb7ee78881646251ff4846e63eb6b96bf7ec, reversing
changes made to 8562b08f04c1309cf40db1e749d612b6824f1d12.
 2015-05-22 16:34:44 -07:00
Jim Miller
8701b5a0fa Fix type-o in fingerprint string messages. 
Fixes bug 19561423

Change-Id: I1f7d88884d551b6b1250455cf3ff9496adf34263
 2015-05-21 18:59:10 -07:00
Filip Gruszczynski
91e5b0f598 Merge "resolved conflicts for merge of 47249f2a to mnc-dev" into mnc-dev 2015-05-22 00:02:48 +00:00
Tao Bao
90237f7beb Wait for uncrypt to finish before rebooting 
/system/bin/uncrypt needs to be triggered to prepare the OTA package
before rebooting into the recovery. For larger packages, uncrypt may be
killed before it finishes the work after the timeout. Change to monitor
the uncrypt status and show the progress to user.

Needs matching changes in bootable/recovery/uncrypt, system/core and
external/sepolicy.

Bug: 20012567
Bug: 20949086
Change-Id: I2348a98312c4dae81f618b45a2ee3b4cf6246ff5
 2015-05-21 16:26:08 -07:00
Baligh Uddin
763f5e8dca Import translations. DO NOT MERGE 
Change-Id: Ib2ff568b531a2273366145275de4b2ab936703e4
Auto-generated-cl: translation import
 2015-05-20 21:49:20 -07:00
Filip Gruszczynski
c7becb7ee7 resolved conflicts for merge of 47249f2a to mnc-dev 
This is a merge of chin support.

Change-Id: I436b751b3c4aaa6b46cfcdb475e02eedfa5a5635
 2015-05-20 20:15:29 -07:00