OSDN Git Service
Julia Reynolds [Wed, 1 Jun 2016 22:52:08 +0000 (22:52 +0000)]
Merge "Radio buttons belong in a radio group." into nyc-dev am:
d05a7b5972
am:
88470b5ba2
* commit '
88470b5ba2aeb38ff5d8d25b17b9897ed1efa5cd':
Radio buttons belong in a radio group.
Change-Id: I17cbb329efa9cb1fc7a3a229cd523ce0abab852f
Ian Rogers [Wed, 1 Jun 2016 22:52:02 +0000 (22:52 +0000)]
Merge "Fix call to equals that could never succeed." into nyc-dev am:
748620e9f0
am:
e3cac08ec6
* commit '
e3cac08ec62973b1d92c7f02ea291eb96f4fe93a':
Fix call to equals that could never succeed.
Change-Id: I5fa03a7d9cfa6e3c8ef2feb04838df3023b7aaae
Jason Monk [Wed, 1 Jun 2016 22:51:56 +0000 (22:51 +0000)]
Merge "QS: Fix single expanded frame from layout" into nyc-dev am:
4215ae0100
am:
023b338111
* commit '
023b338111191c62cb5ba6b4a3394fe039c0888e':
QS: Fix single expanded frame from layout
Change-Id: I3e2035596f207b7ed82973af91470ca981bb65ef
Jason Monk [Wed, 1 Jun 2016 22:51:49 +0000 (22:51 +0000)]
Merge "QS: Followup to scroll fixes" into nyc-dev am:
1ceef7c0fa
am:
947ef9a717
* commit '
947ef9a7171fa0750cf3c027a2cb487f827cff06':
QS: Followup to scroll fixes
Change-Id: I62212b21a330db50aaa8a2923bf753e980f931cf
Robert Shih [Wed, 1 Jun 2016 22:51:43 +0000 (22:51 +0000)]
Merge "PackageManager: Don\'t clear app profiles during system upgrades." into nyc-dev am:
d579be0cf2
am:
0c4f066f0b
* commit '
0c4f066f0b043e6b2678840a7da1db2714abd2d9':
Change-Id: I80d858b02b023abae4e1aa79f8a2bd5040073738
Robert Shih [Wed, 1 Jun 2016 22:18:00 +0000 (22:18 +0000)]
resolve merge conflicts of
d579be0 to nyc-dev-plus-aosp
am:
4c3d43d2c2
* commit '
4c3d43d2c2ef9f9176fae6d897d01ec57e3970cd':
Fix deadlock when showing subtitles MediaPlayer
Change-Id: I8e0bfa7f23437ba3fe75283d6020b446ea82d55c
Robert Shih [Wed, 1 Jun 2016 21:53:09 +0000 (14:53 -0700)]
resolve merge conflicts of
d579be0 to nyc-dev-plus-aosp
Change-Id: Ib64df6377d95578581fd7d311aaffc3ef64dd622
Vasco Brito [Wed, 1 Jun 2016 19:14:29 +0000 (19:14 +0000)]
Merge "Revert "Merge "Add 900 for Russia - Short code used by Sberbank.""" am:
56bd06fc3e am:
ce82f1c16a
am:
be718d8836
* commit '
be718d8836e85b8bff0de83e4fefbd92675c0855':
Revert "Merge "Add 900 for Russia - Short code used by Sberbank.""
Change-Id: Ie1371d5dd1458038a2a2a93bba7c2e45f1d671ea
Robert Greenwalt [Wed, 1 Jun 2016 19:07:45 +0000 (19:07 +0000)]
Merge "Revert "Merge "Add 900 for Russia - Short code used by Sberbank.""" am:
56bd06fc3e
am:
ce82f1c16a
* commit '
ce82f1c16a4c10e003a11020fcb3c232010c40c6':
Revert "Merge "Add 900 for Russia - Short code used by Sberbank.""
Change-Id: Id0b350da8369340a4ac538358481577b22bc73d3
Vasco Brito [Wed, 1 Jun 2016 18:51:28 +0000 (18:51 +0000)]
Merge "Revert "Merge "Add 900 for Russia - Short code used by Sberbank."""
am:
56bd06fc3e
* commit '
56bd06fc3e29290ba90b792a7f7353864cbf772a':
Revert "Merge "Add 900 for Russia - Short code used by Sberbank.""
Change-Id: I0450be79c583cd2fc27156460b32b23830fc3c68
Robert Greenwalt [Wed, 1 Jun 2016 18:15:15 +0000 (18:15 +0000)]
Merge "Revert "Merge "Add 900 for Russia - Short code used by Sberbank."""
Julia Reynolds [Wed, 1 Jun 2016 18:07:18 +0000 (18:07 +0000)]
Merge "Radio buttons belong in a radio group." into nyc-dev
am:
d05a7b5972
* commit '
d05a7b5972cb06f711cc8cfa66efa9f0f6d901a5':
Radio buttons belong in a radio group.
Change-Id: If12173e67797ba105ea40475e3ad9e3061d592f9
TreeHugger Robot [Wed, 1 Jun 2016 18:01:34 +0000 (18:01 +0000)]
Merge "Radio buttons belong in a radio group." into nyc-dev
Ian Rogers [Wed, 1 Jun 2016 17:54:22 +0000 (17:54 +0000)]
Merge "Fix call to equals that could never succeed." into nyc-dev
am:
748620e9f0
* commit '
748620e9f03dd66bfed38d91d32b35d79684173b':
Fix call to equals that could never succeed.
Change-Id: I82af33ea3b93c4017c845b1f791ebee403bffe21
TreeHugger Robot [Wed, 1 Jun 2016 17:46:01 +0000 (17:46 +0000)]
Merge "Fix call to equals that could never succeed." into nyc-dev
Android Build Merger (Role) [Wed, 1 Jun 2016 17:39:06 +0000 (17:39 +0000)]
Merge "Merge "PackageManager: Don\'t clear app profiles during system upgrades." into nyc-dev am:
93193135b1 am:
93a01103af" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Wed, 1 Jun 2016 17:38:52 +0000 (17:38 +0000)]
Merge "Merge "QS: Only put visible tiles in listening state" into nyc-dev am:
8768f68713 am:
ae42c4a118" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Wed, 1 Jun 2016 17:38:40 +0000 (17:38 +0000)]
Merge "Merge "QS: Protect against crash with no icon" into nyc-dev am:
7b945d8d30 am:
2891acd139" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Wed, 1 Jun 2016 17:38:23 +0000 (17:38 +0000)]
Merge "Merge "MessagingStyle: Generate EXTRA_TITLE and EXTRA_TEXT" into nyc-dev am:
ff39d3ec2f am:
adc3f1ec2b" into nyc-mr1-dev-plus-aosp
Jason Monk [Wed, 1 Jun 2016 17:37:49 +0000 (17:37 +0000)]
Merge "QS: Fix single expanded frame from layout" into nyc-dev
am:
4215ae0100
* commit '
4215ae01002f1217587698d24636870ace4a50f5':
QS: Fix single expanded frame from layout
Change-Id: Id3571cce3d2b4ecd01e5ea8bf1f093e08952a757
Brian Carlstrom [Wed, 1 Jun 2016 17:37:42 +0000 (17:37 +0000)]
Merge "PackageManager: Don\'t clear app profiles during system upgrades." into nyc-dev am:
93193135b1
am:
93a01103af
* commit '
93a01103afae6bfada5a7b8decd96c2e3af0448b':
PackageManager: Don't clear app profiles during system upgrades.
Change-Id: I6306780a19f729114a5134281a088f106159d7db
Jason Monk [Wed, 1 Jun 2016 17:37:37 +0000 (17:37 +0000)]
Merge "QS: Only put visible tiles in listening state" into nyc-dev am:
8768f68713
am:
ae42c4a118
* commit '
ae42c4a1181a304039e425dbc6c0c2d12a31b0b9':
QS: Only put visible tiles in listening state
Change-Id: I62885fc401c4676226e4ff9d3a41d15664c8b75b
Jason Monk [Wed, 1 Jun 2016 17:37:31 +0000 (17:37 +0000)]
Merge "QS: Protect against crash with no icon" into nyc-dev am:
7b945d8d30
am:
2891acd139
* commit '
2891acd139d0db993df975a97f953a194d5c0db2':
QS: Protect against crash with no icon
Change-Id: I10bb822408d59d228d5b28bdc77f8581941cbe11
Adrian Roos [Wed, 1 Jun 2016 17:37:25 +0000 (17:37 +0000)]
Merge "MessagingStyle: Generate EXTRA_TITLE and EXTRA_TEXT" into nyc-dev am:
ff39d3ec2f
am:
adc3f1ec2b
* commit '
adc3f1ec2b8b85d1b3ced34e424e1b091f937b03':
MessagingStyle: Generate EXTRA_TITLE and EXTRA_TEXT
Change-Id: I68a1cc476055a7fe28cb9f5157dfc0362de7c9bd
Brian Carlstrom [Wed, 1 Jun 2016 17:34:51 +0000 (17:34 +0000)]
Merge "PackageManager: Don\'t clear app profiles during system upgrades." into nyc-dev am:
93193135b1
am:
41846b0612
* commit '
41846b061226af72eaffbdea4dc44fa2bbd087b1':
PackageManager: Don't clear app profiles during system upgrades.
Change-Id: I524bf5934835d10d42dec63bacd52cd1bacda96d
Jason Monk [Wed, 1 Jun 2016 17:34:33 +0000 (17:34 +0000)]
Merge "QS: Only put visible tiles in listening state" into nyc-dev am:
8768f68713
am:
e696c8465b
* commit '
e696c8465b599fdbc560ec18a7497f90d0a3efbe':
QS: Only put visible tiles in listening state
Change-Id: If91dcf13524c6d63cf99946639163c45bae15739
Jason Monk [Wed, 1 Jun 2016 17:34:18 +0000 (17:34 +0000)]
Merge "QS: Protect against crash with no icon" into nyc-dev am:
7b945d8d30
am:
a58c1a52ac
* commit '
a58c1a52ac44a53175475f78cea074583ed5e177':
QS: Protect against crash with no icon
Change-Id: I20c0c15d3e7358f056198280d8d9c2b0d9ca4115
Adrian Roos [Wed, 1 Jun 2016 17:34:05 +0000 (17:34 +0000)]
Merge "MessagingStyle: Generate EXTRA_TITLE and EXTRA_TEXT" into nyc-dev am:
ff39d3ec2f
am:
72bc1299f2
* commit '
72bc1299f2020c4acd51defed6da430d61edc5fa':
MessagingStyle: Generate EXTRA_TITLE and EXTRA_TEXT
Change-Id: Ifcba6fe03700c39b9777c3c08ffa1c4bf4873dd7
Jason Monk [Wed, 1 Jun 2016 17:27:21 +0000 (17:27 +0000)]
Merge "QS: Followup to scroll fixes" into nyc-dev
am:
1ceef7c0fa
* commit '
1ceef7c0fab15af522f56ade3e08abf559622181':
QS: Followup to scroll fixes
Change-Id: I0d013329236b9c2ac1a6aa76fba20bcd7e79a4a1
Jason Monk [Wed, 1 Jun 2016 17:26:52 +0000 (17:26 +0000)]
Merge "QS: Fix single expanded frame from layout" into nyc-dev
Narayan Kamath [Wed, 1 Jun 2016 17:26:22 +0000 (17:26 +0000)]
Merge "PackageManager: Don\'t clear app profiles during system upgrades." into nyc-dev
am:
93193135b1
* commit '
93193135b184a2f1c7518d8beeff7c51b2880606':
PackageManager: Don't clear app profiles during system upgrades.
Change-Id: Ic765c13a476c0924d2ede278b379db86d634fa1f
Jason Monk [Wed, 1 Jun 2016 17:26:14 +0000 (17:26 +0000)]
Merge "QS: Only put visible tiles in listening state" into nyc-dev
am:
8768f68713
* commit '
8768f687138510b90dd997e41720ad7d88637b49':
QS: Only put visible tiles in listening state
Change-Id: I361a2ad640505ec2b1f10adb31e41aea0daced4e
Jason Monk [Wed, 1 Jun 2016 17:26:06 +0000 (17:26 +0000)]
Merge "QS: Protect against crash with no icon" into nyc-dev
am:
7b945d8d30
* commit '
7b945d8d30a6e3978b50d5952539279a71148eca':
QS: Protect against crash with no icon
Change-Id: I6bf6ddc7a8331c2e324c5ae7c065c4eb9eb9fead
Adrian Roos [Wed, 1 Jun 2016 17:25:52 +0000 (17:25 +0000)]
Merge "MessagingStyle: Generate EXTRA_TITLE and EXTRA_TEXT" into nyc-dev
am:
ff39d3ec2f
* commit '
ff39d3ec2fa773a50bbd069a40570767c80fd404':
MessagingStyle: Generate EXTRA_TITLE and EXTRA_TEXT
Change-Id: I4f725f15c12a3e5f49a521564ad2be54b75b2dd2
Android Build Merger (Role) [Wed, 1 Jun 2016 17:22:32 +0000 (17:22 +0000)]
Merge "Merge "Adds alpha to dimmed backgrounds" into nyc-dev am:
0d7dbb0f28 am:
c123c0b4d0" into nyc-mr1-dev-plus-aosp
Mady Mellor [Wed, 1 Jun 2016 17:21:58 +0000 (17:21 +0000)]
Merge "Adds alpha to dimmed backgrounds" into nyc-dev am:
0d7dbb0f28
am:
c123c0b4d0
* commit '
c123c0b4d02e948757e825e4f8249391afd45e3f':
Change-Id: I6c21ac599c286db2f84a399a61613d2d7d6ca16a
Narayan Kamath [Wed, 1 Jun 2016 17:20:55 +0000 (17:20 +0000)]
Merge "PackageManager: Don\'t clear app profiles during system upgrades." into nyc-dev
am:
d579be0cf2
* commit '
d579be0cf234a35273f79676c102b8bd80e071dc':
Fix deadlock when showing subtitles MediaPlayer
Change-Id: Ib1c57040e723d534df8243ad48479e9b554a74d1
Benjamin Franz [Wed, 1 Jun 2016 17:20:43 +0000 (17:20 +0000)]
Merge "Add an intent extra to force master clear" into nyc-mr1-dev
am:
3c826b160c
* commit '
3c826b160c724d38f49bb479aa13ab8cf685e2d2':
Add an intent extra to force master clear
Change-Id: I5789ac49b040ba6b1330e9680c1a595f24e82af9
Jason Monk [Wed, 1 Jun 2016 17:20:16 +0000 (17:20 +0000)]
Merge "QS: Followup to scroll fixes" into nyc-dev
Robert Shih [Wed, 1 Jun 2016 17:16:59 +0000 (17:16 +0000)]
Merge "Fix deadlock when showing subtitles MediaPlayer" into nyc-dev
Android Build Merger (Role) [Wed, 1 Jun 2016 17:14:58 +0000 (17:14 +0000)]
Merge "Merge "Adds alpha to dimmed backgrounds" into nyc-dev am:
0d7dbb0f28 am:
8c475d5b0a" into nyc-mr1-dev-plus-aosp
Narayan Kamath [Wed, 1 Jun 2016 17:14:59 +0000 (17:14 +0000)]
Merge "PackageManager: Don\'t clear app profiles during system upgrades." into nyc-dev
am:
93193135b1
* commit '
93193135b184a2f1c7518d8beeff7c51b2880606':
PackageManager: Don't clear app profiles during system upgrades.
Change-Id: I1eddbe894b3f4a2583973a98f3dc0d8adf8af16c
Jason Monk [Wed, 1 Jun 2016 17:14:54 +0000 (17:14 +0000)]
Merge "QS: Only put visible tiles in listening state" into nyc-dev
am:
8768f68713
* commit '
8768f687138510b90dd997e41720ad7d88637b49':
QS: Only put visible tiles in listening state
Change-Id: I437e2841841d6b54ba5c747052a885109b7e8bc4
Jason Monk [Wed, 1 Jun 2016 17:14:50 +0000 (17:14 +0000)]
Merge "QS: Protect against crash with no icon" into nyc-dev
am:
7b945d8d30
* commit '
7b945d8d30a6e3978b50d5952539279a71148eca':
QS: Protect against crash with no icon
Change-Id: I6e4fedcad9d788fcb2b8c803e905671bfff3f561
Adrian Roos [Wed, 1 Jun 2016 17:14:47 +0000 (17:14 +0000)]
Merge "MessagingStyle: Generate EXTRA_TITLE and EXTRA_TEXT" into nyc-dev
am:
ff39d3ec2f
* commit '
ff39d3ec2fa773a50bbd069a40570767c80fd404':
MessagingStyle: Generate EXTRA_TITLE and EXTRA_TEXT
Change-Id: I96b1992f69d94f24a63784c1c2d954b91ab9570d
Mady Mellor [Wed, 1 Jun 2016 17:14:27 +0000 (17:14 +0000)]
Merge "Adds alpha to dimmed backgrounds" into nyc-dev am:
0d7dbb0f28
am:
8c475d5b0a
* commit '
8c475d5b0a18705aa8e76a1efa01b6860fc8ceae':
Adds alpha to dimmed backgrounds
Change-Id: Id58651cfd6bf2be8e47c7d59bce96779cb1539f5
Android Build Merger (Role) [Wed, 1 Jun 2016 17:14:19 +0000 (17:14 +0000)]
Merge "Merge "trim and strip html tags for load safe label name" into nyc-dev am:
c16bc88fc9 am:
30680c6506" into nyc-mr1-dev-plus-aosp
Benjamin Franz [Wed, 1 Jun 2016 17:13:14 +0000 (17:13 +0000)]
Merge "Add an intent extra to force master clear" into nyc-mr1-dev
Chen Xu [Wed, 1 Jun 2016 17:12:16 +0000 (17:12 +0000)]
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
Chen Xu [Wed, 1 Jun 2016 17:06:41 +0000 (17:06 +0000)]
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
Mady Mellor [Wed, 1 Jun 2016 17:06:26 +0000 (17:06 +0000)]
Merge "Adds alpha to dimmed backgrounds" into nyc-dev
am:
0d7dbb0f28
* commit '
0d7dbb0f282afb43ec2a6a81789379749b2ab054':
Adds alpha to dimmed backgrounds
Change-Id: I1ae5d761387b9eb9b9eb42c1eea65275b63eed64
Mady Mellor [Wed, 1 Jun 2016 17:06:24 +0000 (17:06 +0000)]
Merge "Adds alpha to dimmed backgrounds" into nyc-dev
am:
0d7dbb0f28
* commit '
0d7dbb0f282afb43ec2a6a81789379749b2ab054':
Adds alpha to dimmed backgrounds
Change-Id: Iebe58b6c0b8a1b030626e5bb581dfd2c92d17a7b
Brian Carlstrom [Wed, 1 Jun 2016 17:06:19 +0000 (17:06 +0000)]
Merge "PackageManager: Don't clear app profiles during system upgrades." into nyc-dev
Jason Monk [Wed, 1 Jun 2016 17:04:24 +0000 (17:04 +0000)]
Merge "QS: Only put visible tiles in listening state" into nyc-dev
Jason Monk [Wed, 1 Jun 2016 17:04:20 +0000 (17:04 +0000)]
Merge "QS: Protect against crash with no icon" into nyc-dev
TreeHugger Robot [Wed, 1 Jun 2016 17:01:58 +0000 (17:01 +0000)]
Merge "MessagingStyle: Generate EXTRA_TITLE and EXTRA_TEXT" into nyc-dev
fionaxu [Wed, 1 Jun 2016 16:56:44 +0000 (16:56 +0000)]
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
fionaxu [Wed, 1 Jun 2016 16:55:51 +0000 (16:55 +0000)]
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
Mady Mellor [Wed, 1 Jun 2016 16:53:49 +0000 (16:53 +0000)]
Merge "Adds alpha to dimmed backgrounds" into nyc-dev
Chen Xu [Wed, 1 Jun 2016 16:47:17 +0000 (16:47 +0000)]
Merge "trim and strip html tags for load safe label name" into nyc-dev
Android Build Merger (Role) [Wed, 1 Jun 2016 16:46:17 +0000 (16:46 +0000)]
Merge "Merge "Work on issue #
28942589: Tune job scheduler" into nyc-dev am:
438693dd6c am:
0e443c1320" into nyc-mr1-dev-plus-aosp
Dianne Hackborn [Wed, 1 Jun 2016 16:45:46 +0000 (16:45 +0000)]
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
Dianne Hackborn [Wed, 1 Jun 2016 16:45:40 +0000 (16:45 +0000)]
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
Dianne Hackborn [Wed, 1 Jun 2016 16:38:18 +0000 (16:38 +0000)]
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
Dianne Hackborn [Wed, 1 Jun 2016 16:38:12 +0000 (16:38 +0000)]
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
Julia Reynolds [Wed, 1 Jun 2016 15:37:29 +0000 (11:37 -0400)]
Radio buttons belong in a radio group.
Fix for 'multiple buttons selected at once' issue.
Change-Id: Iec54eac699886ed1c7b8afd91382ff9b5750c696
Fixes:
27698976
Ian Rogers [Mon, 30 May 2016 22:16:30 +0000 (15:16 -0700)]
Fix call to equals that could never succeed.
Caught by Error Prone.
Bug:
29045331
Change-Id: I5901a3ca06e0cc85620f596cfa4178f5ad61d1a7
(cherry picked from commit
edf2f5747b9adc3399b59eb478c94641b1021222)
Dianne Hackborn [Wed, 1 Jun 2016 16:27:04 +0000 (16:27 +0000)]
Merge "Work on issue #
28942589: Tune job scheduler" into nyc-dev
Narayan Kamath [Wed, 1 Jun 2016 14:18:14 +0000 (15:18 +0100)]
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
Bill Yi [Wed, 1 Jun 2016 15:49:29 +0000 (15:49 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev am:
a007e877f2 -s ours
am:
ed0e749092 -s ours
* commit '
ed0e749092e8d8303876738b159278c8f226fc55':
Change-Id: I71989db7e276e5e4f735725fbb250d6aea764b56
Bill Yi [Wed, 1 Jun 2016 15:49:25 +0000 (15:49 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev am:
f9a6f33091 -s ours
am:
54fd6701ca -s ours
* commit '
54fd6701caea2f9471b7fd16e93ab5fe0d75da2d':
Change-Id: I8cc20393d26a06a25aa565241b31099b782d026e
Bill Yi [Wed, 1 Jun 2016 15:49:22 +0000 (15:49 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev am:
072150db89 -s ours
am:
725ce2bc3f -s ours
* commit '
725ce2bc3fcda86c08725e5cb3696e1a5adbc179':
Change-Id: I964c896985a493ac3cd2c2829ab406514b63424e
Bill Yi [Wed, 1 Jun 2016 15:41:04 +0000 (15:41 +0000)]
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
Bill Yi [Wed, 1 Jun 2016 15:41:02 +0000 (15:41 +0000)]
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
Bill Yi [Wed, 1 Jun 2016 15:40:59 +0000 (15:40 +0000)]
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
Bill Yi [Wed, 1 Jun 2016 15:35:03 +0000 (15:35 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
am:
a007e877f2 -s ours
* commit '
a007e877f2ed32bd51d6c03e94e20eac94ef4081':
Import translations. DO NOT MERGE
Change-Id: Ic0ab9aacb14fb341186d8c204f8595cd4087ae6a
Bill Yi [Wed, 1 Jun 2016 15:34:50 +0000 (15:34 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
am:
f9a6f33091 -s ours
* commit '
f9a6f33091772b847cf1580021530cdf5004c035':
Import translations. DO NOT MERGE
Change-Id: I19a2537c01efc8b4e47d64778d675bbed498b782
Bill Yi [Wed, 1 Jun 2016 15:34:37 +0000 (15:34 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
am:
072150db89 -s ours
* commit '
072150db89de9fda26bd2150242ab31f9309ec70':
Import translations. DO NOT MERGE
Change-Id: Ic78cdd6faee5831d7fa1a62d3cca0c49f1e0ad1a
Bill Yi [Wed, 1 Jun 2016 15:33:43 +0000 (15:33 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
am:
a007e877f2 -s ours
* commit '
a007e877f2ed32bd51d6c03e94e20eac94ef4081':
Import translations. DO NOT MERGE
Change-Id: I261c5b972c2cf481fcfd2cd69ae7b4803ca8fac1
Bill Yi [Wed, 1 Jun 2016 15:33:18 +0000 (15:33 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
am:
f9a6f33091 -s ours
* commit '
f9a6f33091772b847cf1580021530cdf5004c035':
Import translations. DO NOT MERGE
Change-Id: Id0b2e17995055d8d92b2e3f0d6a81e4a41fa55cb
Bill Yi [Wed, 1 Jun 2016 15:33:02 +0000 (15:33 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
am:
072150db89 -s ours
* commit '
072150db89de9fda26bd2150242ab31f9309ec70':
Import translations. DO NOT MERGE
Change-Id: I7c97e2bfe59959e888e22cf8b3304a51aee0a0c9
Bill Yi [Wed, 1 Jun 2016 15:32:47 +0000 (15:32 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am:
561ae1baca -s ours
* commit '
561ae1bacaf1cf0c282363e97dc006d41ee19cb5':
Import translations. DO NOT MERGE
Change-Id: Ib2531d234f02ecfef5405028ef50f39c4265bc90
Bill Yi [Wed, 1 Jun 2016 15:32:40 +0000 (15:32 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am:
713e725b1e -s ours
* commit '
713e725b1ed378711aadaff5173bd6c93d9aff76':
Import translations. DO NOT MERGE
Change-Id: I7e206b75f8385f639b5a4d6ab8e8a118f2448d2d
Bill Yi [Wed, 1 Jun 2016 15:32:34 +0000 (15:32 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am:
8c228d05e3 -s ours
* commit '
8c228d05e3b050c82a3e7bd69799d6dafad5e0e9':
Import translations. DO NOT MERGE
Change-Id: Id4d7363ff2a4d43388f8c8bb2b6e117cee373a66
TreeHugger Robot [Wed, 1 Jun 2016 15:26:42 +0000 (15:26 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
TreeHugger Robot [Wed, 1 Jun 2016 15:25:52 +0000 (15:25 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
TreeHugger Robot [Wed, 1 Jun 2016 15:25:34 +0000 (15:25 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
TreeHugger Robot [Wed, 1 Jun 2016 15:25:14 +0000 (15:25 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
Jason Monk [Wed, 1 Jun 2016 15:19:26 +0000 (11:19 -0400)]
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
TreeHugger Robot [Wed, 1 Jun 2016 15:16:49 +0000 (15:16 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
TreeHugger Robot [Wed, 1 Jun 2016 15:15:57 +0000 (15:15 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
Benjamin Franz [Thu, 26 May 2016 13:24:29 +0000 (14:24 +0100)]
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
Jason Monk [Wed, 1 Jun 2016 14:25:01 +0000 (10:25 -0400)]
QS: Protect against crash with no icon
Change-Id: I65d594c9bf15190418d96cc6d2c426df00fed212
Fixes:
28941131
Android Build Merger (Role) [Wed, 1 Jun 2016 13:58:55 +0000 (13:58 +0000)]
Merge "Fix action mode animation on recreations - framework edition am:
e65b3fbb63 am:
9269e2272b" into nyc-mr1-dev-plus-aosp
Chris Banes [Wed, 1 Jun 2016 13:58:28 +0000 (13:58 +0000)]
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
Chris Banes [Wed, 1 Jun 2016 13:58:25 +0000 (13:58 +0000)]
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
Chris Banes [Wed, 1 Jun 2016 13:54:01 +0000 (13:54 +0000)]
Fix action mode animation on recreations - framework edition
am:
e65b3fbb63
* commit '
e65b3fbb63b4b6937fede2e4b889c0a51a881358':
Fix action mode animation on recreations - framework edition
Change-Id: Ic990cf5fdb98e86083ccfe54f8f3e6905aa3e375
Chris Banes [Wed, 1 Jun 2016 13:53:58 +0000 (13:53 +0000)]
Fix action mode animation on recreations - framework edition
am:
e65b3fbb63
* commit '
e65b3fbb63b4b6937fede2e4b889c0a51a881358':
Fix action mode animation on recreations - framework edition
Change-Id: I19274b7ede1fae09deb915807c35a478caf939ee
Chris Banes [Wed, 1 Jun 2016 10:39:54 +0000 (11:39 +0100)]
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
Bill Yi [Wed, 1 Jun 2016 13:15:34 +0000 (06:15 -0700)]
Import translations. DO NOT MERGE
Change-Id: I1e9a73431f13e4ccab446571ec51524eb5a3a165
Auto-generated-cl: translation import
OSDN Git Service
