Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
266,851 Commits 3 Branches 0 Tags
23c2ec20b7ca01acbcc2c322256fe1afee62c8ea
Commit Graph

266851 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Benjamin Franz
3c826b160c Merge "Add an intent extra to force master clear" into nyc-mr1-dev 2016-06-01 17:13:15 +00:00
Chen Xu
7c02044ee8 Merge "trim and strip html tags for load safe label name" into nyc-dev am: c16bc88fc9 
am: 30680c6506

* commit '30680c65061777a6eaa4a19e195567765bdb6b6d':
  trim and strip html tags for load safe label name

Change-Id: I13347f68eba49563974e5067eb9997b20ac0b5cd
 2016-06-01 17:12:16 +00:00
Makoto Onuki
eddbfecb8d ShortcutManager: API rename 
The words "title" and "text" implies that "text" is a secondary label
that's shown with the title, but it turned out the launcher would show
only one of those depending on how much space it has.

So now we change them to "shortLabel" and "longLabel"

Note we're only changing the API surface -- in order to mimimize
the impact to the code, internally we'll keep using the old names.

- Also remove "shortcutRank" while I'm here -- it should be implied
from the order of the XML elements.

Bug 29057378

Change-Id: I3203f63b0318c7462c1c61fef43cf9755fa8c008
 2016-06-01 10:09:10 -07:00
Chen Xu
d97994962d Merge "trim and strip html tags for load safe label name" into nyc-dev am: c16bc88fc9 
am: 36befb2dbc

* commit '36befb2dbce9b05ce1cf26ee9aef5c268d6c7266':
  trim and strip html tags for load safe label name

Change-Id: I630902aad16a71485506628625bb3b9c09b992f6
 2016-06-01 17:06:41 +00:00
Mady Mellor
8c475d5b0a Merge "Adds alpha to dimmed backgrounds" into nyc-dev 
am: 0d7dbb0f28

* commit '0d7dbb0f282afb43ec2a6a81789379749b2ab054':
  Adds alpha to dimmed backgrounds

Change-Id: I1ae5d761387b9eb9b9eb42c1eea65275b63eed64
 2016-06-01 17:06:26 +00:00
Mady Mellor
c123c0b4d0 Merge "Adds alpha to dimmed backgrounds" into nyc-dev 
am: 0d7dbb0f28

* commit '0d7dbb0f282afb43ec2a6a81789379749b2ab054':
  Adds alpha to dimmed backgrounds

Change-Id: Iebe58b6c0b8a1b030626e5bb581dfd2c92d17a7b
 2016-06-01 17:06:24 +00:00
Brian Carlstrom
93193135b1 Merge "PackageManager: Don't clear app profiles during system upgrades." into nyc-dev 2016-06-01 17:06:20 +00:00
Jason Monk
8768f68713 Merge "QS: Only put visible tiles in listening state" into nyc-dev 2016-06-01 17:04:26 +00:00
Jason Monk
7b945d8d30 Merge "QS: Protect against crash with no icon" into nyc-dev 2016-06-01 17:04:21 +00:00
Annie Chin
937a991be4 Add createAssistManager() method to SystemUIFactory 
Bug: 29045300
Change-Id: Ic912066944e3aed377fcc6af223b585c5ba3840c
 2016-06-01 10:03:41 -07:00
TreeHugger Robot
ff39d3ec2f Merge "MessagingStyle: Generate EXTRA_TITLE and EXTRA_TEXT" into nyc-dev 2016-06-01 17:02:00 +00:00
fionaxu
30680c6506 Merge "trim and strip html tags for load safe label name" into nyc-dev 
am: c16bc88fc9

* commit 'c16bc88fc99a6446c77d0b075f242c042bb31ded':
  trim and strip html tags for load safe label name

Change-Id: I34cebbce65db27304e6d3dcc2c6e0cbc0f005b03
 2016-06-01 16:56:44 +00:00
fionaxu
36befb2dbc Merge "trim and strip html tags for load safe label name" into nyc-dev 
am: c16bc88fc9

* commit 'c16bc88fc99a6446c77d0b075f242c042bb31ded':
  trim and strip html tags for load safe label name

Change-Id: Ic79f077813fcf2124fe1cbf031cb4e0770a02a51
 2016-06-01 16:55:51 +00:00
