Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
301,953 Commits 3 Branches 0 Tags
ec4e0b075f53ac83cb03db07c00a67ea0f1e3a34
Commit Graph

301953 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adrian Roos
62be439d26 Notifications: Fix bad layout for long texts 
Fixes a bug where the max lines restriction was not properly
passed to ImageFloatingTextView's layout, causing the TextView
to improperly apply bottom padding.

Change-Id: Ibe07515866a4599047712a0482332ed4430c9056
Test: runtest -x core/tests/coretests/src/com/android/internal/widget/ImageFloatingTextViewTest.java
Fixes: 32658499
Bug: 32658499
 2016-12-06 14:17:06 -08:00
Fyodor Kupolov
e35aff17e9 Merge "2-phase initialization of NetworkPolicyManagerService" 2016-12-06 21:57:55 +00:00
Jeremy Joslin
1fd6d039e3 Merge "Adding a new string array resource for network recommendations." into nyc-mr1-dev-plus-aosp am: 95b7e5fb21 
am: db38a1c27f

Change-Id: I1962dc7d56f5452e1b13a3c90fcbf5f4bf82d269
 2016-12-06 21:30:46 +00:00
Jeremy Joslin
d2d7860504 Adding a new string array resource for network recommendations. am: b63bf2a5ef 
am: 975ce4661a  -s ours

Change-Id: I41c0d01f839d76c90cf2575f68add66e2a59e9a5
 2016-12-06 21:29:28 +00:00
TreeHugger Robot
cb42822758 Merge "API for requesting network recommendations." 2016-12-06 21:17:23 +00:00
Jeff Sharkey
d66edc45b6 Merge "Move dump() to dumpAsync(), more oneway calls." am: 5773d9702e -s ours am: 5b9b0db9f8 -s ours am: 6bc035949f -s ours 
am: 0c9bd0a4af  -s ours

Change-Id: I32616494ab72af40625f84e6ed5b37374599b38f
 2016-12-06 21:03:48 +00:00
Jeremy Joslin
db38a1c27f Merge "Adding a new string array resource for network recommendations." into nyc-mr1-dev-plus-aosp 
am: 95b7e5fb21

Change-Id: I5550363bba2c615eacb507fb8c931520b0342b5d
 2016-12-06 21:03:22 +00:00
Jeremy Joslin
975ce4661a Adding a new string array resource for network recommendations. 
am: b63bf2a5ef

Change-Id: Icadfc2ee9fa108c9bdf62f167f13497da3db814e
 2016-12-06 21:03:18 +00:00
TreeHugger Robot
7f0dc425a3 Merge "Adding a new string array resource for network recommendations." 2016-12-06 21:00:44 +00:00
Jeff Sharkey
0c9bd0a4af Merge "Move dump() to dumpAsync(), more oneway calls." am: 5773d9702e -s ours am: 5b9b0db9f8 -s ours 
am: 6bc035949f  -s ours

Change-Id: Ib90b83fee65c2ae095ff26ea5072d422494e6a15
 2016-12-06 20:57:26 +00:00
TreeHugger Robot
95b7e5fb21 Merge "Adding a new string array resource for network recommendations." into nyc-mr1-dev-plus-aosp 2016-12-06 20:55:13 +00:00
Pankaj Kanwar
17ba97ca52 Merge "DO NOT MERGE: Add notification delay for when the user needs cannot register to a network and needs to be notified." into nyc-mr2-dev am: df4e14d400 
am: b565d55f48  -s ours

Change-Id: Ic98dce50b20ba976af43e2f5fb89e9893fade564
 2016-12-06 20:50:28 +00:00
pkanwar
d95dc2bf46 DO NOT MERGE: Add notification delay for when the user needs cannot register to a network and needs to be notified. am: 34be302f2a 
am: b65452c18f  -s ours

Change-Id: I746579ce505ff39623b8b27915f83cee5dfb0894
 2016-12-06 20:49:32 +00:00
