Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
198,040 Commits 3 Branches 0 Tags
0dd41507d57c0533755653bb94de40a89eb5c734
Commit Graph

198040 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Clara Bayarri
0dd41507d5 am dc904377: am 89124000: Merge "Fix Floating tool bar flickers after long pressing on empty region." into mnc-dev 
* commit 'dc904377e7572fbead60d0fa66716de4e92770c2':
  Fix Floating tool bar flickers after long pressing on empty region.
 2015-06-10 17:13:53 +00:00
Clara Bayarri
dc904377e7 am 89124000: Merge "Fix Floating tool bar flickers after long pressing on empty region." into mnc-dev 
* commit '89124000c618f24b948505cd79f654aacbdff957':
  Fix Floating tool bar flickers after long pressing on empty region.
 2015-06-10 17:00:48 +00:00
Jeff Sharkey
caecce24d7 am 30dd30de: am c7c8af67: Merge "Send added user serial numbers to vold." into mnc-dev 
* commit '30dd30de20b7b82197eed27204bd60da34d8711e':
  Send added user serial numbers to vold.
 2015-06-10 17:00:05 +00:00
Geoff Mendal
dc66847fd2 am d709659b: (-s ours) am dc9ad9aa: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev 
* commit 'd709659be91bf8da10121626a499a4c9b528d016':
  Import translations. DO NOT MERGE
 2015-06-10 17:00:00 +00:00
Makoto Onuki
f8d8a6c9b3 am d3acdf2a: am e6d8ffb4: Merge "Add more result extras for ACTION_GET_PERMISSIONS_COUNT" into mnc-dev 
* commit 'd3acdf2a4814c2a476faf444d03887f162235a78':
  Add more result extras for ACTION_GET_PERMISSIONS_COUNT
 2015-06-10 16:59:55 +00:00
Jeff Sharkey
30dd30de20 am c7c8af67: Merge "Send added user serial numbers to vold." into mnc-dev 
* commit 'c7c8af6726eda245288ab1af720297c60cd1be54':
  Send added user serial numbers to vold.
 2015-06-10 16:51:22 +00:00
Geoff Mendal
d709659be9 am dc9ad9aa: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev 
* commit 'dc9ad9aaee5bef44888cbebb035635a30b548cb8':
  Import translations. DO NOT MERGE
 2015-06-10 16:51:17 +00:00
Makoto Onuki
d3acdf2a48 am e6d8ffb4: Merge "Add more result extras for ACTION_GET_PERMISSIONS_COUNT" into mnc-dev 
* commit 'e6d8ffb40f555bbb3b88a3544616de28426e75a1':
  Add more result extras for ACTION_GET_PERMISSIONS_COUNT
 2015-06-10 16:51:12 +00:00
Clara Bayarri
89124000c6 Merge "Fix Floating tool bar flickers after long pressing on empty region." into mnc-dev 2015-06-10 16:50:46 +00:00
Jeff Sharkey
c7c8af6726 Merge "Send added user serial numbers to vold." into mnc-dev 2015-06-10 16:44:52 +00:00
Geoff Mendal
dc9ad9aaee Merge "Import translations. DO NOT MERGE" into mnc-dev 2015-06-10 16:44:10 +00:00
Jeff Sharkey
bcd262da4b Send added user serial numbers to vold. 
vold will eventually use the serial numbers to clean up stale user
directories when mounting private storage devices.

Bug: 20275572
Change-Id: I37f6c10026608dfa6484598420db5a5870330d25
 2015-06-10 09:41:17 -07:00
Makoto Onuki
e6d8ffb40f Merge "Add more result extras for ACTION_GET_PERMISSIONS_COUNT" into mnc-dev 2015-06-10 16:38:55 +00:00
Geoff Mendal
43fbaf34c5 Import translations. DO NOT MERGE 
Change-Id: I6645c53b1ec2f48524d162e7c9a771e0684e3628
Auto-generated-cl: translation import
 2015-06-10 09:37:36 -07:00
James Cook
6f02ba8c82 am e2a0e450: am f22030d1: Merge "Fix ActionButton.CloseMode minWidth to match Toolbar.Button.Navigation" into mnc-dev 
* commit 'e2a0e4504897d00cc8600959df636d9675ca63a8':
  Fix ActionButton.CloseMode minWidth to match Toolbar.Button.Navigation
 2015-06-10 16:06:14 +00:00
Paul Lawrence
f31bd09afc am c8c5884d: am 0c3aa483: Merge "Remove hex encoding and password adjusting now that patterns are \'1\' based" into mnc-dev 
* commit 'c8c5884d976f599efd3aef3b64aa42f3072947b1':
  Remove hex encoding and password adjusting now that patterns are '1' based
 2015-06-10 16:06:09 +00:00
Lorenzo Colitti
bb2f798ae1 am 1f91eed0: am bc7b1a4c: Merge "When no Internet access is detected, display a notification first." into mnc-dev 
* commit '1f91eed0485a69a2493833085a12b2f9ba46bd87':
  When no Internet access is detected, display a notification first.
 2015-06-10 15:56:28 +00:00
