Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
257,835 Commits 3 Branches 0 Tags
b0181b634eccb341a4d573ea80e29ced431e9acb
Commit Graph

257835 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jorim Jaggi
b0181b634e Merge "Fix message for screen unpinning" into nyc-mr2-dev 2017-01-09 12:52:51 +00:00
David Friedman
a303af44f9 Merge "Docs: Updates Javadoc documentation. Bug: 32532540" into nyc-dev am: 101f885826 am: c3b564e266 am: bcc449eeca 
am: d8e95f6bda

Change-Id: I566c5345fee98650766f31af2c5723d8b423fbd5
 2017-01-07 02:51:15 +00:00
Dave Friedman
89f96e8fa4 Docs: Updates Javadoc documentation. Bug: 32532540 am: 2a3ebadcbe am: e0fd4c8a3b am: a111e0f7f0 
am: eedb695579

Change-Id: Icd2ded633cf7211ef9d1a2106216450db7773408
 2017-01-07 02:50:17 +00:00
David Friedman
d8e95f6bda Merge "Docs: Updates Javadoc documentation. Bug: 32532540" into nyc-dev am: 101f885826 am: c3b564e266 
am: bcc449eeca

Change-Id: I070f5c7088ce237995f995c2aa097e1f04cc4000
 2017-01-07 02:46:33 +00:00
Dave Friedman
eedb695579 Docs: Updates Javadoc documentation. Bug: 32532540 am: 2a3ebadcbe am: e0fd4c8a3b 
am: a111e0f7f0

Change-Id: Ic5d7e0ce01bd573e0882122d0709cbc2da56f448
 2017-01-07 02:43:44 +00:00
David Friedman
bcc449eeca Merge "Docs: Updates Javadoc documentation. Bug: 32532540" into nyc-dev am: 101f885826 
am: c3b564e266

Change-Id: I23fdc92b08e32c643de8009bebf4e02c41741c7e
 2017-01-07 02:39:33 +00:00
Dave Friedman
a111e0f7f0 Docs: Updates Javadoc documentation. Bug: 32532540 am: 2a3ebadcbe 
am: e0fd4c8a3b

Change-Id: I8f65ad71433efbe1121e0617c6d7575b7db3a051
 2017-01-07 02:38:45 +00:00
David Friedman
c3b564e266 Merge "Docs: Updates Javadoc documentation. Bug: 32532540" into nyc-dev 
am: 101f885826

Change-Id: I5e6d948373c8f8ff2892c843329a7d2b540b8706
 2017-01-07 02:30:48 +00:00
Dave Friedman
e0fd4c8a3b Docs: Updates Javadoc documentation. Bug: 32532540 
am: 2a3ebadcbe

Change-Id: Ibee55c5e73d9b51e5f5df24be01b0b797fa8a7a5
 2017-01-07 02:30:45 +00:00
David Friedman
101f885826 Merge "Docs: Updates Javadoc documentation. Bug: 32532540" into nyc-dev 2017-01-07 02:24:57 +00:00
Dave Friedman
2a3ebadcbe Docs: Updates Javadoc documentation. 
Bug: 32532540

Change-Id: Ia811d9a51812206b18b75a98f6c5a55b92627404
 2017-01-06 16:41:19 -08:00
TreeHugger Robot
cb4f643b95 Merge "nfc: Adds NFC_PAYMENT_DEFAULT_COMPONENT to the backed up settings." into nyc-mr2-dev 2017-01-06 22:18:26 +00:00
TreeHugger Robot
0d8c4765b2 Merge "Fix unexpected VR mode exit on package update." into nyc-mr2-dev 2017-01-06 21:07:29 +00:00
TreeHugger Robot
e553cebbeb Merge "Update CHAR LIMIT for notification body." into nyc-mr2-dev 2017-01-06 20:46:28 +00:00
Ruchi Kandoi
3a1ff62e5a nfc: Adds NFC_PAYMENT_DEFAULT_COMPONENT to the backed up settings. 
Bug: 32881476
Test: Manual; backup, change settings, restore