Jeff Sharkey
6bc035949f Merge "Move dump() to dumpAsync(), more oneway calls." am: 5773d9702e -s ours 
am: 5b9b0db9f8  -s ours

Change-Id: I085716f45435debc6418dd6bca9369cc2a17e1a4
 2016-12-06 20:49:23 +00:00
Jeremy Joslin
d1daf6d22a API for requesting network recommendations. 
Defining a new system API that will allow the system to request
network recommendations from a NetworkScoreService implementation.

Test: Coming in a future CL.
BUG: 32909424
Merged-In: I2d5c0a843b928b04e87c1862a78702a02fd54c31
Change-Id: Idd33095c6cd2f5b391796c900399f18a2c40fcc3
 2016-12-06 12:48:30 -08:00
Jeff Sharkey
5b9b0db9f8 Merge "Move dump() to dumpAsync(), more oneway calls." 
am: 5773d9702e  -s ours

Change-Id: Ifc71dfc411dfd8d4fc23b8e7f0843ee90607bb3b
 2016-12-06 20:45:22 +00:00
Pankaj Kanwar
b565d55f48 Merge "DO NOT MERGE: Add notification delay for when the user needs cannot register to a network and needs to be notified." into nyc-mr2-dev 
am: df4e14d400

Change-Id: I23e16392c59cd1e306ba334a6aaf1114f165c967
 2016-12-06 20:41:56 +00:00
pkanwar
b65452c18f DO NOT MERGE: Add notification delay for when the user needs cannot register to a network and needs to be notified. 
am: 34be302f2a

Change-Id: I18f1ed3a4e8b6a923e5733fe38566d4484d1c310
 2016-12-06 20:41:50 +00:00
Pankaj Kanwar
df4e14d400 Merge "DO NOT MERGE: Add notification delay for when the user needs cannot register to a network and needs to be notified." into nyc-mr2-dev 2016-12-06 20:35:52 +00:00
Robert Carr
4647acb60e Correct error in Configuration.updateFrom 
When updating the non direction members of screenLayout
we check that they are not in total undefined, before
accepting the new value in full. This was enough for LONG/SIZE
which are always undefined or set together. It seems we have paths
now where SCREENLAYOUT_ROUND however can be undefined and the others
will be set. In this case if we pass a configuration with SCREENLAYOUT_ROUND_UNDEFINED
but LONG/SIZE set to updateFrom then we will overwrite our previous SCREENLAYOUT_ROUND value.
This triggers extra configuration changes.

Bug: 33098677
Test: bit FrameworksCoreTests:android.content.res.ConfigurationTest
Change-Id: I6eb321d27011a2af2134d0ed5b6864d4cd902dc3
 2016-12-06 12:34:35 -08:00
Yuanlang Song
7169dfd0b1 Merge "Merge "DO NOT MERGE: Add TouchLatency test" into cw-f-dev am: 647166e852 am: e9d31e0b46" into nyc-mr2-dev-plus-aosp 
am: 05fa2d6a2e  -s ours

Change-Id: Id98a24298d1a5fc9e82f8d0a4026957535310249
 2016-12-06 20:31:47 +00:00
Yuanlang Song
4f179f7e12 Merge "DO NOT MERGE: Add TouchLatency test" into cw-f-dev am: 647166e852 am: e9d31e0b46 
am: b824ff8c80  -s ours

Change-Id: I87184cee7b1c1b3cfe8840734b4c71dff6719352
 2016-12-06 20:31:42 +00:00
Yuanlang Song
5f6dc40aa9 Merge "Merge "DO NOT MERGE: Add TouchLatency test" into cw-f-dev am: 647166e852 am: a49aa940be" into nyc-mr2-dev-plus-aosp 
am: f00afab1de  -s ours

Change-Id: I6de602f69d43e635f6925a9eeac78d06b8d03592
 2016-12-06 20:30:16 +00:00
