Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
281,411 Commits 3 Branches 0 Tags
6a1dcd17e44dc9da8f1a63da792b7f9a6ac480fd
Commit Graph

281411 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Philip P. Moltmann
6a1dcd17e4 Only persist last Shared Preferences state am: d15c4f1da5 am: 889a420a9e 
am: 0aa5138861  -s ours

Change-Id: Ide515ec901a5a85c3ef04bc6cff172464144877d
 2017-01-13 21:13:46 +00:00
Justin Klaassen
84d0b9ea6b Merge "Add support for carrier demo mode" into nyc-mr2-dev 
am: 482ba6b831

Change-Id: If0368c791ec1d866fc46bd781a5adb4c1bc14186
 2017-01-13 21:04:55 +00:00
Justin Klaassen
b4be8c8df1 Add support for carrier demo mode 
am: b632c55469

Change-Id: Ib8061ae05e5144a79921123ba6dfdaec81baaece
 2017-01-13 21:04:31 +00:00
Justin Klaassen
482ba6b831 Merge "Add support for carrier demo mode" into nyc-mr2-dev 2017-01-13 21:00:08 +00:00
Pankaj Kanwar
074a166e28 Merge "DO NOT MERGE: Fix to maintain the Carrier Network connection." into nyc-mr2-dev 
am: ae9e15fa44

Change-Id: I33fff8bcc19daa149f1ad41b3f3cf94281f81ec4
 2017-01-13 20:58:15 +00:00
pkanwar
07998e8e26 DO NOT MERGE: Fix to maintain the Carrier Network connection. 
am: e45b50293e

Change-Id: I6a48b308cd461097a195a073249cde096cc74886
 2017-01-13 20:58:09 +00:00
Pankaj Kanwar
ae9e15fa44 Merge "DO NOT MERGE: Fix to maintain the Carrier Network connection." into nyc-mr2-dev 2017-01-13 20:46:02 +00:00
Andrew Sapperstein
ace5aea996 Merge "Add logging for high temp warning." into nyc-mr2-dev 
am: 409d93356c

Change-Id: I83cef78c03fbbbe1e8e66f2215ca9d7be2095047
 2017-01-13 20:28:40 +00:00
Andrew Sapperstein
990826a0a1 Add logging for high temp warning. 
am: 6c08f8da09

Change-Id: Id567e12b8eb6b85ab49ace003c03b80759073687
 2017-01-13 20:28:35 +00:00
TreeHugger Robot
409d93356c Merge "Add logging for high temp warning." into nyc-mr2-dev 2017-01-13 20:24:50 +00:00
Manu Cornet
07ed38cddc Merge "DO NOT MERGE - 2D Recents: Make sure thumbnail fills task view in all orientations" into nyc-mr2-dev 
am: a4d01c8573

Change-Id: I240109d6f400bc29e398b2cf07b238b9b17713f3
 2017-01-13 19:58:42 +00:00
Manu Cornet
548ff6209c DO NOT MERGE - 2D Recents: Make sure thumbnail fills task view in all orientations 
am: 569cbecd92

Change-Id: I4da39588dd8ba6f750cbedbe3abb9ebce1dd8080
 2017-01-13 19:58:35 +00:00
TreeHugger Robot
a4d01c8573 Merge "DO NOT MERGE - 2D Recents: Make sure thumbnail fills task view in all orientations" into nyc-mr2-dev 2017-01-13 19:54:20 +00:00
Justin Klaassen
b632c55469 Add support for carrier demo mode 
Fixes: 33746309
Test: manually verified carrier demo mode and normal demo mode are setup
correctly

Change-Id: Ia38790599f672a9d1999274276156b5328c9f75a
 2017-01-13 09:26:58 -08:00
Michal Karpinski
3f0307c050 Merge "[DPM] Improvements to the network logs batch finalization mechanism" into nyc-mr2-dev 
am: 54b7388163

Change-Id: Ie5adab88fba61adc5b47ab3cd91bcb4dcade09cd
 2017-01-13 09:51:32 +00:00
Michal Karpinski
f27cc410dd [DPM] Improvements to the network logs batch finalization mechanism 
am: 4da4a5d0c8

Change-Id: I6318392173aeb2653734537569d03158799a099c
 2017-01-13 09:51:27 +00:00
