drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
196,180 Commits 1 Branch 0 Tags
Commit Graph

196180 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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 259292ff3de5b9a64e8e3bb4a62a533aef4125b7.

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
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
Paul Lawrence
05487618c1 Remove hex encoding and password adjusting now that patterns are '1' based 
Bug: 21606650
Change-Id: Id2b01d43edcb995a9bffbc990e6297940e81f20e
 2015-06-10 07:21:19 -07:00
Jason Monk
6ff98ce2c8 Fix work apps showing as not installed for owner 
Bug: 21717956
Change-Id: Ia00537f3b50f958a2e35094abf1bfc73dc1f79af
 2015-06-10 10:18:22 -04: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
Geoff Mendal
b381bcc185 Merge "Import translations. DO NOT MERGE" into mnc-dev 2015-06-10 14:10:00 +00:00
Geoff Mendal
d86ab3b324 Import translations. DO NOT MERGE 
Change-Id: I43d33e6e42b0bbeeec7cc330bbb9c068fa3828d2
Auto-generated-cl: translation import
 2015-06-10 09:04:16 -05:00
Geoff Mendal
36eb6d5f46 Merge "Import translations. DO NOT MERGE" into mnc-dev 2015-06-10 14:00:34 +00:00
Geoff Mendal
b6c026bec1 Merge "Import translations. DO NOT MERGE" into mnc-dev 2015-06-10 13:59:02 +00:00
Geoff Mendal
a126f69419 Import translations. DO NOT MERGE 
Change-Id: I20b6c72047df24a7b6f9ad21db1234bdc4889925
Auto-generated-cl: translation import
 2015-06-10 08:58:30 -05:00
Geoff Mendal
1947d9f55e Merge "Import translations. DO NOT MERGE" into mnc-dev 2015-06-10 13:57:32 +00:00
Geoff Mendal
09e34e989c Import translations. DO NOT MERGE 
Change-Id: I8f8557a777e3b2ed58593aa20d1a2b0f2a5aa33b
Auto-generated-cl: translation import
 2015-06-10 08:55:37 -05:00
Geoff Mendal
c960f3aa34 Import translations. DO NOT MERGE 
Change-Id: Id91c1fc06d73c8f99d53a5fce6d08ef9922b5d07
Auto-generated-cl: translation import
 2015-06-10 08:52:40 -05:00
Neil Fuller
8e095594a6 Merge "Stop showing long names for local timezones when it is ambiguous" into mnc-dev 2015-06-10 12:23:54 +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
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
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
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
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
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
Adrian Roos
b46211746c am 5b7793ca: Merge "Expand scrim all the way to the right" into mnc-dev 
* commit '5b7793cacf3910a386182a9b78460934d00dfdae':
  Expand scrim all the way to the right
 2015-06-10 01:40:51 +00:00
Svetoslav
60022334b7 am a1e60f1f: Merge "Use who when requesting permissions" into mnc-dev 
* commit 'a1e60f1f45dce19f9dc15b97cbb0821ffeb54d9d':
  Use who when requesting permissions
 2015-06-10 01:40:46 +00:00