Mady Mellor
0d7dbb0f28 Merge "Adds alpha to dimmed backgrounds" into nyc-dev 2016-06-01 16:53:50 +00:00
Chen Xu
c16bc88fc9 Merge "trim and strip html tags for load safe label name" into nyc-dev 2016-06-01 16:47:19 +00:00
Android Build Merger (Role)
d032e5fad5 Merge "Merge "Work on issue #28942589: Tune job scheduler" into nyc-dev am: 438693dd6c am: 0e443c1320" into nyc-mr1-dev-plus-aosp 2016-06-01 16:46:19 +00:00
Dianne Hackborn
689db54fde Merge "Work on issue #28942589: Tune job scheduler" into nyc-dev am: 438693dd6c 
am: 0e443c1320

* commit '0e443c132092fc028227297aa71ed4a35729c71c':
  Work on issue #28942589: Tune job scheduler

Change-Id: I14cf39b73d09b3dccc6b3a5ed08d38f8a7d536ba
 2016-06-01 16:45:46 +00:00
Dianne Hackborn
e174476b70 Merge "Work on issue #28942589: Tune job scheduler" into nyc-dev am: 438693dd6c 
am: 576430f36a

* commit '576430f36ac04843fed5697ecae1716489c164bb':
  Work on issue #28942589: Tune job scheduler

Change-Id: I101010ff1d7d88c2ccac14d095df7722569cf549
 2016-06-01 16:45:40 +00:00
Selim Cinek
6ebba59aad Fixes a few bugs on the keyguard with font density changes 
The reinflation of the system icons was not working correctly
and all the paddings were of.
Also the affordance icons were outdated and had to be reloaded.

Change-Id: I3cf338d33a82c8be94d01561d7b7d9a37a563ad9
Fixes: 28968657
Fixes: 28672410
 2016-06-01 09:41:44 -07:00
Dianne Hackborn
576430f36a Merge "Work on issue #28942589: Tune job scheduler" into nyc-dev 
am: 438693dd6c

* commit '438693dd6cc4e3fe2ffb336d551c0d69e9546102':
  Work on issue #28942589: Tune job scheduler

Change-Id: I9e4ddcc64d84a8d943128d8bd8ebf158743c5549
 2016-06-01 16:38:18 +00:00
Dianne Hackborn
0e443c1320 Merge "Work on issue #28942589: Tune job scheduler" into nyc-dev 
am: 438693dd6c

* commit '438693dd6cc4e3fe2ffb336d551c0d69e9546102':
  Work on issue #28942589: Tune job scheduler

Change-Id: I8264ce4204762358ccbf893e7846434eed258a22
 2016-06-01 16:38:12 +00:00
Julia Reynolds
656f98681e Radio buttons belong in a radio group. 
Fix for 'multiple buttons selected at once' issue.

Change-Id: Iec54eac699886ed1c7b8afd91382ff9b5750c696
Fixes: 27698976
 2016-06-01 12:37:13 -04:00
Clara Bayarri
3ac0ae076e Fix Keyboard Shortcut Helper requires pressing META+/ twice 
By using a local boolean we were missing out on when the system dismisses
the window with the back key.

Bug: 28910518
Change-Id: I87b21c11830eaf81e3fd9586be6e3a7bb59c8a1f
 2016-06-01 17:28:14 +01:00
Ian Rogers
3e4885d333 Fix call to equals that could never succeed. 
Caught by Error Prone.
Bug: 29045331

Change-Id: I5901a3ca06e0cc85620f596cfa4178f5ad61d1a7
(cherry picked from commit edf2f5747b)
 2016-06-01 16:27:28 +00:00
Dianne Hackborn
438693dd6c Merge "Work on issue #28942589: Tune job scheduler" into nyc-dev 2016-06-01 16:27:06 +00:00
Ian Rogers
3e2280ed2b Merge "Fix call to equals that could never succeed." 2016-06-01 16:16:30 +00:00
Narayan Kamath
34a6258b2a PackageManager: Don't clear app profiles during system upgrades. 
They don't need to be cleared and will remain valid as long as
the application itself hasn't changed.

bug: 28998083
bug: 29067239
Change-Id: I2e4a4ee1b168da81073b8e70b12918db592fe691
 2016-06-01 16:12:23 +00:00
Bill Yi
7955503ff8 Merge "Import translations. DO NOT MERGE" into nyc-dev am: a007e877f2 -s ours am: ed0e749092 -s ours 
am: d785db718c  -s ours

* commit 'd785db718c4adf21ba36e8d2ca6e1c60047e3d55':

Change-Id: I595fbf6c7c46b83c144954ca422c384361b4b53f
 2016-06-01 15:59:15 +00:00