Change-Id: Ibc31b23f632c50a2c7120734fc96e7d855df062e
Signed-off-by: Ruchi Kandoi <kandoiruchi@google.com>
 2017-01-06 12:02:33 -08:00
Ruben Brunk
1ad4a2d32e Fix unexpected VR mode exit on package update. 
Bug: 33809651
Change-Id: Ifbaf705e74eda2bde3e4b2d9092360a1c658e660
 2017-01-06 11:23:49 -08:00
Andrew Sapperstein
429cafb85e Update CHAR LIMIT for notification body. 
Test: is comment change
Bug: 34097363
Change-Id: I8ae19c3b5108c9c2f00614cd5d32cee06082a052
 2017-01-06 18:57:41 +00:00
Andrew Sapperstein
1cac83218c Add temperature config for high temp warning. 
Adds an integer resource (config_warningTemperature) that is used
to display the high temp warning. If it is set to less than 0,
the value from HardwarePropertiesManager#getDeviceTemperatures(
HardwarePropertiesManager.DEVICE_TEMPERATURE_SKIN,
HardwarePropertiesManager.TEMPERATURE_THROTTLING) is used instead.

Test: manual
Bug: 30995038
Change-Id: I05aa1b5930c6c151ebac439dfd5c00b3305dc46d
(cherry picked from commit 7518471ab6)
 2017-01-06 18:28:10 +00:00
Alain Vongsouvanh
f36beac956 bools: fix use_lock_pattern_drawable javadoc. 
am: c4046b5542

Change-Id: Ifd50a1780a232d3902e5a232c2b3445aeb6db178
 2017-01-06 17:41:37 +00:00
Jorim Jaggi
8a28aa54c7 Fix message for screen unpinning 
Test: Pin app, touch home button
Change-Id: Ic7cf5c9151977a5517dc259802a1489cc6cdf519
Fixes: 34052116
 2017-01-06 07:57:47 -08:00
Alain Vongsouvanh
c4046b5542 bools: fix use_lock_pattern_drawable javadoc. 
Change-Id: If135544edb499ee64117bf81c6e3d0eebbfcff00
 2017-01-05 22:54:07 -08:00
Alain Vongsouvanh
cb29c97907 widget: Adding support for custom LockPatternView. 
am: 2fda2ce159

Change-Id: Ib0d53bd7258f784dc3cb0661757b7c6d4979007f
 2017-01-05 19:45:02 +00:00
TreeHugger Robot
1d513b28e3 Merge "Add logging for task view thumbnail state." into nyc-mr2-dev 2017-01-05 19:33:48 +00:00
Alain Vongsouvanh
2fda2ce159 widget: Adding support for custom LockPatternView. 
OEMs can overlay the default 9 dots by providing two drawables that represent
those dots:
  * lockscreen_notselected: asset to display when a cell has not been selected.
  * lockscreen_selected: asset to display when a cell has been selected.

BUG: 33755663
Change-Id: Ic595b01f5e1321696b7a3feb0ff73c1acccfb942
 2017-01-05 16:16:49 +00:00
TreeHugger Robot
20088b3e31 Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev 2017-01-05 10:08:44 +00:00
TreeHugger Robot
9e8b15b953 Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev 2017-01-05 10:06:47 +00:00
Bill Yi
a51dba4ca5 Import translations. DO NOT MERGE 
Change-Id: Ic18109adbc1f4e2e3f8bf15aa6d5cf0cb703b601
Auto-generated-cl: translation import
 2017-01-05 00:27:04 -08:00
Bill Yi
319605a34b Import translations. DO NOT MERGE 
Change-Id: Ia63b58c348cd9978df4b800cdff5926ec9f487fa
Auto-generated-cl: translation import
 2017-01-05 00:18:30 -08:00
TreeHugger Robot
0c7631f8b0 Merge changes from topics 'thermal-notif-3', 'thermal-notif' into nyc-mr2-dev 
* changes:
  Added alert icon to high temp dialog.
  Add VR mode check for thermal notification
  Show notif when device reaches throttling temp
 2017-01-05 03:01:00 +00:00
