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
Bill Yi
71951ad82d Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 
am: 8c228d05e3  -s ours

* commit '8c228d05e3b050c82a3e7bd69799d6dafad5e0e9':
  Import translations. DO NOT MERGE

Change-Id: Id4d7363ff2a4d43388f8c8bb2b6e117cee373a66
 2016-06-01 15:32:34 +00:00
TreeHugger Robot
d587640ab5 Merge "Import translations. DO NOT MERGE" 2016-06-01 15:30:01 +00:00
TreeHugger Robot
23403a8c71 Merge "Import translations. DO NOT MERGE" 2016-06-01 15:29:39 +00:00
TreeHugger Robot
13297acee8 Merge "Import translations. DO NOT MERGE" 2016-06-01 15:29:23 +00:00
TreeHugger Robot
92aa7d114f Merge "Import translations. DO NOT MERGE" 2016-06-01 15:29:01 +00:00
TreeHugger Robot
a007e877f2 Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-06-01 15:26:43 +00:00
TreeHugger Robot
561ae1baca Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 2016-06-01 15:25:53 +00:00
TreeHugger Robot
f9a6f33091 Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-06-01 15:25:35 +00:00
TreeHugger Robot
713e725b1e Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 2016-06-01 15:25:16 +00:00
Jae Seo
750e48738c Fix documentation for channel types 
Bug: 28747244
Change-Id: I492bdb94400b298d7f2e0ccf9054761e60c5a548
 2016-06-01 08:24:18 -07:00
David Sehr
a877708286 Installer connection support for dump_profiles 
Bug: 28748264
Change-Id: I22322b5a0716a030d9873edcc6dfd7f3ef2d3bca
 2016-06-01 08:21:27 -07:00
TreeHugger Robot
f59c4d544c Merge "Import translations. DO NOT MERGE" 2016-06-01 15:19:44 +00:00
Jason Monk
f50e88227d QS: Fix single expanded frame from layout 
During animation it was resetting the QS expansion on layout which
made a frame of fully expanded appear.

Bug: 28008271
Change-Id: I6ac44cb918bdf53da0653332eabf0f4e96779cff
 2016-06-01 11:19:26 -04:00
TreeHugger Robot
a00d00e1ca Merge "Import translations. DO NOT MERGE" 2016-06-01 15:19:12 +00:00
TreeHugger Robot
8c228d05e3 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 2016-06-01 15:16:50 +00:00
TreeHugger Robot
072150db89 Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-06-01 15:15:58 +00:00
Benjamin Franz
f9d5e6a3db Add an intent extra to force master clear 
Currently, if a priv-app sends ACTION_MASTER_CLEAR, whilst
DISALLOW_FACTORY_RESET is set, the factory reset is blocked. This CL
introduces a new extra for master clear that let's the priv-app bypass
the user restriction.

Bug: 28689894
Change-Id: I4bf979a3826454e977f1abff4562f85c8d0eec4a
 2016-06-01 15:45:59 +01:00
Jason Monk
e19cc141c3 QS: Protect against crash with no icon 
Change-Id: I65d594c9bf15190418d96cc6d2c426df00fed212
Fixes: 28941131
 2016-06-01 10:25:01 -04:00
Chris Banes
b929584547 Merge "Fix action mode animation on recreations - framework edition am: e65b3fbb63 am: 9269e2272b" into nyc-mr1-dev-plus-aosp 
am: 8323f3057c

* commit '8323f3057ce0f8521e8abe15a9e86a42ae59849a':

Change-Id: I1d2daae766d1f1f64d0fb481908c820c5e7f2f9d
 2016-06-01 14:06:15 +00:00
Chris Banes
9d2f3d885f Fix action mode animation on recreations - framework edition am: e65b3fbb63 am: b4acd653e6 
am: 63aa97a5b6

* commit '63aa97a5b6470634b939d6d6e481b6b2554049d7':
  Fix action mode animation on recreations - framework edition

Change-Id: I6ee5eef6630e1cd73cec8e8dd0f75898131632af
 2016-06-01 14:06:11 +00:00
Android Build Merger (Role)
8323f3057c Merge "Fix action mode animation on recreations - framework edition am: e65b3fbb63 am: 9269e2272b" into nyc-mr1-dev-plus-aosp 2016-06-01 13:58:58 +00:00
Chris Banes
220e4db33c Fix action mode animation on recreations - framework edition am: e65b3fbb63 
am: 9269e2272b