Bill Yi
eb7c80c68d Merge "Import translations. DO NOT MERGE" into nyc-dev am: f9a6f33091 -s ours am: 54fd6701ca -s ours 
am: 5c7df93d1a  -s ours

* commit '5c7df93d1a648d26da61a8cc4dac6d6db270cf10':

Change-Id: Idfdfd9206ce67361b84dd09e06facd9e8abfb975
 2016-06-01 15:59:00 +00:00
Bill Yi
32390767e8 Merge "Import translations. DO NOT MERGE" into nyc-dev am: 072150db89 -s ours am: 725ce2bc3f -s ours 
am: 5ba2ce6bc1  -s ours

* commit '5ba2ce6bc1a7c7357008a3a7fe4f0d0a491faf71':

Change-Id: I610182a8e75a632ec8f03c6e767c51733d08ecac
 2016-06-01 15:58:51 +00:00
Bill Yi
a6cef60067 Merge "Import translations. DO NOT MERGE" into nyc-dev am: a007e877f2 -s ours am: 652af4f813 -s ours 
am: db565bd516  -s ours

* commit 'db565bd5164c75184588d82f6f16b48715eb4cd3':
  Import translations. DO NOT MERGE

Change-Id: I219e46e4ec657af17fddd3dc0633f2a45757f014
 2016-06-01 15:58:40 +00:00
Bill Yi
c77280528d Merge "Import translations. DO NOT MERGE" into nyc-dev am: f9a6f33091 -s ours am: e316fc0577 -s ours 
am: 1f851eed00  -s ours

* commit '1f851eed00a20cff2b39fba826e77a70ca0eb8bf':
  Import translations. DO NOT MERGE

Change-Id: I7b671e84e25a5f2a7023717da64cf0b3d7003008
 2016-06-01 15:56:06 +00:00
Bill Yi
71bd3f34c3 Merge "Import translations. DO NOT MERGE" into nyc-dev am: 072150db89 -s ours am: 998797a27d -s ours 
am: 80cf9ecd58  -s ours

* commit '80cf9ecd584e832f41bb37890e13c25870f649a2':
  Import translations. DO NOT MERGE

Change-Id: I7eb685e078cddd1e418a69be4d991221ef027c4a
 2016-06-01 15:55:55 +00:00
Bill Yi
4a289e34aa Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 561ae1baca -s ours 
am: 0acacda9a9  -s ours

* commit '0acacda9a9d4028686ad739f6c8ff4b4a8a2bc34':
  Import translations. DO NOT MERGE

Change-Id: Id599aec7dff8238adc2400d5f488a265698d0ff5
 2016-06-01 15:55:42 +00:00
Bill Yi
13bff4bed0 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 713e725b1e -s ours 
am: 937b083980  -s ours

* commit '937b083980a033f2da05b3d2171e8e7e693205e6':
  Import translations. DO NOT MERGE

Change-Id: I4d86014a16bf95d50dcc425b012465a2aa44dd8e
 2016-06-01 15:55:24 +00:00
Bill Yi
4c429aded4 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 8c228d05e3 -s ours 
am: 71951ad82d  -s ours

* commit '71951ad82d3051f539c79e026abdeff2b7dd106f':
  Import translations. DO NOT MERGE

Change-Id: Ic83ddbf8c6da95026e39fbdf13eaf4f90620ff1b
 2016-06-01 15:55:10 +00:00
Bill Yi
d785db718c Merge "Import translations. DO NOT MERGE" into nyc-dev am: a007e877f2 -s ours 
am: ed0e749092  -s ours

* commit 'ed0e749092e8d8303876738b159278c8f226fc55':

Change-Id: I71989db7e276e5e4f735725fbb250d6aea764b56
 2016-06-01 15:49:29 +00:00
Bill Yi
5c7df93d1a Merge "Import translations. DO NOT MERGE" into nyc-dev am: f9a6f33091 -s ours 
am: 54fd6701ca  -s ours

* commit '54fd6701caea2f9471b7fd16e93ab5fe0d75da2d':

Change-Id: I8cc20393d26a06a25aa565241b31099b782d026e
 2016-06-01 15:49:25 +00:00
Bill Yi
5ba2ce6bc1 Merge "Import translations. DO NOT MERGE" into nyc-dev am: 072150db89 -s ours 
am: 725ce2bc3f  -s ours

* commit '725ce2bc3fcda86c08725e5cb3696e1a5adbc179':