Yuanlang Song
53204d2551 Merge "DO NOT MERGE: Add TouchLatency test" into cw-f-dev am: 647166e852 am: a49aa940be 
am: c2bdd4418d  -s ours

Change-Id: Ied37728f9cb3d72d1e6b045f8648143652bf3ffa
 2016-12-06 20:30:12 +00:00
John Reck
fe37148dc2 Merge "DO NOT MERGE: Add TouchLatency test am: 91e2e7f460 am: 8360e7e38a" into nyc-mr2-dev-plus-aosp 
am: fdbb5175c5  -s ours

Change-Id: I432e5f3229af63826c1c2921ce29899bc80915ab
 2016-12-06 20:28:53 +00:00
John Reck
f99303ecef DO NOT MERGE: Add TouchLatency test am: 91e2e7f460 am: 8360e7e38a 
am: fd8c2cb0fd  -s ours

Change-Id: I33b96b00608a5e2450adc4bd5c29e114ddc1540a
 2016-12-06 20:28:48 +00:00
John Reck
153c0cdc38 DO NOT MERGE: Add TouchLatency test am: 91e2e7f460 am: 579e3667e3 
am: 24b0b5ca68  -s ours

Change-Id: I6a489a035d2242e42504941b82718611cf87e022
 2016-12-06 20:27:46 +00:00
Android Build Merger (Role)
05fa2d6a2e Merge "Merge "DO NOT MERGE: Add TouchLatency test" into cw-f-dev am: 647166e852 am: e9d31e0b46" into nyc-mr2-dev-plus-aosp 2016-12-06 20:22:26 +00:00
Android Build Merger (Role)
f00afab1de Merge "Merge "DO NOT MERGE: Add TouchLatency test" into cw-f-dev am: 647166e852 am: a49aa940be" into nyc-mr2-dev-plus-aosp 2016-12-06 20:22:19 +00:00
Yuanlang Song
b824ff8c80 Merge "DO NOT MERGE: Add TouchLatency test" into cw-f-dev am: 647166e852 
am: e9d31e0b46

Change-Id: I7606364318202ad60b416438f500aaaff8eec0fb
 2016-12-06 20:21:47 +00:00
Yuanlang Song
c2bdd4418d Merge "DO NOT MERGE: Add TouchLatency test" into cw-f-dev am: 647166e852 
am: a49aa940be

Change-Id: Ibf4d13e4fb4538ed9cfbae489a47057f3e78d644
 2016-12-06 20:21:31 +00:00
Android Build Merger (Role)
fdbb5175c5 Merge "DO NOT MERGE: Add TouchLatency test am: 91e2e7f460 am: 8360e7e38a" into nyc-mr2-dev-plus-aosp 2016-12-06 20:21:29 +00:00
John Reck
fd8c2cb0fd DO NOT MERGE: Add TouchLatency test am: 91e2e7f460 
am: 8360e7e38a

Change-Id: I9f65c574fd434cce928381f64894642a92014712
 2016-12-06 20:20:48 +00:00
John Reck
24b0b5ca68 DO NOT MERGE: Add TouchLatency test am: 91e2e7f460 
am: 579e3667e3

Change-Id: Ie27b93371a22360e6cdb9dffc2e78c14fa28333f
 2016-12-06 20:20:46 +00:00
Treehugger Robot
5773d9702e Merge "Move dump() to dumpAsync(), more oneway calls." 2016-12-06 20:15:28 +00:00
Yuanlang Song
a49aa940be Merge "DO NOT MERGE: Add TouchLatency test" into cw-f-dev 
am: 647166e852

Change-Id: I33e59ffbe071470608141579d1742a414f308f76
 2016-12-06 20:13:54 +00:00
John Reck
579e3667e3 DO NOT MERGE: Add TouchLatency test 
am: 91e2e7f460

Change-Id: I1eeed0e4aea8dbe2d963b38cfe9d79449e1a17d2
 2016-12-06 20:13:49 +00:00