Andrew Sapperstein
bd4eeb7259 Added alert icon to high temp dialog. 
Test: manual
Bug: 30995038
Change-Id: I966294c5fb0b8297b2f336102996291f66c08d2c
(cherry picked from commit e26dc3d194)
 2017-01-04 16:54:31 -08:00
Andrew Sapperstein
d51ac7322e Add VR mode check for thermal notification 
When in VR mode, don't show the high temp notification
since VR shows its own notification.

Test: manual
Bug: 30995038
Change-Id: I845480d968a9b0da9997f035875885bc261c577a
(cherry picked from commit 65d8a5fc73)
 2017-01-04 16:54:15 -08:00
Andrew Sapperstein
67e97053c5 Show notif when device reaches throttling temp 
Adds logic to SystemUI that shows a notification alerting the user
that their phone has reached a certain temperature and has throttled
itself in order to cool down.

The logic is controlled by a configuration resource:
R.bool.config_showTemperatureWarning. If false, no action is taken.

When true, PowerUI checks every 30 seconds if the current temp of
HardwarePropertiesManager.DEVICE_TEMPERATURE_SKIN is greater than
the throttling temp of HardwarePropertiesManager.DEVICE_TEMPERATURE_SKIN.
If any one of the temperatures returned is greater, a notification is shown.

Clicking on the notification will show a dialog explaining more details
about what the device is doing in response to the high temperature.

The notification will disappear once the temperature drops below
the throttling temperature.

In order to check the temperature in SystemUI, HardwarePropertiesManager
has been updated to also allow any calls made by callers holding the
signature-level DEVICE_POWER permission.

Test: runtest systemui
Bug: 30995038

Change-Id: I1b3f122341911c68e90c8a49ad35267ac382b356
(cherry picked from commit b7caf1d06d)
 2017-01-04 16:53:44 -08:00
Julius D'souza
da8462aa5b Merge "DO NOT MERGE: Allow regular ambient light sensor sampling in doze mode." into cw-f-dev 
am: b60eb1a854

Change-Id: I86ef53eec2bbeff07c52e079e925719c3923941c
 2017-01-04 23:05:45 +00:00
Julius D'souza
8366e50043 DO NOT MERGE: Allow regular ambient light sensor sampling in doze mode. 
am: bbfdf7ad23

Change-Id: Ic6b72d6b72df516d4cec3b7a38e12366f7e334a1
 2017-01-04 23:05:41 +00:00
Julius D'souza
b60eb1a854 Merge "DO NOT MERGE: Allow regular ambient light sensor sampling in doze mode." into cw-f-dev 2017-01-04 23:00:00 +00:00
TreeHugger Robot
2258e5fdb9 Merge "Get account features before taking lock (cherry-pick from master)" into nyc-mr2-dev 2017-01-04 18:54:07 +00:00
Makoto Onuki
fd24353d75 Get account features before taking lock (cherry-pick from master) 
Test: cts-tradefed run cts --skip-device-info --skip-preconditions --skip-system-status-check com.android.compatibility.common.tradefed.targetprep.NetworkConnectivityChecker -a armeabi-v7a -m CtsDevicePolicyManagerTestCases -t com.android.cts.devicepolicy.AccountCheckHostSideTest
* without having Id49f2bd5dfa80ecf35b3a23c789100ade38c2656 *

Test: adb shell am instrument -e class com.android.server.devicepolicy.DevicePolicyManagerTest -w com.android.frameworks.servicestests

Bug: 33481725
Change-Id: Ie2fe9aea87d1a7167581f4cd74ae063ef24a4567
Merged-in: I1e4dd9701a76ca366f86fdaf2fc6c282e9dbe5c1
 2017-01-04 09:04:09 -08:00
Kevin Hufnagle
e102ea7b96 docs: Added descriptions of IAB subscription-specific settings. am: 145b377b38 am: 4418907d50 am: c32df53fc7 am: d7c1e9bcd0 am: fb99d1450d 
am: 63d1963345

