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

71579 Commits

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
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
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
Geoff Mendal
dc9ad9aaee Merge "Import translations. DO NOT MERGE" into mnc-dev 2015-06-10 16:44:10 +00: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
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
James Cook
f22030d1c5 Merge "Fix ActionButton.CloseMode minWidth to match Toolbar.Button.Navigation" into mnc-dev 2015-06-10 15:47:23 +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
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
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
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
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
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
Chris Wren
300a141650 Merge changes from topic 'tron' into mnc-dev 
* changes:
  instrument notification longpress controls
  induct a bunch of new logging categories.
 2015-06-10 14:14:41 +00:00
Andrew Flynn
da9bbf7255 Merge "notifyCarrierNetworkChange:TelephonyManager->CarrierService" into mnc-dev 2015-06-10 11:41:32 +00:00
Andrei Stingaceanu
1c96a94184 Merge "Completely remove ExtractActionMode from ExtractEditLayout" into mnc-dev 2015-06-10 11:19:18 +00:00
Alex Chau
5e02c54947 am ad914181: am ccfa54f4: Merge "Add strings for notification shown upon work profile deletion" into mnc-dev 
* commit 'ad9141817fb42e1037675ee159c32a52e157782f':
  Add strings for notification shown upon work profile deletion
 2015-06-10 11:04:57 +00:00
Alex Chau
ad9141817f am ccfa54f4: Merge "Add strings for notification shown upon work profile deletion" into mnc-dev 
* commit 'ccfa54f4a226196aff49f81fa6c809ad05afccb6':
  Add strings for notification shown upon work profile deletion
 2015-06-10 10:53:42 +00:00
Alex Chau
ccfa54f4a2 Merge "Add strings for notification shown upon work profile deletion" into mnc-dev 2015-06-10 10:44:02 +00:00
Alex Chau
9c8d2b0620 Add strings for notification shown upon work profile deletion 
Bug: 18543323

Change-Id: I87713da6684044b95b2e6c38882e20fe798f8deb
 2015-06-10 11:42:14 +01:00
Chris Banes
1f5714c610 am d64c5bef: am d9b0acd2: Merge "Fix location for ActionMenuItemView cheat sheet" into mnc-dev 
* commit 'd64c5befd61434168b16f6eb1b722b7d3512f15a':
  Fix location for ActionMenuItemView cheat sheet
 2015-06-10 09:57:52 +00:00
Chris Banes
d64c5befd6 am d9b0acd2: Merge "Fix location for ActionMenuItemView cheat sheet" into mnc-dev 
* commit 'd9b0acd2eb8d844b9f901fc62e0de74c1a7d8430':
  Fix location for ActionMenuItemView cheat sheet
 2015-06-10 09:48:45 +00:00
Chet Haase
4ddd9257d6 Clarify docs for Animator.isStarted() 
Behavior is different than spec'd for one-shot animators, clarified
docs to reflect that.

Issue #21087798 better docs for isStarted()

Change-Id: I499a5d52cf02ef715acb6ae0635ede4328c93de8
 2015-06-10 10:42:50 +01:00
Chris Banes
d9b0acd2eb Merge "Fix location for ActionMenuItemView cheat sheet" into mnc-dev 2015-06-10 08:12:51 +00:00
Martijn Coenen
0c2d3d93dd am b1c579df: am 706f23dd: Merge "Make peer LLCP version an int." into mnc-dev 
* commit 'b1c579df0be37a43101f2a2c8205b2fe648c1377':
  Make peer LLCP version an int.
 2015-06-10 07:20:39 +00:00
Martijn Coenen
b1c579df0b am 706f23dd: Merge "Make peer LLCP version an int." into mnc-dev 
* commit '706f23ddb9f18663d5ae70626e118e815a308c84':
  Make peer LLCP version an int.
 2015-06-10 07:08:15 +00:00
Martijn Coenen
706f23ddb9 Merge "Make peer LLCP version an int." into mnc-dev 2015-06-10 06:58:20 +00:00
Martijn Coenen
bdc34b8440 Make peer LLCP version an int. 
And split major/minor.

Bug: 21343778
Change-Id: Ie9f0ecc9172849d3b088a0c1ce6d872b2f607919
 2015-06-10 08:49:02 +02:00
Jeff Sharkey
d6c886f862 am f355a22d: am e687929f: Merge "Flags to select storage volume for app installs." into mnc-dev 
* commit 'f355a22d1421a640bf057047b7833000acf94519':
  Flags to select storage volume for app installs.
 2015-06-10 05:07:51 +00:00
Jeff Sharkey
f355a22d14 am e687929f: Merge "Flags to select storage volume for app installs." into mnc-dev 
* commit 'e687929f33f272fff9585bd0752d85ad519bc66d':
  Flags to select storage volume for app installs.
 2015-06-10 04:56:19 +00:00
Jeff Sharkey
e687929f33 Merge "Flags to select storage volume for app installs." into mnc-dev 2015-06-10 04:43:18 +00:00
Jeff Sharkey
ab2340996a Flags to select storage volume for app installs. 
Remote callers can now provide the "--install-location" value from
the APK to help select a location, or they can explicitly force a
volume by UUID.

Bug: 21676789
Change-Id: Iefc92d770a851fc33e37edbf259fdb8df2b14ae5
 2015-06-09 21:42:22 -07:00
Yao Chen
4af0945647 am 72df690c: am a0d41262: Merge "Copy lockTaskLaunchMode from target activity to its alias." into mnc-dev 
* commit '72df690ce07c20ef45c7a8a60b90e0ef70a1263b':
  Copy lockTaskLaunchMode from target activity to its alias.
 2015-06-10 03:48:36 +00:00
Yao Chen
72df690ce0 am a0d41262: Merge "Copy lockTaskLaunchMode from target activity to its alias." into mnc-dev 
* commit 'a0d41262d48eb48285bb3a0e71bfc5b7b89be601':
  Copy lockTaskLaunchMode from target activity to its alias.
 2015-06-10 03:36:57 +00:00
Yao Chen
a0d41262d4 Merge "Copy lockTaskLaunchMode from target activity to its alias." into mnc-dev 2015-06-10 03:28:29 +00:00