Change-Id: I964c896985a493ac3cd2c2829ab406514b63424e
 2016-06-01 15:49:22 +00:00
Bill Yi
db565bd516 Merge "Import translations. DO NOT MERGE" into nyc-dev am: a007e877f2 -s ours 
am: 652af4f813  -s ours

* commit '652af4f8133741752ed3146b7408144b28c45eff':
  Import translations. DO NOT MERGE

Change-Id: I7346c446e942b1f57f97d5341cca64f43f2e6489
 2016-06-01 15:41:04 +00:00
Bill Yi
1f851eed00 Merge "Import translations. DO NOT MERGE" into nyc-dev am: f9a6f33091 -s ours 
am: e316fc0577  -s ours

* commit 'e316fc0577a1a4f8cd08c50b5c2e56d866a13983':
  Import translations. DO NOT MERGE

Change-Id: Ide5118c04f66f5c20ca474cc83c2eb9da3a8ddd1
 2016-06-01 15:41:02 +00:00
Bill Yi
80cf9ecd58 Merge "Import translations. DO NOT MERGE" into nyc-dev am: 072150db89 -s ours 
am: 998797a27d  -s ours

* commit '998797a27d026a0b79dc1fd1fcb6004a35799228':
  Import translations. DO NOT MERGE

Change-Id: Ida92a6743226c1c95cd8531012a3c953a0c0a7bd
 2016-06-01 15:40:59 +00:00
Bill Yi
ed0e749092 Merge "Import translations. DO NOT MERGE" into nyc-dev 
am: a007e877f2  -s ours

* commit 'a007e877f2ed32bd51d6c03e94e20eac94ef4081':
  Import translations. DO NOT MERGE

Change-Id: Ic0ab9aacb14fb341186d8c204f8595cd4087ae6a
 2016-06-01 15:35:03 +00:00
Bill Yi
54fd6701ca Merge "Import translations. DO NOT MERGE" into nyc-dev 
am: f9a6f33091  -s ours

* commit 'f9a6f33091772b847cf1580021530cdf5004c035':
  Import translations. DO NOT MERGE

Change-Id: I19a2537c01efc8b4e47d64778d675bbed498b782
 2016-06-01 15:34:50 +00:00
Bill Yi
725ce2bc3f Merge "Import translations. DO NOT MERGE" into nyc-dev 
am: 072150db89  -s ours

* commit '072150db89de9fda26bd2150242ab31f9309ec70':
  Import translations. DO NOT MERGE

Change-Id: Ic78cdd6faee5831d7fa1a62d3cca0c49f1e0ad1a
 2016-06-01 15:34:37 +00:00
Bill Yi
652af4f813 Merge "Import translations. DO NOT MERGE" into nyc-dev 
am: a007e877f2  -s ours

* commit 'a007e877f2ed32bd51d6c03e94e20eac94ef4081':
  Import translations. DO NOT MERGE

Change-Id: I261c5b972c2cf481fcfd2cd69ae7b4803ca8fac1
 2016-06-01 15:33:43 +00:00
Bill Yi
e316fc0577 Merge "Import translations. DO NOT MERGE" into nyc-dev 
am: f9a6f33091  -s ours

* commit 'f9a6f33091772b847cf1580021530cdf5004c035':
  Import translations. DO NOT MERGE

Change-Id: Id0b2e17995055d8d92b2e3f0d6a81e4a41fa55cb
 2016-06-01 15:33:18 +00:00
Bill Yi
998797a27d Merge "Import translations. DO NOT MERGE" into nyc-dev 
am: 072150db89  -s ours

* commit '072150db89de9fda26bd2150242ab31f9309ec70':
  Import translations. DO NOT MERGE

Change-Id: I7c97e2bfe59959e888e22cf8b3304a51aee0a0c9
 2016-06-01 15:33:02 +00:00
Bill Yi
0acacda9a9 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 
am: 561ae1baca  -s ours

* commit '561ae1bacaf1cf0c282363e97dc006d41ee19cb5':
  Import translations. DO NOT MERGE

Change-Id: Ib2531d234f02ecfef5405028ef50f39c4265bc90
 2016-06-01 15:32:47 +00:00
Bill Yi
937b083980 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 
am: 713e725b1e  -s ours

* commit '713e725b1ed378711aadaff5173bd6c93d9aff76':
  Import translations. DO NOT MERGE

Change-Id: I7e206b75f8385f639b5a4d6ab8e8a118f2448d2d
 2016-06-01 15:32:40 +00:00