Michal Karpinski
54b7388163 Merge "[DPM] Improvements to the network logs batch finalization mechanism" into nyc-mr2-dev 2017-01-13 09:47:24 +00:00
pkanwar
e45b50293e DO NOT MERGE: Fix to maintain the Carrier Network connection. 
Added isCarrierNetwork param in WifiConfiguration, which is then used in
WifiStateMachine. After this change, the connection to Carrier Network
should be maintained.

BUG: 30760683
Change-Id: I88e01ff44f494a6eda5e2e8a088d069638b72c89
 2017-01-12 19:25:52 -08:00
Manu Cornet
4c7317373c Merge "DO NOT MERGE - Also scale down thumbnail in app transitions for grid recents" into nyc-mr2-dev 
am: 2660111259

Change-Id: If5b4cfd5f8a84060a90b457351638bbd7b2d526b
 2017-01-13 02:36:06 +00:00
Manu Cornet
afd96a08b1 DO NOT MERGE - Also scale down thumbnail in app transitions for grid recents 
am: da5900d0a7

Change-Id: I1b4d9873c86cdb77d829c4ae6e5e6e3eae032eb1
 2017-01-13 02:36:02 +00:00
TreeHugger Robot
2660111259 Merge "DO NOT MERGE - Also scale down thumbnail in app transitions for grid recents" into nyc-mr2-dev 2017-01-13 02:31:13 +00:00
Andrew Sapperstein
6c08f8da09 Add logging for high temp warning. 
Adds a log line that prints the current and throttling temps
when we decide to show the notification.

Test: manual
Bug: 34256597
Change-Id: I4d0a1993e0b073d68fbc65f9aa765f5343a69dc5
 2017-01-12 17:23:11 -08:00
Philip P. Moltmann
0aa5138861 Only persist last Shared Preferences state am: d15c4f1da5 
am: 889a420a9e

Change-Id: If0849eedacedf9197e19616dc56edad2ca39f015
 2017-01-13 01:16:23 +00:00
Philip P. Moltmann
889a420a9e Only persist last Shared Preferences state 
am: d15c4f1da5

Change-Id: I6431d4b7d07064eec5013d01b5bda76b1ed35e14
 2017-01-13 01:09:03 +00:00
Manu Cornet
569cbecd92 DO NOT MERGE - 2D Recents: Make sure thumbnail fills task view in all orientations 
Bug: 32101881
Test: Checked layout in various situations when switching orientation
Change-Id: Iae1f142f6568890512e24787d78cfb1e15280feb
 2017-01-13 01:07:43 +00:00
Manu Cornet
da5900d0a7 DO NOT MERGE - Also scale down thumbnail in app transitions for grid recents 
Bug: 32101881
Test: Checked the effect on app -> recents transition on local sw600dp device
Change-Id: Ic3e3af6e8db4a62028e1283e915a7cd12db49607
 2017-01-13 01:05:17 +00:00
Philip P. Moltmann
d15c4f1da5 Only persist last Shared Preferences state 
If multiple async shared preferences writes are queued, all but the
last one can be ignored as they will be overwritten by the last one
anyway.

For commit() we need to make sure that we have at least persisted the
state of the commit.

Generation counts are 64 bit, hence they never overflow.

Test: Produced a lot of SharedPreferences.Editor.apply and did not see
excessive writes anymore, ran SharedPreferences CTS tests
Bug: 33385963
Change-Id: I3968ed4b71befee6eeb90bea1666a0bb646544f6
(cherry picked from commit 31d6889f4c)
 2017-01-12 16:42:59 -08:00
Manu Cornet
ae5df0544a Merge "2D Recents: Use a different task dismiss animation" into nyc-mr2-dev 
am: 5ee87b5b6a

Change-Id: I4ae207701f09d1a1723fca5fb237968ba5905574
 2017-01-13 00:28:26 +00:00
Manu Cornet
bc6bdb3ef8 2D Recents: Use a different task dismiss animation 
am: 5df7667edb

Change-Id: Ib6186c663057d7a3c8d44ec13254f6c8b76ce3de
 2017-01-13 00:28:19 +00:00
Manu Cornet
5ee87b5b6a Merge "2D Recents: Use a different task dismiss animation" into nyc-mr2-dev 2017-01-13 00:23:48 +00:00
Robert Greenwalt
907585c004 Merge "Add support for FDN contact dial" am: 082b118641 am: 24dea10375 
am: 503d8fbb26

Change-Id: I9642ea2e9a97d3fd72e9fdccc64f20c94a938088
 2017-01-12 23:20:45 +00:00
Robert Greenwalt
503d8fbb26 Merge "Add support for FDN contact dial" am: 082b118641 
am: 24dea10375