Keisuke Kuroyanagi
b9a8fc0cbf am b5f1641a: am 136a462c: Merge "Revert "Fix: Crash when modifying text while using drag accelerator."" into mnc-dev 
* commit 'b5f1641a34bd70b0758d25a547229234a646c6ef':
  Revert "Fix: Crash when modifying text while using drag accelerator."
 2015-06-10 15:56:23 +00:00
James Cook
e2a0e45048 am f22030d1: Merge "Fix ActionButton.CloseMode minWidth to match Toolbar.Button.Navigation" into mnc-dev 
* commit 'f22030d1c59aca4f9ad2af7d4c4d646b0b619f27':
  Fix ActionButton.CloseMode minWidth to match Toolbar.Button.Navigation
 2015-06-10 15:56:14 +00:00
Paul Lawrence
c8c5884d97 am 0c3aa483: Merge "Remove hex encoding and password adjusting now that patterns are \'1\' based" into mnc-dev 
* commit '0c3aa4834efd91ea9559486fed1d613fd4289969':
  Remove hex encoding and password adjusting now that patterns are '1' based
 2015-06-10 15:56:09 +00:00
James Cook
f22030d1c5 Merge "Fix ActionButton.CloseMode minWidth to match Toolbar.Button.Navigation" into mnc-dev 2015-06-10 15:47:23 +00:00
Paul Lawrence
0c3aa4834e Merge "Remove hex encoding and password adjusting now that patterns are '1' based" into mnc-dev 2015-06-10 15:42:42 +00:00
Lorenzo Colitti
1f91eed048 am bc7b1a4c: Merge "When no Internet access is detected, display a notification first." into mnc-dev 
* commit 'bc7b1a4ca2f114d09ce186e25b18692df2c9e872':
  When no Internet access is detected, display a notification first.
 2015-06-10 15:42:30 +00:00
Keisuke Kuroyanagi
b5f1641a34 am 136a462c: Merge "Revert "Fix: Crash when modifying text while using drag accelerator."" into mnc-dev 
* commit '136a462c8bb35bdd21258f03f3f9adca06990701':
  Revert "Fix: Crash when modifying text while using drag accelerator."
 2015-06-10 15:42:21 +00:00
Lorenzo Colitti
bc7b1a4ca2 Merge "When no Internet access is detected, display a notification first." into mnc-dev 2015-06-10 15:25:31 +00:00
Jason Monk
e18f69fa21 am 473da8b6: am b73390ac: Merge "Fix work apps showing as not installed for owner" into mnc-dev 
* commit '473da8b6185ce13a9d07e3a6590901464a27900d':
  Fix work apps showing as not installed for owner
 2015-06-10 15:21:38 +00:00
Keisuke Kuroyanagi
136a462c8b Merge "Revert "Fix: Crash when modifying text while using drag accelerator."" into mnc-dev 2015-06-10 15:13:16 +00:00
Jason Monk
473da8b618 am b73390ac: Merge "Fix work apps showing as not installed for owner" into mnc-dev 
* commit 'b73390acdd6a71d74d6ad107520a0f22d2bc5f1e':
  Fix work apps showing as not installed for owner
 2015-06-10 15:07:49 +00:00
Keisuke Kuroyanagi
eac4556e55 Revert "Fix: Crash when modifying text while using drag accelerator." 
This reverts commit 259292ff3d.

This introduced another bug (Bug: 21687602) and this is no longer useful
for the original one (Bug: 21178876).


Change-Id: I59acc161e7d8cba633718a3d17292e68740ef79e
 2015-06-10 15:02:22 +00:00
Chet Haase
f8aed4589e am 15fb34d2: am 81728b86: Merge "Clarify docs for Animator.isStarted()" into mnc-dev 
* commit '15fb34d2ea6282144a3826bbe3f3ae122b6dd755':
  Clarify docs for Animator.isStarted()
 2015-06-10 15:02:09 +00:00
Chris Wren
1d8d111a16 am 7f588404: am 300a1416: Merge changes from topic \'tron\' into mnc-dev 
* commit '7f588404c531db878597f1221d56907c5c40de5e':
  instrument notification longpress controls
  induct a bunch of new logging categories.
 2015-06-10 15:02:04 +00:00
Geoff Mendal
1faf2a6c00 am 9cf2547d: (-s ours) am b381bcc1: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev 
* commit '9cf2547d8bb5671e5223ba3a645f71c0f6cfdc72':
  Import translations. DO NOT MERGE
 2015-06-10 15:01:58 +00:00
Geoff Mendal
def22de21a am 530595ac: (-s ours) am 36eb6d5f: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev 
* commit '530595ac9fe59faa59e863073777bfec9e72cd2d':
  Import translations. DO NOT MERGE
 2015-06-10 15:01:53 +00:00