Change-Id: Ie101eda01c3b772c0944c56cfede1514acadf1e1
 2017-01-04 01:45:22 +00:00
Kevin Hufnagle
63d1963345 docs: Added descriptions of IAB subscription-specific settings. am: 145b377b38 am: 4418907d50 am: c32df53fc7 am: d7c1e9bcd0 
am: fb99d1450d

Change-Id: Ibe527fb777ca3975fed67a951f2ddb8f2b81a833
 2017-01-04 01:41:25 +00:00
Kevin Hufnagle
fb99d1450d docs: Added descriptions of IAB subscription-specific settings. am: 145b377b38 am: 4418907d50 am: c32df53fc7 
am: d7c1e9bcd0

Change-Id: I7f9ce1b661f8defca2918eece234a9c26d5f08a3
 2017-01-04 01:37:00 +00:00
Kevin Hufnagle
75896821cb Merge "docs: Added note - test subscriptions cannot use reserved IDs" into nyc-dev am: dbe9b81ef5 am: 2ff9c02bdc am: b7c9651555 
am: d99f3b7214

Change-Id: I9a86dda9da8d525a23af69817044453fdf083ee4
 2017-01-04 01:33:39 +00:00
Kevin Hufnagle
c2aae1a1e7 docs: Added note - test subscriptions cannot use reserved IDs am: 98a11580ef am: c8ccc66e85 am: 1c85b504e2 
am: 01e3564a0d

Change-Id: Ic1454c9328a54777ba21cdee438e8d1bf91d5130
 2017-01-04 01:32:53 +00:00
Kevin Hufnagle
d7c1e9bcd0 docs: Added descriptions of IAB subscription-specific settings. am: 145b377b38 am: 4418907d50 
am: c32df53fc7

Change-Id: Ib2ac681a13b8d3b80feba803f25fdc8dbdcfe4f9
 2017-01-04 01:32:24 +00:00
Kevin Hufnagle
d99f3b7214 Merge "docs: Added note - test subscriptions cannot use reserved IDs" into nyc-dev am: dbe9b81ef5 am: 2ff9c02bdc 
am: b7c9651555

Change-Id: I8c06b2b162ca5837ba9157ef91bb5a8d1489e36a
 2017-01-04 01:29:30 +00:00
Kevin Hufnagle
c32df53fc7 docs: Added descriptions of IAB subscription-specific settings. am: 145b377b38 
am: 4418907d50

Change-Id: I486f53410a427f373daec719bac522289d812e7a
 2017-01-04 01:28:19 +00:00
Kevin Hufnagle
01e3564a0d docs: Added note - test subscriptions cannot use reserved IDs am: 98a11580ef am: c8ccc66e85 
am: 1c85b504e2

Change-Id: Iabd407dce1b3f01da5bbbd576536d0b77415d300
 2017-01-04 01:28:17 +00:00
Kevin Hufnagle
b7c9651555 Merge "docs: Added note - test subscriptions cannot use reserved IDs" into nyc-dev am: dbe9b81ef5 
am: 2ff9c02bdc

Change-Id: I930313b754635e07b190793c3b79de39b71b6b8a
 2017-01-04 01:25:12 +00:00
Kevin Hufnagle
4418907d50 docs: Added descriptions of IAB subscription-specific settings. 
am: 145b377b38

Change-Id: I1b7a0885f613beb9b7baba8a6b35b59f00989ff3
 2017-01-04 01:24:24 +00:00
Kevin Hufnagle
1c85b504e2 docs: Added note - test subscriptions cannot use reserved IDs am: 98a11580ef 
am: c8ccc66e85

Change-Id: Id17c38ec7f6b85bcbfaaf676bf3a2f1414fca893
 2017-01-04 01:24:23 +00:00
Kevin Hufnagle
2ff9c02bdc Merge "docs: Added note - test subscriptions cannot use reserved IDs" into nyc-dev 
am: dbe9b81ef5

Change-Id: Ie08ac386f441b16451538e21dcc8d5e5052258b0
 2017-01-04 01:18:51 +00:00