Change-Id: I5091d35ff79eff952c57109ce120369c95309598
 2017-01-12 23:16:20 +00:00
Robert Greenwalt
24dea10375 Merge "Add support for FDN contact dial" 
am: 082b118641

Change-Id: Ib7896cc64ea560338e7b737145eb7f96b4e89efc
 2017-01-12 23:12:23 +00:00
Robert Greenwalt
082b118641 Merge "Add support for FDN contact dial" 2017-01-12 23:07:00 +00:00
Andrew Sapperstein
b5571b1a18 Merge "Create a global registry for system message IDs" into nyc-mr2-dev 
am: 1f2769189d

Change-Id: I39320f591a7e67ac7af27bc533bdddd0b728ca68
 2017-01-12 21:23:16 +00:00
Chris Wren
99a16ab0ec Create a global registry for system message IDs 
am: 117d5b4f28

Change-Id: Iaa792c9dbffaae807bdf0a8cfb30e66aecb442d6
 2017-01-12 21:23:11 +00:00
Andrew Sapperstein
1f2769189d Merge "Create a global registry for system message IDs" into nyc-mr2-dev 2017-01-12 21:18:28 +00:00
Andrew Rossignol
6ebc52a950 Merge "Revert "DO NOT MERGE ANYWHERE default_wallpaper: replace with black"" into nyc-mr2-dev 
am: c65a010a39  -s ours

Change-Id: I39efaeb589830e7d448e208d37a079c798477224
 2017-01-12 18:59:56 +00:00
Andrew Rossignol
4fa95e7bbb Revert "DO NOT MERGE ANYWHERE default_wallpaper: replace with black" 
am: 57edeef91a  -s ours

Change-Id: I4e4ed0215ad07f49101119c0f262d0dc5acbab8d
 2017-01-12 18:59:51 +00:00
Jiaquan He
97b832a438 Merge "2D Recents: Show shadows behind task views." into nyc-mr2-dev 
am: 5c4c5e1682

Change-Id: Ide8408c2d18740b4058c49a9c3b4f0912e7c5da9
 2017-01-12 18:56:34 +00:00
Jiaquan He
0cb857822e 2D Recents: Show shadows behind task views. 
am: 15fa3246d8

Change-Id: Ia2401df9750bb42a53ae214ed8998e1225499337
 2017-01-12 18:56:27 +00:00
TreeHugger Robot
c65a010a39 Merge "Revert "DO NOT MERGE ANYWHERE default_wallpaper: replace with black"" into nyc-mr2-dev 2017-01-12 18:52:42 +00:00
Jiaquan He
5c4c5e1682 Merge "2D Recents: Show shadows behind task views." into nyc-mr2-dev 2017-01-12 18:50:11 +00:00
Selim Cinek
8b36bbf0ea Merge "Fixed a bug where notifications could stay expanded" into nyc-mr2-dev 
am: c1c7d1f938

Change-Id: I58bf2fdd1b1b89d8b9b7b86110836ee1f6c56ffa
 2017-01-12 18:42:41 +00:00
Selim Cinek
97f14c47db Fixed a bug where notifications could stay expanded 
am: b2236108ae

Change-Id: I9c776321f0865f6971692008256cd80adbab5469
 2017-01-12 18:42:32 +00:00
Selim Cinek
c1c7d1f938 Merge "Fixed a bug where notifications could stay expanded" into nyc-mr2-dev 2017-01-12 18:37:07 +00:00
Bill Yi
04f8ba7bb7 Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev 
am: 2f9af2aa69  -s ours

Change-Id: Ia26f0fd7cf8f1c0937fd5b42fed1c8aee22111e0
 2017-01-12 17:24:45 +00:00
Bill Yi
5aef5be20b Import translations. DO NOT MERGE 
am: 50a1d26ac0  -s ours

Change-Id: I3aa3b58828ce0d6363d0491b7b9acfd022db2b25
 2017-01-12 17:24:41 +00:00
Bill Yi
ae29fff572 Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev 
am: 57988f49e6  -s ours

Change-Id: I9a01ac7789ba1cd8568ed286aa4e22676ae381b1
 2017-01-12 17:22:54 +00:00
Bill Yi
349e01836f Import translations. DO NOT MERGE 
am: 8c90b5ace0  -s ours

Change-Id: I8f1eb0d40376248db07c790386db738fa36220ae
 2017-01-12 17:22:50 +00:00