* commit '9269e2272bea8b4c6ca80c3e20872de75dd4c876':
  Fix action mode animation on recreations - framework edition

Change-Id: I40309a35d76dd1da34e91b0ab7a2e756956fbdf8
 2016-06-01 13:58:28 +00:00
Chris Banes
63aa97a5b6 Fix action mode animation on recreations - framework edition am: e65b3fbb63 
am: b4acd653e6

* commit 'b4acd653e6f554d33b838b3dd1de643d7997956d':
  Fix action mode animation on recreations - framework edition

Change-Id: I90681c1028df89dc10f7e79068b5936685bdf83c
 2016-06-01 13:58:25 +00:00
Chris Banes
9269e2272b Fix action mode animation on recreations - framework edition 
am: e65b3fbb63

* commit 'e65b3fbb63b4b6937fede2e4b889c0a51a881358':
  Fix action mode animation on recreations - framework edition

Change-Id: Ic990cf5fdb98e86083ccfe54f8f3e6905aa3e375
 2016-06-01 13:54:01 +00:00
Chris Banes
b4acd653e6 Fix action mode animation on recreations - framework edition 
am: e65b3fbb63

* commit 'e65b3fbb63b4b6937fede2e4b889c0a51a881358':
  Fix action mode animation on recreations - framework edition

Change-Id: I19274b7ede1fae09deb915807c35a478caf939ee
 2016-06-01 13:53:58 +00:00
Chris Banes
e65b3fbb63 Fix action mode animation on recreations - framework edition 
Currently if an action mode is started in onCreate()
it will fade in. This isn't ideal though, especially
since Activities are recreated routinely with
multi-window and resizable Activities. In that instance
we fade it in on every recreate.

This CL fixes this in both the decor and toolbar action
modes to only fade in if the decor has been laid out.

BUG: 29036694

Change-Id: Iae985efcced170a0a4229124c1c132355c2aa71e
 2016-06-01 14:38:17 +01:00
Bill Yi
069a939ffd Import translations. DO NOT MERGE 
Change-Id: I1e9a73431f13e4ccab446571ec51524eb5a3a165
Auto-generated-cl: translation import
 2016-06-01 06:15:34 -07:00
Bill Yi
2f263ac711 Import translations. DO NOT MERGE 
Change-Id: Ia172193f8f33ba21461ea85c092248433d254780
Auto-generated-cl: translation import
 2016-06-01 06:09:15 -07:00
Bill Yi
fe8451b206 Import translations. DO NOT MERGE 
Change-Id: I74b3ff246a5db23b1b41c489e732883349b70b75
Auto-generated-cl: translation import
 2016-06-01 05:14:39 -07:00
Bill Yi
d45b19f3ac Import translations. DO NOT MERGE 
Change-Id: I5b36170ac174ea723df0aed1d06e465c46b488bc
Auto-generated-cl: translation import
 2016-06-01 05:09:10 -07:00
Vasco Brito
c0246a04b6 Revert "Merge "Add 900 for Russia - Short code used by Sberbank."" 
This reverts commit 9a769a4828, reversing
changes made to 6fb921a61b.
 2016-06-01 10:50:57 +01:00
Bill Yi
4db6778075 Import translations. DO NOT MERGE 
Change-Id: I825eb779a66d54e72adca353cc52fbdeaf2921ae
Auto-generated-cl: translation import
 2016-06-01 02:01:08 -07:00
Bill Yi
3fb5d5249d Import translations. DO NOT MERGE 
Change-Id: I95a9ffff8b53c291bd9eb314641b310c4ca1cbad
Auto-generated-cl: translation import
 2016-06-01 01:51:04 -07:00
Bill Yi
1648593a2a Import translations. DO NOT MERGE 
Change-Id: I637f5ffcfb514015ac00e23b2a8e0c592c2958a4
Auto-generated-cl: translation import
 2016-06-01 01:38:57 -07:00
Bill Yi
88b23ba405 Import translations. DO NOT MERGE 
Change-Id: Ib90c671ec93583cc219bfc9bb18f199c71963f04
Auto-generated-cl: translation import
 2016-06-01 01:19:56 -07:00
Bill Yi
195e37d0f6 Import translations. DO NOT MERGE 
Change-Id: I44507637b6206fc321f71d4d6df95443001cf825
Auto-generated-cl: translation import
 2016-06-01 00:21:06 -07:00