Geoff Mendal
1e557219fa am e3b1dc3c: (-s ours) am b6c026be: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev 
* commit 'e3b1dc3ca9f1837ad7e3d9630adb228f368e0602':
  Import translations. DO NOT MERGE
 2015-06-10 15:01:48 +00:00
Geoff Mendal
2fc53f85d7 am 68c80fcc: (-s ours) am 1947d9f5: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev 
* commit '68c80fcc02005e7f2eb60dd578df215258cde9f9':
  Import translations. DO NOT MERGE
 2015-06-10 15:01:43 +00:00
Neil Fuller
c15b4bcf3d am bbb06b32: am 8e095594: Merge "Stop showing long names for local timezones when it is ambiguous" into mnc-dev 
* commit 'bbb06b322bcd63a75484b2a54666141fc0a2b57e':
  Stop showing long names for local timezones when it is ambiguous
 2015-06-10 15:01:38 +00:00
Andrew Flynn
4fda24fece am c570a629: am da9bbf72: Merge "notifyCarrierNetworkChange:TelephonyManager->CarrierService" into mnc-dev 
* commit 'c570a6290f6051346bbbfb0e9e8fbe8d7ede8d99':
  notifyCarrierNetworkChange:TelephonyManager->CarrierService
 2015-06-10 15:01:32 +00:00
Andrei Stingaceanu
52243ad30d am 15f4dd72: resolved conflicts for merge of 1c96a941 to mnc-ub-dev 
* commit '15f4dd72192f11982a41d2fd92b7c2302b521476':
  Completely remove ExtractActionMode from ExtractEditLayout
 2015-06-10 15:01:27 +00:00
Jason Monk
b73390acdd Merge "Fix work apps showing as not installed for owner" into mnc-dev 2015-06-10 14:58:56 +00:00
Chet Haase
15fb34d2ea am 81728b86: Merge "Clarify docs for Animator.isStarted()" into mnc-dev 
* commit '81728b862e8448bc460fd6589de6c1b954f8227e':
  Clarify docs for Animator.isStarted()
 2015-06-10 14:54:44 +00:00
Chris Wren
7f588404c5 am 300a1416: Merge changes from topic \'tron\' into mnc-dev 
* commit '300a141650dc17d2a893b55133c62b0353d2a9bb':
  instrument notification longpress controls
  induct a bunch of new logging categories.
 2015-06-10 14:54:35 +00:00
Geoff Mendal
9cf2547d8b am b381bcc1: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev 
* commit 'b381bcc185340a09fbb576b2aa3ae970b1806d34':
  Import translations. DO NOT MERGE
 2015-06-10 14:54:30 +00:00
Geoff Mendal
530595ac9f am 36eb6d5f: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev 
* commit '36eb6d5f46c82a3df42074a3beedc748dec7f438':
  Import translations. DO NOT MERGE
 2015-06-10 14:54:24 +00:00
Geoff Mendal
e3b1dc3ca9 am b6c026be: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev 
* commit 'b6c026bec1430f7c31aa72cc9b2e160eca0464fd':
  Import translations. DO NOT MERGE
 2015-06-10 14:54:20 +00:00
Geoff Mendal
68c80fcc02 am 1947d9f5: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev 
* commit '1947d9f55e8b5966a473dbc7a75967325e32ae8b':
  Import translations. DO NOT MERGE
 2015-06-10 14:54:16 +00:00
Neil Fuller
bbb06b322b am 8e095594: Merge "Stop showing long names for local timezones when it is ambiguous" into mnc-dev 
* commit '8e095594a640a82b850ff3990bb690920eba921c':
  Stop showing long names for local timezones when it is ambiguous
 2015-06-10 14:53:54 +00:00
Andrew Flynn
c570a6290f am da9bbf72: Merge "notifyCarrierNetworkChange:TelephonyManager->CarrierService" into mnc-dev 
* commit 'da9bbf725592c6482d6fbce18ef8c258b18e4fc8':
  notifyCarrierNetworkChange:TelephonyManager->CarrierService
 2015-06-10 14:53:49 +00:00
Andrei Stingaceanu
15f4dd7219 resolved conflicts for merge of 1c96a941 to mnc-ub-dev 
Change-Id: I37613fa8fc8ff0d91c8cc2f8c389326c30a6b297
 2015-06-10 15:46:44 +01:00
Lorenzo Colitti
f6673d07c3 When no Internet access is detected, display a notification first. 
Previously, we displayed a dialog on top of whatever the user was
doing. Instead, display a notification that can take the user to
the dialog.

Because the notification is less intrusive, also enable it even
if the network without Internet access is already the system
default network. Previously we did not do this because in that
case the user might not have other useful options, and thus a
dialog would have been too intrusive.

Bug: 20081183
Bug: 20538448
Change-Id: I677be238d675c13a13dc0bae2dbb37cbe4f52cb6
 2015-06-10 23:37:00 +09:00
Chet Haase
81728b862e Merge "Clarify docs for Animator.isStarted()" into mnc-dev 2015-06-10 14:27:47 +00:00