Yuanlang Song
e9d31e0b46 Merge "DO NOT MERGE: Add TouchLatency test" into cw-f-dev 
am: 647166e852

Change-Id: I8985e69d3e04f0da6b923cf15db418338ac4edab
 2016-12-06 20:13:48 +00:00
John Reck
8360e7e38a DO NOT MERGE: Add TouchLatency test 
am: 91e2e7f460

Change-Id: I84a284f0316f68c24352178685eaa07f2b259411
 2016-12-06 20:13:45 +00:00
TreeHugger Robot
0c08a45028 Merge "Add READ_PHONE_NUMBER to the list of dangerous permissions." 2016-12-06 20:12:08 +00:00
Yuanlang Song
647166e852 Merge "DO NOT MERGE: Add TouchLatency test" into cw-f-dev 2016-12-06 20:05:45 +00:00
Adrian Roos
d575d88d8e Revert "Direct Reply: Add back emoji button" 
This reverts commit 713fed9226.

Test: Receive SMS, click Reply, check that IME has a send button.
Change-Id: I4632e656828743fbb3172b0331390983df232c68
Fixes: 33185290
 2016-12-06 20:02:20 +00:00
Vladislav Kaznacheev
b265617b81 Replace Toast-based cheat sheets with tooltips 
Currently ActionMenuItemView, MediaRouteButton and
ScrollingTabContainerView each have their own
implementation of a Toast-based long-press tooltips
(the last two apparently copy/pasted from the first).

Replacing those with the recently introduced tooltips
supported by the framework.

Bug: 31516506
Test: manual in ApiDemos
Change-Id: Ibcb8c5a43577a8b4d30f1a26e48ddcfde015d1dc
 2016-12-06 11:41:58 -08:00
Stephen Chen
79046ce039 Merge "Add Settings.Global.NETWORK_RECOMMENDATIONS_ENABLED flag." am: 70ae1bf4db am: 45fdf32038 am: e70ef235fb 
am: 70889ff69f

Change-Id: If076123dc3874615b058bbddfd3c4810f54b303d
 2016-12-06 19:41:55 +00:00
Stephen Chen
70889ff69f Merge "Add Settings.Global.NETWORK_RECOMMENDATIONS_ENABLED flag." am: 70ae1bf4db am: 45fdf32038 
am: e70ef235fb

Change-Id: I46186245e038597018f66e44459d724456e8f993
 2016-12-06 19:34:46 +00:00
TreeHugger Robot
877ab7f9fd Merge "Revert "Revert "WindowList be gone!""" 2016-12-06 19:27:53 +00:00
Stephen Chen
e70ef235fb Merge "Add Settings.Global.NETWORK_RECOMMENDATIONS_ENABLED flag." am: 70ae1bf4db 
am: 45fdf32038

Change-Id: I141248962fc0ce710b6860f3f67ca156ecdab46e
 2016-12-06 19:27:45 +00:00
Fyodor Kupolov
0ef99417bd Merge "Init PersistentDatablockService on the worker thread" 2016-12-06 19:22:15 +00:00
Wale Ogunwale
1e129a4212 Reduce object allocations in WM in some frequently called methods 
With the use of lambdas to get all windows in the window container
hierarchy, we need to be careful in frequently called code paths to
make sure the number of objects we allocate isn't crazy. This CL
converts some commonly called code paths that use lambda to use a
method reference for the lambda so we only need to allocate once vs.
each time the code path is executed.

Test: Perform some common operations on the phone and make sure
      the object allocations that show-up in Allocator Tracker for
      window manager seems reasonable

Change-Id: Ie0f245980de96ec68a4e62e76130db7d98c3f7d9
 2016-12-06 11:21:01 -08:00
Stephen Chen
45fdf32038 Merge "Add Settings.Global.NETWORK_RECOMMENDATIONS_ENABLED flag." 
am: 70ae1bf4db

Change-Id: If3d13f94a131188ddbebc7a35c82ea357b37e022
 2016-12-06 19:20:24 +00:00