Bill Yi
fd912922cb Import translations. DO NOT MERGE 
Change-Id: Ic3cb4f2ef09fbe07eee808594d3a7bc69d4af3d8
Auto-generated-cl: translation import
 2016-05-31 23:54:32 -07:00
Bill Yi
52d8ad7855 Import translations. DO NOT MERGE 
Change-Id: Ibf30eed653e428b2d2d16c56c29d15c0c19556c1
Auto-generated-cl: translation import
 2016-05-31 23:41:50 -07:00
Bill Yi
5af329447b Import translations. DO NOT MERGE 
Change-Id: I6d2bd7fc9b00d921c1358529e8137265bd2201de
Auto-generated-cl: translation import
 2016-05-31 23:30:46 -07:00
Erik Wolsheimer
59f05690e2 Show crash/ANR dialogs on userdebug watch builds 
BUG: 28960987
Change-Id: Iaa237df9578816b91638d0bef0e0730721d62ba2
 2016-05-31 21:26:36 -07:00
Wei Wang
ac02eee133 Merge "Trigger power hints for activity launch" into nyc-mr1-dev am: 2ab4ac3835 
am: 3f1fa8f432

* commit '3f1fa8f43219634c1deb8420d962b0f43c35ccb5':
  Trigger power hints for activity launch

Change-Id: I57075b28d232b61f67e89a16f48c5ac7efeea05d
 2016-06-01 03:21:56 +00:00
Wei Wang
3f1fa8f432 Merge "Trigger power hints for activity launch" into nyc-mr1-dev 
am: 2ab4ac3835

* commit '2ab4ac38350b51c239fe564bc89727b201036205':
  Trigger power hints for activity launch

Change-Id: I2c16d792bfa2617bb8120529f204d50fc817bab0
 2016-06-01 03:14:27 +00:00
Wei Wang
2ab4ac3835 Merge "Trigger power hints for activity launch" into nyc-mr1-dev 2016-06-01 03:06:38 +00:00
Kevin Hufnagle
d5368b8185 cherry-pick: docs: Added note that <application> at end of manifest. 
After cherry picking, removed trailing whitespace at end of lines.

Bug: 28823898
Change-Id: I30d69f1877d772893965e1512455f3addb397c80
Original-Change-Id: I9d4e67c30a0e95e78a596c933c9b9d4804eb4d6a
 2016-05-31 19:41:52 -07:00
fionaxu
e630f35322 trim and strip html tags for load safe label name 
Bug: 28557603
Change-Id: I30b6c1d32e97c1fb71ba83c2845c310fe3b7f579
 2016-05-31 18:42:18 -07:00
Andrii Kulian
547561d54a Merge "Merge "Update override config to include some changes from global config" into nyc-dev am: 88be465ce5 am: a0668c7442" into nyc-mr1-dev-plus-aosp 
am: 7b53808df7

* commit '7b53808df746e8e0344b2589c1f952048d70e515':

Change-Id: I28ad9093e6eaa27a7812003e382394fb561864a1
 2016-06-01 01:35:04 +00:00
Andrii Kulian
d30ac73d31 Merge "Update override config to include some changes from global config" into nyc-dev am: 88be465ce5 am: ae01e27755 
am: cd99c37bc2

* commit 'cd99c37bc2b742043be79c8d4e85876a1f7a15b4':
  Update override config to include some changes from global config

Change-Id: I95b69f5e21c573aa081752c914ff1f5797ad8aad
 2016-06-01 01:34:52 +00:00
Wei Wang
98f03f98ac Trigger power hints for activity launch 
BUG: 28220567
Change-Id: Id2a0397efd1dd02ee50d5626edaed9e60ea6de8a
 2016-05-31 18:34:01 -07:00
Android Build Merger (Role)
7b53808df7 Merge "Merge "Update override config to include some changes from global config" into nyc-dev am: 88be465ce5 am: a0668c7442" into nyc-mr1-dev-plus-aosp 2016-06-01 01:28:03 +00:00
Andrii Kulian
8036ed8bf9 Merge "Update override config to include some changes from global config" into nyc-dev am: 88be465ce5 
am: a0668c7442

* commit 'a0668c7442ed2f66323c4ae798b5b39c1ab7cd52':
  Update override config to include some changes from global config

Change-Id: Ifca4309410e0ab8813e32787daca658f493ac03c
 2016-06-01 01:27:32 +00:00